diff options
| author | Robin Gareus <robin@gareus.org> | 2015-04-23 20:32:28 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-04-23 20:32:28 +0200 |
| commit | d900f30357870329103c9b59f540250619ad4f11 (patch) | |
| tree | 8e0961e78b25776827c6c97f89ba66352d57158a /tools/x-win | |
| parent | 82cc394705e9f7e44cafd0039dca770e7dd7e75b (diff) | |
allow to install windows 32&64bit versions in parallel (again)
Diffstat (limited to 'tools/x-win')
| -rwxr-xr-x | tools/x-win/package.sh | 5 |
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" |