diff options
| author | Dan Sarginson <dan.sarginson@gmail.com> | 2016-09-21 19:31:36 -0700 |
|---|---|---|
| committer | Dan Sarginson <dan.sarginson@gmail.com> | 2016-09-21 19:31:36 -0700 |
| commit | a1d9468e6d2ac35e6195cf2a111212c4adc865a1 (patch) | |
| tree | ca4b5099d04e56d739dfbd24220035da4182838f /toolsrc/src/commands_integration.cpp | |
| parent | 81d64262983b9f47d61ec184d029184616d52f34 (diff) | |
| download | vcpkg-a1d9468e6d2ac35e6195cf2a111212c4adc865a1.tar.gz vcpkg-a1d9468e6d2ac35e6195cf2a111212c4adc865a1.zip | |
Remove use of wildcard in integration installation dest path.
This seemed to be used in order to stop XPATH blocking on the file/directory dialog. It was causing odd issues I mentioned in #62. Instead used "echo f" to assure XCOPY that we're dealing with files.
Fixes #62.
Diffstat (limited to 'toolsrc/src/commands_integration.cpp')
| -rw-r--r-- | toolsrc/src/commands_integration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolsrc/src/commands_integration.cpp b/toolsrc/src/commands_integration.cpp index 178d40e83..4f3fdd20b 100644 --- a/toolsrc/src/commands_integration.cpp +++ b/toolsrc/src/commands_integration.cpp @@ -195,7 +195,7 @@ namespace vcpkg const fs::path sys_src_path = tmp_dir / "vcpkg.system.targets"; std::ofstream(sys_src_path) << create_system_targets_shortcut(); - const std::string param = Strings::format(R"(/c XCOPY "%s" "%s*" /Y > nul)", sys_src_path.string(), system_wide_targets_file.string()); + const std::string param = Strings::format(R"(/c echo f | XCOPY "%s" "%s" /Y > nul)", sys_src_path.string(), system_wide_targets_file.string()); elevation_prompt_user_choice user_choice = elevated_cmd_execute(param); switch (user_choice) { |