mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Installer: Ignore failed installs if user has no admin rights (#4760)

Browse source 
It's better to attempt to install into existing folder with some junk left over than to leave users in a reboot loop
This commit is contained in:
Tom Najdek 2024-10-15 16:22:18 +02:00 • committed by Dan Stillman
parent f2367c88f5
commit a36e0a88f6
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/win/installer/installer.nsi
View file

@ -618,19 +618,33 @@ Function AddQuickLaunchShortcut
FunctionEnd FunctionEnd
Function CheckExistingInstall Function CheckExistingInstall
UserInfo::GetAccountType
pop $0 ; $0 = "Admin" or "User" or "Guest". This is the account type.
; If there is a pending file copy from a previous upgrade don't allow ; If there is a pending file copy from a previous upgrade don't allow
; installing until after the system has rebooted. ; installing until after the system has rebooted.
IfFileExists "$INSTDIR\${FileMainEXE}.moz-upgrade" +1 +4 ${If} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-upgrade"
StrCmp $0 "Admin" +1 +4
MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UPGRADE)" IDNO +2 MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UPGRADE)" IDNO +2
Reboot Reboot
Quit Quit
; Non-admins cannot depend on files being removed on restart.
; Our only option is to remove these files and continue with the installation.
Delete "$INSTDIR\${FileMainEXE}.moz-upgrade"
Delete "$INSTDIR\${FileMainEXE}"
${EndIf}
; If there is a pending file deletion from a previous uninstall don't allow ; If there is a pending file deletion from a previous uninstall don't allow
; installing until after the system has rebooted. ; installing until after the system has rebooted.
IfFileExists "$INSTDIR\${FileMainEXE}.moz-delete" +1 +4 ${If} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-delete"
StrCmp $0 "Admin" +1 +4
MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UNINSTALL)" IDNO +2 MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UNINSTALL)" IDNO +2
Reboot Reboot
Quit Quit
; Non-admins cannot depend on files being removed on restart.
Delete "$INSTDIR\${FileMainEXE}.moz-delete"
Delete "$INSTDIR\${FileMainEXE}"
${EndIf}
${If} ${FileExists} "$INSTDIR\${FileMainEXE}" ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
; Disable the next, cancel, and back buttons ; Disable the next, cancel, and back buttons