diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-03 16:42:41 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-04 16:47:07 -0700 |
| commit | e1af07d45a979e41b5754aaccc972183e8ec3f2b (patch) | |
| tree | ca97c4321aa5d88b7e36e740c5c8fe08621ab5fc /toolsrc/src/commands_integrate.cpp | |
| parent | 3677b2c3c83bca770e3f78d48414629783a18295 (diff) | |
| download | vcpkg-e1af07d45a979e41b5754aaccc972183e8ec3f2b.tar.gz vcpkg-e1af07d45a979e41b5754aaccc972183e8ec3f2b.zip | |
elevation_prompt_user_choice -> ElevationPromptChoice
Diffstat (limited to 'toolsrc/src/commands_integrate.cpp')
| -rw-r--r-- | toolsrc/src/commands_integrate.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/toolsrc/src/commands_integrate.cpp b/toolsrc/src/commands_integrate.cpp index ea1983c77..256c3ad1d 100644 --- a/toolsrc/src/commands_integrate.cpp +++ b/toolsrc/src/commands_integrate.cpp @@ -100,13 +100,13 @@ namespace vcpkg::Commands::Integrate return nuspec_file_content; } - enum class elevation_prompt_user_choice + enum class ElevationPromptChoice { - yes, - no + YES, + NO }; - static elevation_prompt_user_choice elevated_cmd_execute(const std::string& param) + static ElevationPromptChoice elevated_cmd_execute(const std::string& param) { SHELLEXECUTEINFO shExInfo = { 0 }; shExInfo.cbSize = sizeof(shExInfo); @@ -122,15 +122,15 @@ namespace vcpkg::Commands::Integrate if (!ShellExecuteExA(&shExInfo)) { - return elevation_prompt_user_choice::no; + return ElevationPromptChoice::NO; } if (shExInfo.hProcess == nullptr) { - return elevation_prompt_user_choice::no; + return ElevationPromptChoice::NO; } WaitForSingleObject(shExInfo.hProcess, INFINITE); CloseHandle(shExInfo.hProcess); - return elevation_prompt_user_choice::yes; + return ElevationPromptChoice::YES; } static fs::path get_appdata_targets_path() @@ -147,12 +147,12 @@ namespace vcpkg::Commands::Integrate if (fs::exists(old_system_wide_targets_file)) { const std::string param = Strings::format(R"(/c DEL "%s" /Q > nul)", old_system_wide_targets_file.string()); - elevation_prompt_user_choice user_choice = elevated_cmd_execute(param); + ElevationPromptChoice user_choice = elevated_cmd_execute(param); switch (user_choice) { - case elevation_prompt_user_choice::yes: + case ElevationPromptChoice::YES: break; - case elevation_prompt_user_choice::no: + case ElevationPromptChoice::NO: System::println(System::Color::warning, "Warning: Previous integration file was not removed"); Checks::exit_fail(VCPKG_LINE_INFO); default: @@ -186,12 +186,12 @@ namespace vcpkg::Commands::Integrate std::ofstream(sys_src_path) << create_system_targets_shortcut(); const std::string param = Strings::format(R"(/c mkdir "%s" & copy "%s" "%s" /Y > nul)", system_wide_targets_file.parent_path().string(), sys_src_path.string(), system_wide_targets_file.string()); - elevation_prompt_user_choice user_choice = elevated_cmd_execute(param); + ElevationPromptChoice user_choice = elevated_cmd_execute(param); switch (user_choice) { - case elevation_prompt_user_choice::yes: + case ElevationPromptChoice::YES: break; - case elevation_prompt_user_choice::no: + case ElevationPromptChoice::NO: System::println(System::Color::warning, "Warning: integration was not applied"); Checks::exit_fail(VCPKG_LINE_INFO); default: |