From e56814ec25cf179001043cf0156ebcd87a505515 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 7 Sep 2013 17:11:59 +0200 Subject: [PATCH] Bump --- CLIENT_DATA/opsi-adobe.acrobatpro8.ini | 30 +++++++++-- CLIENT_DATA/setup32.ins | 3 +- Setup.exe.sha1sum | 1 + builder-product.cfg | 70 ++++++-------------------- builder-targets-cb.sh | 11 ++++ 5 files changed, 53 insertions(+), 62 deletions(-) create mode 100644 Setup.exe.sha1sum diff --git a/CLIENT_DATA/opsi-adobe.acrobatpro8.ini b/CLIENT_DATA/opsi-adobe.acrobatpro8.ini index f92dbda..cf588f1 100644 --- a/CLIENT_DATA/opsi-adobe.acrobatpro8.ini +++ b/CLIENT_DATA/opsi-adobe.acrobatpro8.ini @@ -1,6 +1,26 @@ -[X86] -MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} +[Startup] +RequireOS=Windows 2000;Windows XP +RequireMSI=3.0 +RequireIE=6.0.2600.0 + +[Product] +msi=AcroPro.msi +Languages=1033;1031;1036 +1033=English (United States) +1031=German (Germany) +1036=French (France) + +[Windows 2000] +PlatformID=2 +MajorVersion=5 +ServicePackMajor=4 + +[Windows XP] +PlatformID=2 +MajorVersion=5 +MinorVersion=1 +ServicePackMajor=2 + +[MSI Updater] +Path=WindowsInstaller-KB893803-v2-x86.exe -[COMMON] -PN=name -VERSION=version diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index ff28cec..93337bc 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -90,7 +90,8 @@ else endif [Winbatch_install] -msiexec /i "$Install80Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ISX_SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" PATCH="$Install810Msp$;$Install811Msp$;$Install812Msp$;$Install813Msp$;$Install814Msp$;$Install815Msp$;$Install816Msp$;$Install817Msp$;$Install820Msp$;$Install821Msp$;$Install822Msp$;$Install823Msp$;$Install823Msp$;$Install825Msp$;$Install826Msp$;$Install830Msp$;$Install831Msp$" TRANSFORMS="$Install80Path$\$LanguageId$.mst" ALLUSERS=1 REBOOT=ReallySuppress EULA_ACCEPT=YES +"$Install80Exe$" /sPB /sl "$LanguageId$" +'/msi ALLUSERS=1 REBOOT=ReallySuppress EULA_ACCEPT=YES [Files_install] ; copy the ini file to the InstallDir diff --git a/Setup.exe.sha1sum b/Setup.exe.sha1sum new file mode 100644 index 0000000..1324e20 --- /dev/null +++ b/Setup.exe.sha1sum @@ -0,0 +1 @@ +e4ec0df44bfd8f062c71c0de59c0e93fa87a01cc /home/mario/.opsi-dist-cache/adobe.acrobatpro8-8.3.1/X86/Setup.exe diff --git a/builder-product.cfg b/builder-product.cfg index 2876900..f002373 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -21,6 +21,7 @@ DL_FILE[1]="APRO23_Win_ESD1_WWEFG.exe" DL_SOURCE[1]="http://download.adobe.com/pub/adobe/magic/creativesuite/CS2_EOL/STEP/APRO23_Win_ESD1_WWEFG.exe" DL_ARCH[1]="X86" DL_EXTRACT_FORMAT[1]="7zip" +DL_EXTRACT_TO[1]="Temp" DL_FILE[2]="AcrobatUpd810_efgj_incr.msp" DL_SOURCE[2]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/8.x/8.1/misc/AcrobatUpd810_efgj_incr.msp" @@ -107,66 +108,23 @@ DL_SOURCE[18]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/8.x/8.3.1/misc/AcrobatU DL_ARCH[18]="X86" DL_EXTRACT_FORMAT[18]="cp" +DL_FILE[19]="Setup.exe" +DL_SOURCE[19]="http://www.adobe.com/support/acrobat/ts/documents/kb403246/Setup.exe" +DL_ARCH[19]="X86" +DL_EXTRACT_FORMAT[19]="cp" +DL_EXTRACT_TO[19]="Setup" + # File array index for the image showing while installing the program ICON_DL_INDEX=0 -WINST_NAME[0]="Install80Msi" -WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\Adobe Acrobat 8 Professional\\AcroPro.msi" - -WINST_NAME[1]="Install810Msp" -WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\AcrobatUpd810_efgj_incr.msp" - -WINST_NAME[2]="Install811Msp" -WINST_VALUE[2]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd811_all_incr.msp" - -WINST_NAME[3]="Install812Msp" -WINST_VALUE[3]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd812_all_incr.msp" - -WINST_NAME[4]="Install813Msp" -WINST_VALUE[4]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd813_all_incr.msp" - -WINST_NAME[5]="Install814Msp" -WINST_VALUE[5]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd814_all_incr.msp" - -WINST_NAME[6]="Install815Msp" -WINST_VALUE[6]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd815_all_incr.msp" - -WINST_NAME[7]="Install816Msp" -WINST_VALUE[7]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd816_all_incr.msp" - -WINST_NAME[8]="Install817Msp" -WINST_VALUE[8]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd817_all_incr.msp" - -WINST_NAME[9]="Install820Msp" -WINST_VALUE[9]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd820_all_incr.msp" - -WINST_NAME[10]="Install821Msp" -WINST_VALUE[10]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd821_all_incr.msp" - -WINST_NAME[11]="Install822Msp" -WINST_VALUE[11]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd822_all_incr.msp" - -WINST_NAME[12]="Install823Msp" -WINST_VALUE[12]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd823_all_incr.msp" - -WINST_NAME[13]="Install824Msp" -WINST_VALUE[13]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd824_all_incr.msp" - -WINST_NAME[14]="Install825Msp" -WINST_VALUE[14]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd825_all_incr.msp" - -WINST_NAME[15]="Install826Msp" -WINST_VALUE[15]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd826_all_incr.msp" - -WINST_NAME[16]="Install830Msp" -WINST_VALUE[16]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd830_all_incr.msp" - -WINST_NAME[17]="Install831Msp" -WINST_VALUE[17]="@DL_EXTRACT_WINST_PATH[3]@\\AcrobatUpd831_all_incr.msp" - -WINST_NAME[18]="Install80Path" -WINST_VALUE[18]="@DL_EXTRACT_WINST_PATH[1]@\\Adobe Acrobat 8 Professional" +WINST_NAME[0]="Install80Exe" +WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[2]@\\Setup.exe" OPSI_INI_SECTION[0]="X86" OPSI_INI_OPTION[0]="MsiId" OPSI_INI_VALUE[0]="{AC76BA86-1033-F400-7760-100000000003}" + +OPSI_INI_SECTION[1]="Product" +OPSI_INI_OPTION[1]="PATCH" +OPSI_INI_VALUE[1]="AcrobatUpd810_efgj_incr.msp;AcrobatUpd811_all_incr.msp;AcrobatUpd812_all_incr.msp;AcrobatUpd813_all_incr.msp;AcrobatUpd814_all_incr.msp;AcrobatUpd815_all_incr.msp;AcrobatUpd816_all_incr.msp;AcrobatUpd817_all_incr.msp;AcrobatUpd820_all_incr.msp;AcrobatUpd821_all_incr.msp;AcrobatUpd822_all_incr.msp;AcrobatUpd823_all_incr.msp;AcrobatUpd824_all_incr.msp;AcrobatUpd825_all_incr.msp;AcrobatUpd826_all_incr.msp;AcrobatUpd830_all_incr.msp;AcrobatUpd831_all_incr.msp" + diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 9a3d4a8..0adae3c 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -23,3 +23,14 @@ function cleanup() { echo "Cleanup" builder_cleanup } + +function create() { + echo "Create" + builder_create + + mv $INST_DIR/CLIENT_DATA/X86/Temp/Adobe\ Acrobat\ 8\ Professional/* $INST_DIR/CLIENT_DATA/X86/ + mv $INST_DIR/CLIENT_DATA/X86/Setup/* $INST_DIR/CLIENT_DATA/X86/ + mv $INST_DIR/CLIENT_DATA/opsi-$PN.ini $INST_DIR/CLIENT_DATA/X86/setup.ini + rm -rf $INST_DIR/CLIENT_DATA/X86/{Temp,Setup} +} +