diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-21 15:47:12 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-21 15:47:12 +0200 |
commit | d7359c38b197c221c43def1e24cb48d4aee51bba (patch) | |
tree | 133fbe3ef3eb0f7ce6b151db1ed86bfd9c4abb60 /application/palemoon/installer/windows/nsis/uninstaller.nsi | |
parent | 2a5466cfbaab490c9abd96ff166689ad8a6d2121 (diff) | |
download | UXP-d7359c38b197c221c43def1e24cb48d4aee51bba.tar UXP-d7359c38b197c221c43def1e24cb48d4aee51bba.tar.gz UXP-d7359c38b197c221c43def1e24cb48d4aee51bba.tar.lz UXP-d7359c38b197c221c43def1e24cb48d4aee51bba.tar.xz UXP-d7359c38b197c221c43def1e24cb48d4aee51bba.zip |
Clean up the nsis installer script a litte.
- remove stub installer leftovers
- remove maintenance service leftovers
- remove unused macros
Diffstat (limited to 'application/palemoon/installer/windows/nsis/uninstaller.nsi')
-rw-r--r-- | application/palemoon/installer/windows/nsis/uninstaller.nsi | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/application/palemoon/installer/windows/nsis/uninstaller.nsi b/application/palemoon/installer/windows/nsis/uninstaller.nsi index c85af3656..215e93ac4 100644 --- a/application/palemoon/installer/windows/nsis/uninstaller.nsi +++ b/application/palemoon/installer/windows/nsis/uninstaller.nsi @@ -76,7 +76,6 @@ VIAddVersionKey "OriginalFilename" "helper.exe" !insertmacro InitHashAppModelId !insertmacro IsHandlerForInstallDir !insertmacro IsPinnedToTaskBar -!insertmacro IsUserAdmin !insertmacro LogDesktopShortcut !insertmacro LogQuickLaunchShortcut !insertmacro LogStartMenuShortcut @@ -168,56 +167,6 @@ UninstPage custom un.preConfirm ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe" ################################################################################ -# Helper Functions - -; This function is used to uninstall the maintenance service if the -; application currently being uninstalled is the last application to use the -; maintenance service. -Function un.UninstallServiceIfNotUsed - ; $0 will store if a subkey exists - ; $1 will store the first subkey if it exists or an empty string if it doesn't - ; Backup the old values - Push $0 - Push $1 - - ; The maintenance service always uses the 64-bit registry on x64 systems - ${If} ${RunningX64} - SetRegView 64 - ${EndIf} - - ; Figure out the number of subkeys - StrCpy $0 0 - ${Do} - EnumRegKey $1 HKLM "Software\Mozilla\MaintenanceService" $0 - ${If} "$1" == "" - ${ExitDo} - ${EndIf} - IntOp $0 $0 + 1 - ${Loop} - - ; Restore back the registry view - ${If} ${RunningX64} - SetRegView lastUsed - ${EndIf} - ${If} $0 == 0 - ; Get the path of the maintenance service uninstaller - ReadRegStr $1 HKLM ${MaintUninstallKey} "UninstallString" - - ; If the uninstall string does not exist, skip executing it - StrCmp $1 "" doneUninstall - - ; $1 is already a quoted string pointing to the install path - ; so we're already protected against paths with spaces - nsExec::Exec "$1 /S" -doneUninstall: - ${EndIf} - - ; Restore the old value of $1 and $0 - Pop $1 - Pop $0 -FunctionEnd - -################################################################################ # Install Sections ; Empty section required for the installer to compile as an uninstaller Section "" |