diff --git a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp index 4420fed78d..e8ad9e506e 100644 --- a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp +++ b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp @@ -232,7 +232,7 @@ int Bootstrapper(HINSTANCE hInstance) installFolderProp = L"INSTALLFOLDER=" + installFolderProp; } - fs::path logDir = "."; + fs::path logDir = PTSettingsHelper::get_root_save_folder_location(); try { fs::path logDirArgPath = logDirArg; diff --git a/tools/BugReportTool/BugReportTool/Main.cpp b/tools/BugReportTool/BugReportTool/Main.cpp index dd20e2c5f8..74cb6baedf 100644 --- a/tools/BugReportTool/BugReportTool/Main.cpp +++ b/tools/BugReportTool/BugReportTool/Main.cpp @@ -245,26 +245,6 @@ void ReportDotNetInstallationInfo(const filesystem::path& tmpDir) } } -void ReportBootstrapperLog(const filesystem::path& targetDir) -{ - for (const auto entry : filesystem::directory_iterator{temp_directory_path()}) - { - if (!entry.is_regular_file() || !entry.path().has_filename()) - { - continue; - } - - const std::wstring filename = entry.path().filename().native(); - if (!filename.starts_with(L"powertoys-bootstrapper-") || !filename.ends_with(L".log")) - { - continue; - } - - std::error_code _; - copy(entry.path(), targetDir, _); - } -} - int wmain(int argc, wchar_t* argv[], wchar_t*) { // Get path to save zip @@ -336,8 +316,6 @@ int wmain(int argc, wchar_t* argv[], wchar_t*) // Write event viewer logs info to the temporary folder EventViewer::ReportEventViewerInfo(tmpDir); - ReportBootstrapperLog(tmpDir); - // Zip folder auto zipPath = path::path(saveZipPath); std::string reportFilename{"PowerToysReport_"};