summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/x-win/package.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 3c9e8b33f5..6ae87eea2f 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -323,8 +323,8 @@ cat >> $NSISFILE << EOF
Function .onInit
ReadRegStr \$R0 HKLM \
- "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}" \
- "UninstallString"
+ "Software\\${PROGRAM_NAME}\\v${PROGRAM_VERSION}\\$WARCH" \
+ "Install_Dir"
StrCmp \$R0 "" done
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
@@ -438,6 +438,7 @@ cat >> $NSISFILE << EOF
Section "Uninstall"
SetShellVarContext all
DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}"
+ DeleteRegKey HKLM "Software\\${PROGRAM_NAME}\\v${PROGRAM_VERSION}\\$WARCH"
DeleteRegKey HKLM "Software\\${PROGRAM_NAME}\\v${PROGRAM_VERSION}"
RMDir /r "\$INSTDIR\\bin"
RMDir /r "\$INSTDIR\\lib"