diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-09-18 14:20:31 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-09-18 14:20:31 +0200 |
| commit | dabd95c0dc617bedb653c6e55087ebea3cb9f3cc (patch) | |
| tree | 127e41d4fab0b6bd9d5917e39885715d8fea2491 | |
| parent | f11e578ec3d762431670e8cb020a5fa174834ff8 (diff) | |
| parent | 8c7c12425dc2487bf9e4fd18826b7aa659816ab9 (diff) | |
| download | mullvadvpn-dabd95c0dc617bedb653c6e55087ebea3cb9f3cc.tar.xz mullvadvpn-dabd95c0dc617bedb653c6e55087ebea3cb9f3cc.zip | |
Merge branch 'win-fix-installer-reg-paths'
| -rw-r--r-- | dist-assets/windows/installer.nsh | 24 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 |
2 files changed, 21 insertions, 5 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 03c5de1e98..c9ff304c0b 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -44,6 +44,10 @@ # Windows error codes !define ERROR_SERVICE_DEPENDENCY_DELETED 1075 +# Override electron-builder generated application settings key. +# electron-builder uses a GUID here rather than the application name. +!define INSTALL_REGISTRY_KEY "Software\${PRODUCT_NAME}" + # # BreakInstallation # @@ -467,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 + + # 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 - 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.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 # diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 5e08455b45..16bdd4f811 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -60,7 +60,7 @@ const config = { }, nsis: { - guid: 'Mullvad VPN', + guid: '2A356FD4-03B7-4F45-99B4-737BE580DC82', oneClick: false, perMachine: true, allowElevation: true, |