mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-11 12:14:53 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Setup] Fix default log dir path (#11856)

Browse Source
This commit is contained in:
Andrey Nekrasov 2021-06-24 15:30:19 +03:00 committed by GitHub
parent 8fcfcd6790
commit 4aa1e43bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
View File

@ -168,6 +168,8 @@ int Bootstrapper(HINSTANCE hInstance)
defaultInstallDir += "\\PowerToys"; defaultInstallDir += "\\PowerToys";
} }
fs::path logDir = PTSettingsHelper::get_root_save_folder_location();
cxxopts::Options options{ "PowerToysBootstrapper" }; cxxopts::Options options{ "PowerToysBootstrapper" };
// clang-format off // clang-format off
@ -179,7 +181,7 @@ int Bootstrapper(HINSTANCE hInstance)
("start_pt", "Always launch PowerToys after the installation is complete") ("start_pt", "Always launch PowerToys after the installation is complete")
("skip_dotnet_install", "Skip dotnet 3.X installation even if it's not detected") ("skip_dotnet_install", "Skip dotnet 3.X installation even if it's not detected")
("log_level", "Log level. Possible values: off|debug|error", cxxopts::value<std::string>()->default_value("off")) ("log_level", "Log level. Possible values: off|debug|error", cxxopts::value<std::string>()->default_value("off"))
("log_dir", "Log directory", cxxopts::value<std::string>()->default_value(".")) ("log_dir", "Log directory", cxxopts::value<std::string>()->default_value(logDir.string()))
("install_dir", "Installation directory", cxxopts::value<std::string>()->default_value(defaultInstallDir)) ("install_dir", "Installation directory", cxxopts::value<std::string>()->default_value(defaultInstallDir))
("extract_msi", "Extract MSI to the working directory and exit. Use only if you must access MSI directly."); ("extract_msi", "Extract MSI to the working directory and exit. Use only if you must access MSI directly.");
// clang-format on // clang-format on
@ -232,7 +234,6 @@ int Bootstrapper(HINSTANCE hInstance)
installFolderProp = L"INSTALLFOLDER=" + installFolderProp; installFolderProp = L"INSTALLFOLDER=" + installFolderProp;
} }
fs::path logDir = PTSettingsHelper::get_root_save_folder_location();
try try
{ {
fs::path logDirArgPath = logDirArg; fs::path logDirArgPath = logDirArg;