refactor(desktop): retain existing installer directory lifecycle

This commit is contained in:
Tianyi Cui committed 2026-09-29 14:21:17 +08:00
1 parent f50b6db1c1
commit 800f1b147b
3 files changed
+2 -5

No files matched your search

-1
View File
@@ -74,7 +74,6 @@ Function InstallerProgressShow
FunctionEnd
Function .onInstFailed
Call dshCleanupDirectories
MessageBox MB_OK|MB_ICONEXCLAMATION "$(INSTALLER_FAILED)" /SD IDOK
SetErrorLevel 2
Quit
@@ -16,7 +16,7 @@ Var dshNewMoved
!endif
${If} $R0 != 0
DetailPrint $R1
Call dshCleanupDirectories
Call dshRollbackDirectories
!ifmacrodef customInstallerExtractFailed
!insertmacro customInstallerExtractFailed "${FILE}"
!else
@@ -31,7 +31,6 @@ Var dshNewMoved
StrCpy $dshFinalDirectory $INSTDIR
System::Call 'ole32::CoCreateGuid(g .r0) i .r1'
${If} $1 != 0
Call dshCleanupDirectories
SetErrorLevel 2
Quit
${EndIf}
@@ -42,7 +41,6 @@ Var dshNewMoved
ClearErrors
CreateDirectory $dshNewDirectory
${If} ${Errors}
Call dshCleanupDirectories
SetErrorLevel 2
Quit
${EndIf}
@@ -37,7 +37,7 @@ export function directoryInstallSection(source) {
!macroend`)
result = replaceOnce(result, '!insertmacro setLinkVars', `!insertmacro setLinkVars
!insertmacro dshStageApplication`)
result = replaceOnce(result, '!insertmacro installApplicationFiles', 'Call dshPromoteDirectories\n${If} ${Errors}\n Call dshCleanupDirectories\n SetErrorLevel 2\n MessageBox MB_OK|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDOK\n Quit\n${EndIf}')
result = replaceOnce(result, '!insertmacro installApplicationFiles', 'Call dshPromoteDirectories\nIfErrors 0 +4\n SetErrorLevel 2\n MessageBox MB_OK|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDOK\n Quit')
result = replaceOnce(result, '!ifdef UNINSTALLER_ICON\n File /oname=uninstallerIcon.ico "${UNINSTALLER_ICON}"\n!endif\n', '')
// The staging macro uses the upstream installer macro, including its signed uninstaller.
return result