use the exe installer directly

This commit is contained in:
Mario Fetka 2013-05-04 20:06:28 +02:00
parent 42a3d769da
commit f8add3d1a0
2 changed files with 5 additions and 23 deletions

View File

@ -70,9 +70,7 @@ else
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
comment "Start setup program"
ChangeDirectory "$LogDir$"
Winbatch_extract_32
Sub_check_exitcode
ChangeDirectory "%ScriptPath%"
Winbatch_install_32
Sub_check_exitcode
comment "Copy files"
@ -86,9 +84,7 @@ else
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
comment "Start setup program"
ChangeDirectory "$LogDir$"
Winbatch_extract_64
Sub_check_exitcode
ChangeDirectory "%ScriptPath%"
Winbatch_install_64
Sub_check_exitcode
comment "Copy files"
@ -101,12 +97,8 @@ else
endif
[Winbatch_extract_32]
copy $InstallExe$ $LogDir$\ClassicShellAll.exe
$LogDir$\ClassicShellAll.exe extract32
[Winbatch_install_32]
msiexec /i "$LogDir$\$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
"$InstallExe$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress
[Files_install_32]
; copy the ini file to the InstallDir
@ -116,12 +108,8 @@ copy "$IniCfgFile$" "$InstallDir32$"
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_extract_64]
copy $InstallExe$ $LogDir$\ClassicShellAll.exe
$LogDir$\ClassicShellAll.exe extract64
[Winbatch_install_64]
msiexec /i "$LogDir$\Install64Msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
"$InstallExe$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress
[Files_install_64]
; copy the ini file to the InstallDir

View File

@ -17,7 +17,7 @@ TYPE="public"
DL_FILE[0]="logo200-1759.png"
DL_SOURCE[0]="http://www.softwarecrew.com/wp-content/uploads/2012/01/logo200-1759.png"
DL_FILE[1]="ClassicShellSetup_${VERSION//./_}.exe"
DL_FILE[1]="ClassicShellSetup_${VERSION}.exe"
DL_SOURCE[1]="http://sourceforge.net/projects/classicshell/files/Version%20${VERSION}%20general%20release/ClassicShellSetup_${VERSION//./_}.exe"
DL_ARCH[1]="ALL"
DL_WINST_NAME[1]=InstallExe
@ -25,12 +25,6 @@ DL_WINST_NAME[1]=InstallExe
# File array index for the image showing while installing the program
ICON_DL_INDEX=0
WINST_NAME[0]="Install32Msi"
WINST_VALUE[0]="ClassicShellSetup32_${VERSION//./_}.msi"
WINST_NAME[1]="Install64Msi"
WINST_VALUE[1]="ClassicShellSetup64_${VERSION//./_}.msi"
OPSI_INI_SECTION[0]="X86"
OPSI_INI_OPTION[0]="MsiId32"
OPSI_INI_VALUE[0]="{D29400E8-A6AB-4AD0-A060-9627EFB283AD}"