aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_remove.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-01-30 22:04:04 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-01-30 22:04:04 -0800
commit5c01fc4af871ed1cc1481a53957be1460142a6f2 (patch)
tree5fa97f96bc2c8c5cfda6015b44f19774e11a6a6e /toolsrc/src/commands_remove.cpp
parent4e64dc598a53493a85d65f94c81a33c4862fc89a (diff)
downloadvcpkg-5c01fc4af871ed1cc1481a53957be1460142a6f2.tar.gz
vcpkg-5c01fc4af871ed1cc1481a53957be1460142a6f2.zip
Change --recursive option to --recurse
Diffstat (limited to 'toolsrc/src/commands_remove.cpp')
-rw-r--r--toolsrc/src/commands_remove.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp
index 5a9467b47..7e8608e72 100644
--- a/toolsrc/src/commands_remove.cpp
+++ b/toolsrc/src/commands_remove.cpp
@@ -12,7 +12,7 @@ namespace vcpkg::Commands::Remove
using Dependencies::request_type;
static const std::string OPTION_PURGE = "--purge";
- static const std::string OPTION_RECURSIVE = "--recursive";
+ static const std::string OPTION_RECURSE = "--recurse";
static void delete_directory(const fs::path& directory)
{
@@ -168,13 +168,13 @@ namespace vcpkg::Commands::Remove
static const std::string example = Commands::Help::create_example_string("remove zlib zlib:x64-windows curl boost");
args.check_min_arg_count(1, example);
- const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_PURGE, OPTION_RECURSIVE});
+ const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_PURGE, OPTION_RECURSE});
auto status_db = database_load_check(paths);
std::vector<package_spec> specs = Input::check_and_get_package_specs(args.command_arguments, default_target_triplet, example);
Input::check_triplets(specs, paths);
const bool alsoRemoveFolderFromPackages = options.find(OPTION_PURGE) != options.end();
- const bool isRecursive = options.find(OPTION_RECURSIVE) != options.end();
+ const bool isRecursive = options.find(OPTION_RECURSE) != options.end();
const std::vector<package_spec_with_remove_plan> remove_plan = Dependencies::create_remove_plan(paths, specs, status_db);
Checks::check_exit(!remove_plan.empty(), "Remove plan cannot be empty");
@@ -190,7 +190,7 @@ namespace vcpkg::Commands::Remove
{
System::println(System::color::warning,
"Additional packages (*) need to be removed to complete this operation.\n"
- "If you are sure you want to remove them, run the command with the --recursive option");
+ "If you are sure you want to remove them, run the command with the --recurse option");
exit(EXIT_FAILURE);
}