cirrect smal typos and apply patches on the installer

This commit is contained in:
Mario Fetka 2013-07-05 16:11:30 +02:00
parent c881832331
commit 011d3625ea
2 changed files with 13 additions and 39 deletions

View File

@ -21,6 +21,11 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$
DefStringList $languageInfo$
set $languageInfo$ = getLocaleInfoMap
DefVar $LanguageId$
set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
Set $LogDir$ = "%SystemDrive%\tmp"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@ -39,7 +44,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
;$ProductId$ should be the name of the product in opsi
; therefore please: only lower letters, no umlauts,
; no white space use '-' as a seperator
Set $MinimumSpace$ = "400 MB"
Set $MinimumSpace$ = "600 MB"
; the path were we find the product after the installation
Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Acrobat 7.0"
Set $LicenseRequired$ = "true"
@ -73,26 +78,6 @@ else
Winbatch_install
Sub_check_exitcode
comment "Update to 7.1.0"
Winbatch_710_update
Sub_check_exitcode
comment "Update to 7.1.1"
Winbatch_711_update
Sub_check_exitcode
comment "Update to 7.1.2"
Winbatch_712_update
Sub_check_exitcode
comment "Update to 7.1.3"
Winbatch_713_update
Sub_check_exitcode
comment "Update to 7.1.4"
Winbatch_714_update
Sub_check_exitcode
comment "Copy files"
Files_install /32Bit
@ -105,22 +90,7 @@ else
endif
[Winbatch_install]
msiexec /i "$Install70Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ISX_SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" ALLUSERS=1 REBOOT=ReallySuppress EULA_ACCEPT=YES
[Winbatch_710_update]
msiexec /p "$Install710Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress
[Winbatch_711_update]
msiexec /p "$Install711Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress
[Winbatch_712_update]
msiexec /p "$Install712Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress
[Winbatch_713_update]
msiexec /p "$Install713Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress
[Winbatch_714_update]
msiexec /p "$Install714Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress
msiexec /i "$Install70Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ISX_SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" PATCH="$Install710Msp$;$Install711Msp$;$Install712Msp$;$Install713Msp$;$Install714Msp$" TRANSFORMS="$Install70Path$\$LanguageId$.mst" ALLUSERS=1 REBOOT=ReallySuppress EULA_ACCEPT=YES
[Files_install]
; copy the ini file to the InstallDir

View File

@ -50,7 +50,7 @@ DL_EXTRACT_FORMAT[6]="cp"
# File array index for the image showing while installing the program
ICON_DL_INDEX=0
WINST_NAME[0]="Install7Msi"
WINST_NAME[0]="Install70Msi"
WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\AcroPro.msi"
WINST_NAME[1]="Install710Msp"
@ -68,7 +68,11 @@ WINST_VALUE[4]="@DL_EXTRACT_WINST_PATH[5]@\\AcrobatUpd713_all_incr.msp"
WINST_NAME[5]="Install714Msp"
WINST_VALUE[5]="@DL_EXTRACT_WINST_PATH[6]@\\AcrobatUpd714_all_incr.msp"
WINST_NAME[6]="Install70Path"
WINST_VALUE[6]="@DL_EXTRACT_WINST_PATH[1]@"
OPSI_INI_SECTION[0]="X86"
OPSI_INI_OPTION[0]="MsiId"
OPSI_INI_VALUE[0]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}"
OPSI_INI_VALUE[0]="{AC76BA86-1033-F400-7760-100000000002}"