From e85dbc2b51896d45120ce5e463036c3da6759cd6 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 21 Mar 2024 14:36:32 +0200 Subject: Fix maintenance tool register path parameters In Windows, maintenance tool is written to registry. 'Add or remove' program in Windows settings uses the registry, and maintenancetool can be started using the settings. Fixing the maintenancetool parameters so that selecting 'Modify' will open the maintenancetool in packagemanager mode, and 'Uninstall' will open the maintenancetool in uninstaller mode. Change-Id: Ib1e8c80132f6e2eb2f8cfa22910b4ad1ca696f06 Reviewed-by: Arttu Tarkiainen --- src/libs/installer/packagemanagercore_p.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 52df38e3c..7777fd644 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -57,6 +57,7 @@ #include "selfrestarter.h" #include "filedownloaderfactory.h" #include "updateoperationfactory.h" +#include "constants.h" #include @@ -2804,9 +2805,12 @@ void PackageManagerCorePrivate::registerMaintenanceTool() settings.setValue(QLatin1String("Comments"), m_data.value(scTitle)); settings.setValue(QLatin1String("InstallDate"), QDateTime::currentDateTime().toString()); settings.setValue(QLatin1String("InstallLocation"), QDir::toNativeSeparators(targetDir())); - settings.setValue(QLatin1String("UninstallString"), quoted(maintenanceTool)); - settings.setValue(QLatin1String("ModifyPath"), QString(quoted(maintenanceTool) - + QLatin1String(" --manage-packages"))); + settings.setValue(QLatin1String("UninstallString"), QString(quoted(maintenanceTool) + + QLatin1String(" --") + CommandLineOptions::scStartUninstallerLong)); + if (!isOfflineOnly()) { + settings.setValue(QLatin1String("ModifyPath"), QString(quoted(maintenanceTool) + + QLatin1String(" --") + CommandLineOptions::scStartPackageManagerLong)); + } // required disk space of the installed components quint64 estimatedSizeKB = m_core->requiredDiskSpace() / 1024; // add required space for the maintenance tool -- cgit v1.2.3