diff options
| author | allexzander <allexzander@users.noreply.github.com> | 2022-08-02 10:30:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 10:30:33 +0300 |
| commit | fa44a91a537aa4b0b6e082c0f8fed5eabc0f2746 (patch) | |
| tree | b73a405e3343a5a650044ff98394011326e8a7ca | |
| parent | 4159e49c235431d9844c645cbbd3f40396970543 (diff) | |
| parent | aa489048d4f9bdb907d3dc97a7570ee6f99cfc3e (diff) | |
Merge pull request #4800 from nextcloud/backport/4799/stable-3.5
[stable-3.5] Do not reboot PC when running an MSI via autoupdate.
| -rw-r--r-- | admin/win/msi/Nextcloud.wxs | 2 | ||||
| -rw-r--r-- | src/gui/updater/ocupdater.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/win/msi/Nextcloud.wxs b/admin/win/msi/Nextcloud.wxs index d11124517..8e694b3f6 100644 --- a/admin/win/msi/Nextcloud.wxs +++ b/admin/win/msi/Nextcloud.wxs @@ -81,7 +81,7 @@ <Custom Action="RegistryCleanupCustomAction" After="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom> <!-- Schedule Reboot for the Shell Extensions (in silent installation mode only, or if SCHEDULE_REBOOT argument is set--> - <ScheduleReboot After="InstallFinalize">(SCHEDULE_REBOOT=1) OR (NOT (UILevel=2) AND NOT (DO_NOT_REBOOT_IN_SILENT=1))</ScheduleReboot> + <ScheduleReboot After="InstallFinalize">(SCHEDULE_REBOOT=1) OR NOT (UILevel=2)</ScheduleReboot> </InstallExecuteSequence> <!-- "Add or Remove" Programs Entries --> diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp index ec0f65547..102c7fcbb 100644 --- a/src/gui/updater/ocupdater.cpp +++ b/src/gui/updater/ocupdater.cpp @@ -222,7 +222,7 @@ void OCUpdater::slotStartInstaller() }; QString msiLogFile = cfg.configPath() + "msi.log"; - QString command = QString("&{msiexec /promptrestart /passive /i '%1' DO_NOT_REBOOT_IN_SILENT=1 /L*V '%2'| Out-Null ; &'%3'}") + QString command = QString("&{msiexec /norestart /passive /i '%1' /L*V '%2'| Out-Null ; &'%3'}") .arg(preparePathForPowershell(updateFile)) .arg(preparePathForPowershell(msiLogFile)) .arg(preparePathForPowershell(QCoreApplication::applicationFilePath())); |