diff options
| author | bitraid <bitraid@protonmail.ch> | 2018-11-06 12:30:34 +0200 |
|---|---|---|
| committer | bitraid <bitraid@protonmail.ch> | 2018-11-06 12:30:34 +0200 |
| commit | cc7ab995afb4c2ed3c1d777534139be0af79d9ca (patch) | |
| tree | e231722a32dba7a148d3179a4ea52eab522e91b1 /misc/nsis | |
| parent | 7452327850b7cf2cbfc5ee5e2f65eaa843d3dcf1 (diff) | |
| download | qutebrowser-cc7ab995afb4c2ed3c1d777534139be0af79d9ca.tar.gz qutebrowser-cc7ab995afb4c2ed3c1d777534139be0af79d9ca.zip | |
NSIS: remove icons and reg right after the exe
Remove the program's registry and icons right after the main exe, so if
it fails to remove another file and aborts, it won't leave invalid
entires. The user could run the uninstaller at another time (a restart
should fix any file locking issues).
Diffstat (limited to 'misc/nsis')
| -rwxr-xr-x | misc/nsis/uninstall.nsh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/nsis/uninstall.nsh b/misc/nsis/uninstall.nsh index f9737823f..20add35dd 100755 --- a/misc/nsis/uninstall.nsh +++ b/misc/nsis/uninstall.nsh @@ -58,10 +58,6 @@ Section "un.Program Files" SectionUninstallProgram ; Try to delete the EXE as the first step - if it's in use, don't remove anything else !insertmacro DeleteRetryAbort "$INSTDIR\${PROGEXE}" - ; Include and then delete the uninstall nsh file - !include "${UNLIST}" - !delfile "${UNLIST}" - ; Clean up "Dektop Icon" !insertmacro MULTIUSER_GetCurrentUserString $0 !insertmacro DeleteRetryAbort "$DESKTOP\${PRODUCT_NAME}$0.lnk" @@ -88,6 +84,10 @@ Section "un.Program Files" SectionUninstallProgram DeleteRegValue SHCTX "SOFTWARE\Classes\.webp\OpenWithProgids" "${PRODUCT_NAME}HTML" ${endif} ${endif} + + ; Include and then delete the uninstall nsh file + !include "${UNLIST}" + !delfile "${UNLIST}" SectionEnd SectionGroup /e "un.$UserName's Files" SectionGroupRemoveUserFiles |