extract before install to work around a installer bug
This commit is contained in:
parent
fb707c3eab
commit
cca00db569
|
@ -22,6 +22,8 @@ DefVar $INST_architecture$
|
||||||
DefVar $OLD_VERSION$
|
DefVar $OLD_VERSION$
|
||||||
DefVar $OLD_CREATOR_TAG$
|
DefVar $OLD_CREATOR_TAG$
|
||||||
DefVar $OLD_RELEASE$
|
DefVar $OLD_RELEASE$
|
||||||
|
DefVar $RealInstall32Msi$
|
||||||
|
DefVar $RealInstall64Msi$
|
||||||
|
|
||||||
Set $INST_SystemType$ = GetSystemType
|
Set $INST_SystemType$ = GetSystemType
|
||||||
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
|
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
|
||||||
|
@ -52,6 +54,10 @@ Set $InstallDir64$ = "%ProgramFiles64Dir%\JPSoft"
|
||||||
|
|
||||||
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
|
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
|
||||||
|
|
||||||
|
Set $RealInstall32Msi$ = $LogDir$ + "\" + $Extract32Dir$ + "\" + $Install32Msi$
|
||||||
|
Set $RealInstall64Msi$ = $LogDir$ + "\" + $Extract64Dir$ + "\" + $Install64Msi$
|
||||||
|
|
||||||
|
|
||||||
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
|
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
|
||||||
LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
|
LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
|
||||||
isFatalError
|
isFatalError
|
||||||
|
@ -71,6 +77,8 @@ else
|
||||||
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
|
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
|
||||||
comment "Start setup program"
|
comment "Start setup program"
|
||||||
ChangeDirectory "%SCRIPTPATH%"
|
ChangeDirectory "%SCRIPTPATH%"
|
||||||
|
Winbatch_extract_32
|
||||||
|
Sub_check_exitcode
|
||||||
Winbatch_install_32
|
Winbatch_install_32
|
||||||
Sub_check_exitcode
|
Sub_check_exitcode
|
||||||
comment "Copy files"
|
comment "Copy files"
|
||||||
|
@ -85,6 +93,8 @@ else
|
||||||
Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
|
Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
|
||||||
comment "Start setup program"
|
comment "Start setup program"
|
||||||
ChangeDirectory "%SCRIPTPATH%"
|
ChangeDirectory "%SCRIPTPATH%"
|
||||||
|
Winbatch_extract_64
|
||||||
|
Sub_check_exitcode
|
||||||
Winbatch_install_64
|
Winbatch_install_64
|
||||||
Sub_check_exitcode
|
Sub_check_exitcode
|
||||||
comment "Copy files"
|
comment "Copy files"
|
||||||
|
@ -97,9 +107,11 @@ else
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
[Winbatch_extract_32]
|
||||||
|
"$Install32Exe$" /extract:"$LogDir$"
|
||||||
|
|
||||||
[Winbatch_install_32]
|
[Winbatch_install_32]
|
||||||
; 2 spaces between /qb and /l otherwise the extractor failes
|
msiexec /i "$RealInstall32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress
|
||||||
"$Install32Exe$" /qb /l* "$LogDir$\$ProductId$.install_log.txt" ALLUSERS=1 REBOOT=ReallySuppress
|
|
||||||
|
|
||||||
[Files_install_32]
|
[Files_install_32]
|
||||||
; copy the ini file to the InstallDir
|
; copy the ini file to the InstallDir
|
||||||
|
@ -109,9 +121,11 @@ copy "$IniCfgFile$" "$InstallDir32$"
|
||||||
;
|
;
|
||||||
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
|
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
|
||||||
|
|
||||||
|
[Winbatch_extract_64]
|
||||||
|
"$Install64Exe$" /extract:"$LogDir$"
|
||||||
|
|
||||||
[Winbatch_install_64]
|
[Winbatch_install_64]
|
||||||
; 2 spaces between /qb and /l otherwise the extractor failes
|
msiexec /i "$RealInstall64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress
|
||||||
"$Install64Exe$" /qb /l* "$LogDir$\$ProductId$.install_log.txt" ALLUSERS=1 REBOOT=ReallySuppress
|
|
||||||
|
|
||||||
[Files_install_64]
|
[Files_install_64]
|
||||||
; copy the ini file to the InstallDir
|
; copy the ini file to the InstallDir
|
||||||
|
|
|
@ -31,6 +31,18 @@ DL_WINST_NAME[2]=Install64Exe
|
||||||
# File array index for the image showing while installing the program
|
# File array index for the image showing while installing the program
|
||||||
ICON_DL_INDEX=0
|
ICON_DL_INDEX=0
|
||||||
|
|
||||||
|
WINST_NAME[0]="Install32Msi"
|
||||||
|
WINST_VALUE[0]="tccle.msi"
|
||||||
|
|
||||||
|
WINST_NAME[1]="Extract32Dir"
|
||||||
|
WINST_VALUE[1]="3C97621"
|
||||||
|
|
||||||
|
WINST_NAME[2]="Install64Msi"
|
||||||
|
WINST_VALUE[2]="tcclex64.msi"
|
||||||
|
|
||||||
|
WINST_NAME[3]="Extract64Dir"
|
||||||
|
WINST_VALUE[3]="6BA2265"
|
||||||
|
|
||||||
OPSI_INI_SECTION[0]="X86"
|
OPSI_INI_SECTION[0]="X86"
|
||||||
OPSI_INI_OPTION[0]="MsiId32"
|
OPSI_INI_OPTION[0]="MsiId32"
|
||||||
OPSI_INI_VALUE[0]="{CF67BC8F-42C3-40E7-A2E1-DD87A3C97621}"
|
OPSI_INI_VALUE[0]="{CF67BC8F-42C3-40E7-A2E1-DD87A3C97621}"
|
||||||
|
|
Loading…
Reference in New Issue