Skip to content

Commit 8bac10b

Browse files
committed
Installer: Add handling of failed FixOffice365.ps1 call
If the call failed the installer returns error code 1. This allows for the silent case to catch this installation error.
1 parent 69062ad commit 8bac10b

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

tools/installer/installer.nsi

+7-1
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,13 @@ SkipASLRSetup:
835835

836836
IntCmp $ISADMIN 0 SkipITCSetup
837837
IntCmp $XOPINST 0 SkipITCSetup
838-
ExecWait 'Powershell.exe -executionPolicy bypass -File "$INSTDIR\Packages\ITCXOP2\tools\FixOffice365.ps1"'
838+
ExecWait 'Powershell.exe -executionPolicy bypass -File "$INSTDIR\Packages\ITCXOP2\tools\FixOffice365.ps1"' $0
839+
IntCmp $0 0 FixOffice365Done
840+
IfSilent +2
841+
MessageBox MB_OK "Can not apply Office365 fixes."
842+
SetErrorlevel 1
843+
Quit
844+
FixOffice365Done:
839845
!insertmacro WriteITCRegistry
840846
${If} ${RunningX64}
841847
SetRegView 64

0 commit comments

Comments
 (0)