Skip to content

Commit d4b17e3

Browse files
committed
Installer: Remove FixOffice365 script
- The script was only required for 32-bit OS and is now obsolete
1 parent cd241f8 commit d4b17e3

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

Packages/ITCXOP2/tools/FixOffice365.ps1

-13
This file was deleted.

Packages/doc/installation.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ List of Installer Return Codes
152152
| 11 | Could not determine path to Igor 10 executable. |
153153
| 12 | The file list for deinstallation could not be written |
154154
| 13 | An error occurred when trying to disable ASLR for Igor64.exe (requires for ITC XOP) |
155-
| 14 | An error occurred when trying to apply the FixOffice365 script |
156-
| 15 | The installation configuration could not be written |
155+
| 14 | The installation configuration could not be written |
157156
| 740 | Admin privileges required. The installer was run as regular user with the argument /ALLUSER |
158157
+-------------+---------------------------------------------------------------------------------------------------------------------------------+
159158

tools/installer/installer.nsi

+1-8
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
!define ERROR_NO_IGOR10_PATH 11
6060
!define ERROR_CANNOT_CREATE_UNINSTALL_FILELIST 12
6161
!define ERROR_CANNOT_DISABLE_ASLR 13
62-
!define ERROR_CANNOT_FIX_OFFICE365 14
63-
!define ERROR_CANNOT_CREATE_INSTALLCONFIG 15
62+
!define ERROR_CANNOT_CREATE_INSTALLCONFIG 14
6463
!define ERROR_ELEVATION_REQUIRED 740
6564

6665
#Unicode true
@@ -863,12 +862,6 @@ SkipASLRSetup:
863862

864863
IntCmp $ISADMIN 0 SkipITCSetup
865864
IntCmp $XOPINST 0 SkipITCSetup
866-
ExecWait 'Powershell.exe -executionPolicy bypass -File "$INSTDIR\Packages\ITCXOP2\tools\FixOffice365.ps1"' $0
867-
IntCmp $0 0 FixOffice365Done
868-
IfSilent +2
869-
MessageBox MB_OK "Can not apply Office365 fixes."
870-
!insertmacro QuitWithCode ERROR_CANNOT_FIX_OFFICE365
871-
FixOffice365Done:
872865
!insertmacro WriteITCRegistry
873866
${If} ${RunningX64}
874867
SetRegView 64

0 commit comments

Comments
 (0)