aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_edit.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-09-30 16:48:16 -0700
committerRobert Schumacher <roschuma@microsoft.com>2016-09-30 16:48:16 -0700
commitcddc4f612ee605788928dafcb6366c6478fdb401 (patch)
tree756a551a9d40cdfd8ed4233620d56dc38058b4ee /toolsrc/src/commands_edit.cpp
parent39c0c7152f78f67418f7a0f97fe77699e8ed2d58 (diff)
parentbcb2be360a3ce577fc09fe1ffb6b7e0335ebb889 (diff)
downloadvcpkg-cddc4f612ee605788928dafcb6366c6478fdb401.tar.gz
vcpkg-cddc4f612ee605788928dafcb6366c6478fdb401.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'toolsrc/src/commands_edit.cpp')
-rw-r--r--toolsrc/src/commands_edit.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/commands_edit.cpp b/toolsrc/src/commands_edit.cpp
index fe02bfa26..4973d6ef2 100644
--- a/toolsrc/src/commands_edit.cpp
+++ b/toolsrc/src/commands_edit.cpp
@@ -5,16 +5,16 @@ namespace vcpkg
{
void edit_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
{
- static auto example = "edit zlib";
- args.check_max_args(1, example);
- package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet, example).at(0);
+ static const std::string example = create_example_string("edit zlib");
+ args.check_exact_arg_count(1, example.c_str());
+ const package_spec spec = vcpkg_cmd_arguments::check_and_get_package_spec(args.command_arguments.at(0), default_target_triplet, example.c_str());
// Find editor
std::wstring env_EDITOR = System::wdupenv_str(L"EDITOR");
if (env_EDITOR.empty())
env_EDITOR = LR"(C:\Program Files (x86)\Microsoft VS Code\Code.exe)";
- auto portpath = paths.ports / spec.name;
+ const fs::path portpath = paths.ports / spec.name;
std::wstring cmdLine = Strings::wformat(LR"("%s" "%s" "%s")", env_EDITOR, portpath.native(), (portpath / "portfile.cmake").native());
exit(System::cmd_execute(cmdLine));
}