Skip to content

Commit b8eb288

Browse files
enhance(nsis): clean up reg keys in uninstaller (#12427)
1 parent 90c6546 commit b8eb288

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'tauri-bundler': 'patch:bug'
3+
---
4+
5+
Clean up `Software\${MANUFACTURER}\${PRODUCTNAME}` registry key in the NSIS uninstaller if "Delete application data" option is checked when uninstalling.

crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ ${StrLoc}
5656
!define WEBVIEW2INSTALLERPATH "{{webview2_installer_path}}"
5757
!define MINIMUMWEBVIEW2VERSION "{{minimum_webview2_version}}"
5858
!define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}"
59-
!define MANUPRODUCTKEY "Software\${MANUFACTURER}\${PRODUCTNAME}"
59+
!define MANUKEY "Software\${MANUFACTURER}"
60+
!define MANUPRODUCTKEY "${MANUKEY}\${PRODUCTNAME}"
6061
!define UNINSTALLERSIGNCOMMAND "{{uninstaller_sign_cmd}}"
6162
!define ESTIMATEDSIZE "{{estimated_size}}"
6263
!define STARTMENUFOLDER "{{start_menu_folder}}"
@@ -834,12 +835,19 @@ Section Uninstall
834835
DeleteRegKey HKCU "${UNINSTKEY}"
835836
!endif
836837

837-
DeleteRegValue HKCU "${MANUPRODUCTKEY}" "Installer Language"
838-
839838
; Delete app data if the checkbox is selected
840839
; and if not updating
841840
${If} $DeleteAppDataCheckboxState = 1
842841
${AndIf} $UpdateMode <> 1
842+
; Clear the install location $INSTDIR from registry
843+
DeleteRegKey SHCTX "${MANUPRODUCTKEY}"
844+
DeleteRegKey /ifempty SHCTX "${MANUKEY}"
845+
846+
; Clear the install language from registry
847+
DeleteRegValue HKCU "${MANUPRODUCTKEY}" "Installer Language"
848+
DeleteRegKey /ifempty HKCU "${MANUPRODUCTKEY}"
849+
DeleteRegKey /ifempty HKCU "${MANUKEY}"
850+
843851
SetShellVarContext current
844852
RmDir /r "$APPDATA\${BUNDLEID}"
845853
RmDir /r "$LOCALAPPDATA\${BUNDLEID}"

0 commit comments

Comments
 (0)