diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-09-18 13:52:15 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-09-18 14:19:34 +0200 |
| commit | 8c7c12425dc2487bf9e4fd18826b7aa659816ab9 (patch) | |
| tree | 127e41d4fab0b6bd9d5917e39885715d8fea2491 | |
| parent | a2cd72ecdd26f453cb75f3d5a3bd73b193ba27ab (diff) | |
| download | mullvadvpn-8c7c12425dc2487bf9e4fd18826b7aa659816ab9.tar.xz mullvadvpn-8c7c12425dc2487bf9e4fd18826b7aa659816ab9.zip | |
Update registry migration logic
| -rw-r--r-- | dist-assets/windows/installer.nsh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 367a251b67..c9ff304c0b 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -471,21 +471,33 @@ !macro customInit Push $0 - - registry::MoveKey "HKLM\SOFTWARE\8fa2c331-e09e-5709-bc74-c59df61f0c7e" "HKLM\SOFTWARE\Mullvad VPN" + + # Application settings key + # Migrate 2018.(x<6) to current + registry::MoveKey "HKLM\SOFTWARE\8fa2c331-e09e-5709-bc74-c59df61f0c7e" "HKLM\SOFTWARE\${PRODUCT_NAME}" # Discard return value Pop $0 Pop $0 - registry::MoveKey "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\8fa2c331-e09e-5709-bc74-c59df61f0c7e" "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Mullvad VPN" + # 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}}" # Discard return value Pop $0 Pop $0 + # 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}}" + + # Discard return value Pop $0 - + Pop $0 + + Pop $0 + !macroend # |