added X64 support
This commit is contained in:
Dennis Trinks
parent
76a4593083
commit
20cb671efd
|
|
@ -8,6 +8,7 @@ requiredWinstVersion >= "4.10.8.6"
|
|||
|
||||
|
||||
DefVar $msifile$
|
||||
DefVar $msifileX64$
|
||||
DefVar $officescan.fqdn$
|
||||
DEfVar $officescan.sharename$
|
||||
DefVar $domainuser.loginname$
|
||||
|
|
@ -22,15 +23,19 @@ DefVar $ExitCode$
|
|||
DefVar $LicenseRequired$
|
||||
DefVar $LicenseKey$
|
||||
DefVar $LicensePool$
|
||||
DefVar $INST_SystemType$
|
||||
DefVar $INST_architecture$
|
||||
|
||||
Set $INST_SystemType$ = GetSystemType
|
||||
Set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
|
||||
|
||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||
|
||||
Set $officescan.fqdn$ = GetProductProperty ("officescan.fqdn","values")
|
||||
Set $officescan.sharename$ = GetProductProperty ("officescan.sharename","values")
|
||||
Set $domainuser.loginname$ = GetProductProperty ("domainuser.loginname","values")
|
||||
Set $domainuser.password$ = GetProductProperty ("domainuser.password","values")
|
||||
Set $msifile$ = "%SystemDrive%\tmp\agentWin32.msi"
|
||||
|
||||
Set $msifileX64$ = "%SystemDrive%\tmp\agentX64.msi"
|
||||
Set $connectionstr$ = "\\" + $officescan.fqdn$ + "\" + $officescan.sharename$ + " /user:" + $domainuser.loginname$ + " " + $domainuser.password$
|
||||
|
||||
|
||||
|
|
@ -71,8 +76,7 @@ else
|
|||
if $LicenseRequired$ = "true"
|
||||
comment "Licensing required, reserve license and get license key"
|
||||
Sub_get_licensekey
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
DosInAnIcon_delmsi
|
||||
DosInAnIcon_delvcredist
|
||||
|
|
@ -80,57 +84,112 @@ else
|
|||
comment "Start setup program"
|
||||
DosInAnIcon_mount
|
||||
|
||||
comment "Copy files"
|
||||
Files_install /32Bit
|
||||
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
|
||||
comment "Extracting VC++ 2005 Lib"
|
||||
Winbatch_install_extract
|
||||
Sub_check_exitcode
|
||||
|
||||
if not (FileExists($msifile$))
|
||||
isFatalError
|
||||
Endif
|
||||
if not (FileExists($LogDir$+"\vcredist.msi"))
|
||||
isFatalError
|
||||
Endif
|
||||
|
||||
comment "Extracting VC++ 2005 Lib"
|
||||
Winbatch_install_extract
|
||||
Sub_check_exitcode
|
||||
comment "Installing VC++ 2005 Lib"
|
||||
Winbatch_install_vcredist
|
||||
Sub_check_exitcode
|
||||
|
||||
DosInAnIcon_delvcredist
|
||||
|
||||
comment "Extracting VC++ 2005 Lib"
|
||||
Winbatch_install_extract_64
|
||||
Sub_check_exitcode
|
||||
|
||||
if not (FileExists($LogDir$+"\vcredist.msi"))
|
||||
isFatalError
|
||||
Endif
|
||||
if not (FileExists($LogDir$+"\vcredist.msi"))
|
||||
isFatalError
|
||||
Endif
|
||||
|
||||
comment "Installing VC++ 2005 Lib"
|
||||
Winbatch_install_vcredist
|
||||
Sub_check_exitcode
|
||||
comment "Installing VC++ 2005 Lib"
|
||||
Winbatch_install_vcredist
|
||||
Sub_check_exitcode
|
||||
|
||||
comment "Installing TM Worry Free"
|
||||
Winbatch_install_wf
|
||||
Sub_check_exitcode
|
||||
|
||||
comment "Cleanup Files"
|
||||
DosInAnIcon_delvcredist
|
||||
DosInAnIcon_delmsi
|
||||
; Files_install_64
|
||||
; if not (FileExists($msifileX64$))
|
||||
; isFatalError
|
||||
; Endif
|
||||
|
||||
comment "Installing TM Worry Free X64"
|
||||
Winbatch_install_wf_x64
|
||||
Sub_check_exitcode
|
||||
|
||||
comment "Cleanup Files"
|
||||
DosInAnIcon_delvcredist
|
||||
DosInAnIcon_delmsi_64
|
||||
endif
|
||||
|
||||
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
|
||||
comment "Extracting VC++ 2005 Lib"
|
||||
Winbatch_install_extract
|
||||
Sub_check_exitcode
|
||||
|
||||
if not (FileExists($LogDir$+"\vcredist.msi"))
|
||||
isFatalError
|
||||
Endif
|
||||
|
||||
comment "Installing VC++ 2005 Lib"
|
||||
Winbatch_install_vcredist
|
||||
Sub_check_exitcode
|
||||
|
||||
|
||||
comment "Copy files"
|
||||
Files_install_32 /32Bit
|
||||
if not (FileExists($msifile$))
|
||||
isFatalError
|
||||
Endif
|
||||
|
||||
comment "Installing TM Worry Free"
|
||||
Winbatch_install_wf
|
||||
Sub_check_exitcode
|
||||
|
||||
comment "Cleanup Files"
|
||||
DosInAnIcon_delvcredist
|
||||
DosInAnIcon_delmsi_32
|
||||
endif
|
||||
endif
|
||||
|
||||
[DosInAnIcon_mount]
|
||||
net use f: /delete /y
|
||||
net use f: $connectionstr$
|
||||
|
||||
[DosInAnIcon_delmsi]
|
||||
[DosInAnIcon_delmsi_32]
|
||||
del $msifile$
|
||||
|
||||
[DosInAnIcon_delmsi_64]
|
||||
del $msifileX64$
|
||||
|
||||
[DosInAnIcon_delvcredist]
|
||||
del $LogDir$\vcredist.msi
|
||||
del $LogDir$\vcredis1.cab
|
||||
|
||||
[Files_install]
|
||||
[Files_install_32]
|
||||
copy "F:\Download\agentWin32.msi" $LogDir$
|
||||
|
||||
[Files_install_64]
|
||||
copy "F:\Download\agentX64.msi" $LogDir$
|
||||
|
||||
[Winbatch_install_extract]
|
||||
$vcredist86Exe$ /Q /C /T:$LogDir$
|
||||
|
||||
[Winbatch_install_extract_64]
|
||||
$vcredist64Exe$ /Q /C /T:$LogDir$
|
||||
|
||||
[Winbatch_install_vcredist]
|
||||
$LogDir$\vcredist.msi /quiet
|
||||
|
||||
[Winbatch_install_wf]
|
||||
$msifile$ /quiet
|
||||
|
||||
[Winbatch_install_wf_x64]
|
||||
$msifileX64$ /quiet
|
||||
|
||||
|
||||
[Sub_check_exitcode]
|
||||
comment "Test for installation success via exit code"
|
||||
|
|
|
|||
|
|
@ -20,4 +20,9 @@ DL_SOURCE[1]="http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC
|
|||
DL_ARCH[1]="X86"
|
||||
DL_WINST_NAME[1]=vcredist86Exe
|
||||
|
||||
DL_FILE[2]="vcredistx64.exe"
|
||||
DL_SOURCE[2]="http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE"
|
||||
DL_ARCH[2]="X64"
|
||||
DL_WINST_NAME[2]=vcredist64Exe
|
||||
|
||||
ICON_DL_INDEX=0
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
ee916012783024dac67fc606457377932c826f05 /home/dtrinks/.opsi-dist-cache/trendmicro/trendmicro.wfbsstd7/1/X64/vcredistx64.exe
|
||||
Loading…
Reference in New Issue