fix(nsis): set correct ShellVarContext for uninstaller, closes #7315 (#7342)

This commit is contained in:
Amr Bashir 2023-07-10 14:46:15 +03:00 committed by GitHub
parent 32218a6f8c
commit 6e36ebbf84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 19 deletions

View File

@ -0,0 +1,5 @@
---
'tauri-bundler': 'patch:bug'
---
On Windows, fix NSIS uninstaller failing to remove Start Menu shortcut if `perMachine` mode is used.

View File

@ -344,16 +344,7 @@ FunctionEnd
!include "{{this}}" !include "{{this}}"
{{/each}} {{/each}}
Var PassiveMode !macro SetContext
Function .onInit
${GetOptions} $CMDLINE "/P" $PassiveMode
IfErrors +2 0
StrCpy $PassiveMode 1
!if "${DISPLAYLANGUAGESELECTOR}" == "true"
!insertmacro MUI_LANGDLL_DISPLAY
!endif
!if "${INSTALLMODE}" == "currentUser" !if "${INSTALLMODE}" == "currentUser"
SetShellVarContext current SetShellVarContext current
!else if "${INSTALLMODE}" == "perMachine" !else if "${INSTALLMODE}" == "perMachine"
@ -369,6 +360,19 @@ Function .onInit
SetRegView 32 SetRegView 32
!endif !endif
${EndIf} ${EndIf}
!macroend
Var PassiveMode
Function .onInit
${GetOptions} $CMDLINE "/P" $PassiveMode
IfErrors +2 0
StrCpy $PassiveMode 1
!if "${DISPLAYLANGUAGESELECTOR}" == "true"
!insertmacro MUI_LANGDLL_DISPLAY
!endif
!insertmacro SetContext
${If} $INSTDIR == "" ${If} $INSTDIR == ""
; Set default install location ; Set default install location
@ -595,15 +599,7 @@ Function .onInstSuccess
FunctionEnd FunctionEnd
Function un.onInit Function un.onInit
${If} ${RunningX64} !insertmacro SetContext
!if "${ARCH}" == "x64"
SetRegView 64
!else if "${ARCH}" == "arm64"
SetRegView 64
!else
SetRegView 32
!endif
${EndIf}
!if "${INSTALLMODE}" == "both" !if "${INSTALLMODE}" == "both"
!insertmacro MULTIUSER_UNINIT !insertmacro MULTIUSER_UNINIT