Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(nsis): uninstaller installdir reg clean up #12427

Merged
merged 3 commits into from
Jan 20, 2025
Merged

fix(nsis): uninstaller installdir reg clean up #12427

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa6c05b
fix(nsis): uninstaller installdir reg clean up
Legend-Master Jan 17, 2025
536471e
Clear on `Delete the application data` is checked
Legend-Master Jan 20, 2025
17cf471
Update .changes/nsis-cleanup-installdir-reg.md
amrbashir Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/nsis-cleanup-installdir-reg.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'tauri-bundler': 'patch:bug'
---

Fix NSIS uninstaller not cleaning up `Software\${MANUFACTURER}\${PRODUCTNAME}` registry key used for the install location
amrbashir marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 9 additions & 1 deletion crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ ${StrLoc}
!define WEBVIEW2INSTALLERPATH "{{webview2_installer_path}}"
!define MINIMUMWEBVIEW2VERSION "{{minimum_webview2_version}}"
!define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}"
!define MANUPRODUCTKEY "Software\${MANUFACTURER}\${PRODUCTNAME}"
!define MANUKEY "Software\${MANUFACTURER}"
!define MANUPRODUCTKEY "${MANUKEY}\${PRODUCTNAME}"
!define UNINSTALLERSIGNCOMMAND "{{uninstaller_sign_cmd}}"
!define ESTIMATEDSIZE "{{estimated_size}}"
!define STARTMENUFOLDER "{{start_menu_folder}}"
Expand Down Expand Up @@ -834,7 +835,14 @@ Section Uninstall
DeleteRegKey HKCU "${UNINSTKEY}"
!endif

; Clear the install location $INSTDIR from registry
DeleteRegKey SHCTX "${MANUPRODUCTKEY}"
DeleteRegKey /ifempty SHCTX "${MANUKEY}"

; Clear the install language from registry
DeleteRegValue HKCU "${MANUPRODUCTKEY}" "Installer Language"
DeleteRegKey /ifempty HKCU "${MANUPRODUCTKEY}"
DeleteRegKey /ifempty HKCU "${MANUKEY}"

; Delete app data if the checkbox is selected
; and if not updating
Expand Down
Loading