diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-08-25 15:09:51 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-08-25 15:09:51 +0200 |
| commit | 6197f55f95390ebe05ec8b97502c56c30805a930 (patch) | |
| tree | 902e39f738017d93fe7e1fc2dce83c4186c2dcda | |
| parent | b09b39dea5328abbe76b935b5bcd550993edba6a (diff) | |
| parent | 0cdd9277e936c8063d213e4d712009d2bebb825d (diff) | |
| download | mullvadvpn-6197f55f95390ebe05ec8b97502c56c30805a930.tar.xz mullvadvpn-6197f55f95390ebe05ec8b97502c56c30805a930.zip | |
Merge branch 'fix-nsis-install'
| -rw-r--r-- | dist-assets/windows/installer.nsh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 275659b008..d1b9db702b 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -585,7 +585,7 @@ # Application uninstall key # Migrate 2018.(x<6) to current - registry::MoveKey "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\8fa2c331-e09e-5709-bc74-c59df61f0c7e" "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{${APP_GUID}}" + registry::MoveKey "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\8fa2c331-e09e-5709-bc74-c59df61f0c7e" "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" # Discard return value Pop $0 @@ -593,7 +593,14 @@ # Application uninstall key # Migrate 2018.6 through 2019.7 to current - registry::MoveKey "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Mullvad VPN" "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{${APP_GUID}}" + registry::MoveKey "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Mullvad VPN" "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" + + # Discard return value + Pop $0 + Pop $0 + + # Migrate 2019.8 through 2020.5 to current + registry::MoveKey "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{${APP_GUID}}" "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" # Discard return value Pop $0 |