Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Runner: autoupdate should prefer .exe installer instead of .msi (#4216)

Browse Source
This commit is contained in:
Andrey Nekrasov
2020-06-18 13:43:09 +03:00
committed by GitHub
parent 59ce90e924
commit 7ed03c8b90
7 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/runner/main.cpp
View File

@@ -130,7 +130,7 @@ int runner(bool isProcessElevated)
chdir_current_executable();
// Load Powertoys DLLS
// For now only load known DLLs
std::wstring baseModuleFolder = L"modules/";
std::unordered_set<std::wstring> known_dlls = {
@@ -232,21 +232,32 @@ enum class toast_notification_handler_result
exit_error
};
toast_notification_handler_result toast_notification_handler(const std::wstring_view param)
{
if (param == L"cant_drag_elevated_disable/")
const std::wstring_view cant_drag_elevated_disable = L"cant_drag_elevated_disable/";
const std::wstring_view update_now = L"update_now/";
const std::wstring_view schedule_update = L"schedule_update/";
if (param == cant_drag_elevated_disable)
{
return disable_cant_drag_elevated_warning() ? toast_notification_handler_result::exit_success : toast_notification_handler_result::exit_error;
}
else if (param == L"update_now/")
else if (param.starts_with(update_now))
{
launch_action_runner(UPDATE_NOW_LAUNCH_STAGE1_CMDARG);
std::wstring args{ UPDATE_NOW_LAUNCH_STAGE1_CMDARG };
const auto installerFilename = param.data() + size(update_now);
args += L' ';
args += installerFilename;
launch_action_runner(args.c_str());
return toast_notification_handler_result::exit_success;
}
else if (param == L"schedule_update/")
else if (param.starts_with(schedule_update))
{
UpdateState::store([](UpdateState& state) {
const auto installerFilename = param.data() + size(schedule_update);
UpdateState::store([=](UpdateState& state) {
state.pending_update = true;
state.pending_installer_filename = installerFilename;
});
return toast_notification_handler_result::exit_success;