Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Properly handle spaces in path when calling powershell script

This commit is contained in:
Alexander Karatarakis 2017-03-06 16:16:56 -08:00
parent 7f3153bd62
commit 3eb0526468
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolsrc/include/vcpkg_System.h
View File

@ -28,6 +28,10 @@ namespace vcpkg::System
return cmd_execute_and_capture_output(cmd_line.c_str());
}
std::wstring create_powershell_script_cmd(const fs::path& script_path);
std::wstring create_powershell_script_cmd(const fs::path& script_path, const std::wstring& args);
enum class color
{
success = 10,

5
toolsrc/src/vcpkg_Environment.cpp
View File

@ -43,8 +43,7 @@ namespace vcpkg::Environment
static std::wstring create_default_install_cmd(const vcpkg_paths& paths, const std::wstring& tool_name)
{
const fs::path script = paths.scripts / "fetchDependency.ps1";
// TODO: switch out ExecutionPolicy Bypass with "Remove Mark Of The Web" code and restore RemoteSigned
return Strings::wformat(LR"(powershell -ExecutionPolicy Bypass "%s" -Dependency %s)", script.native(), tool_name);
return System::create_powershell_script_cmd(script, Strings::wformat(L"-Dependency %s", tool_name));
}
void ensure_git_on_path(const vcpkg_paths& paths)
@ -103,7 +102,7 @@ namespace vcpkg::Environment
static std::vector<std::string> get_VS2017_installation_instances(const vcpkg_paths& paths)
{
const fs::path script = paths.scripts / "findVisualStudioInstallationInstances.ps1";
const std::wstring cmd = Strings::wformat(L"powershell -ExecutionPolicy Bypass %s", script.native());
const std::wstring cmd = System::create_powershell_script_cmd(script);
System::exit_code_and_output ec_data = System::cmd_execute_and_capture_output(cmd);
Checks::check_exit(ec_data.exit_code == 0, "Could not run script to detect VS 2017 instances");
return Strings::split(ec_data.output, "\n");

11
toolsrc/src/vcpkg_System.cpp
View File

@ -49,6 +49,17 @@ namespace vcpkg::System
return { ec, output };
}
std::wstring create_powershell_script_cmd(const fs::path& script_path)
{
return create_powershell_script_cmd(script_path, L"");
}
std::wstring create_powershell_script_cmd(const fs::path& script_path, const std::wstring& args)
{
// TODO: switch out ExecutionPolicy Bypass with "Remove Mark Of The Web" code and restore RemoteSigned
return Strings::wformat(LR"(powershell -ExecutionPolicy Bypass -Command "& {& '%s' %s}")", script_path.native(), args);
}
void print(const char* message)
{
fputs(message, stdout);