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

Revert "Windows installer: Add option to remove installdir when previous installation detected (#4564)" (#4697)

Browse source 
This reverts commit ca83e4303c.
This commit is contained in:
Tom Najdek 2024-09-19 13:27:14 +02:00 committed by Dan Stillman
parent 7749302295
commit acc727358b
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/win/installer/customLocale.nsh
View file

Binary file not shown.

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

@ -618,27 +618,17 @@ FunctionEnd
Function CheckExistingInstall Function CheckExistingInstall
; 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 +5 IfFileExists "$INSTDIR\${FileMainEXE}.moz-upgrade" +1 +4
MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UPGRADE)" IDNO +3 IDCANCEL +2 MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UPGRADE)" IDNO +2
Reboot Reboot
Quit Quit
RMDir /r $INSTDIR
IfFileExists "$INSTDIR\${FileMainEXE}.moz-upgrade" +1 +3
MessageBox MB_OK|MB_ICONEXCLAMATION "Failed to remove the previous installation. Please delete $INSTDIR and try again."
Quit
; 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 +5 IfFileExists "$INSTDIR\${FileMainEXE}.moz-delete" +1 +4
MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UNINSTALL)" IDNO +3 IDCANCEL +2 MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UNINSTALL)" IDNO +2
Reboot Reboot
Quit Quit
RMDir /r $INSTDIR
IfFileExists "$INSTDIR\${FileMainEXE}.moz-delete" +1 +3
MessageBox MB_OK|MB_ICONEXCLAMATION "Failed to remove the previous installation. Please delete $INSTDIR and try again."
Quit
${If} ${FileExists} "$INSTDIR\${FileMainEXE}" ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
; Disable the next, cancel, and back buttons ; Disable the next, cancel, and back buttons