diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-12-10 12:32:31 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-12-10 16:00:20 +0100 |
| commit | 01ea1428e1a393ea96c84dd216694d11c22b0744 (patch) | |
| tree | d6fbfac1adb1e0863efff47b75d314c5a547bb92 | |
| parent | bf9801767d2786e1881dfb41e2a7eb31b39957ec (diff) | |
| download | mullvadvpn-01ea1428e1a393ea96c84dd216694d11c22b0744.tar.xz mullvadvpn-01ea1428e1a393ea96c84dd216694d11c22b0744.zip | |
Suppress reboot required by hotfix
| -rw-r--r-- | dist-assets/windows/installer.nsh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 149468cdc4..fb048fdd24 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -97,6 +97,8 @@ Goto InstallWin7Hotfix_return ${EndIf} + MessageBox MB_ICONINFORMATION|MB_YESNO "Windows hotfix KB2921916 must be installed for the app to work on Windows 7. Do you want to install it now?" IDNO InstallWin7Hotfix_return + log::Log "Extracting KB2921916" SetOutPath "$TEMP" @@ -104,10 +106,14 @@ log::Log "Installing KB2921916" - nsExec::ExecToStack '"$SYSDIR\wusa.exe" "$TEMP\Windows6.1-KB2921916-x64.msu"' + nsExec::ExecToStack '"$SYSDIR\wusa.exe" "$TEMP\Windows6.1-KB2921916-x64.msu" /quiet /norestart' Pop $0 Pop $1 + ${If} $0 == 3010 + MessageBox MB_OK "You may need to restart your computer for the patch to take effect." + ${EndIf} + IntFmt $0 "0x%X" $0 log::Log "wusa.exe result: $0" |