From c8818323319a212a877c88b7b0f0ccd1e7c76f01 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 4 Jul 2013 19:22:32 +0200 Subject: [PATCH] Remove not needed patches --- Ac705PrP_ddnsfsip.exe.sha1sum | 1 - AcrobatUpd707_all_incr.exe.sha1sum | 1 - AcrobatUpd708_all_incr.exe.sha1sum | 1 - AcrobatUpd709_all_incr.exe.sha1sum | 1 - CLIENT_DATA/setup32.ins | 40 ++----------- builder-product.cfg | 90 ++++++++---------------------- 6 files changed, 30 insertions(+), 104 deletions(-) delete mode 100644 Ac705PrP_ddnsfsip.exe.sha1sum delete mode 100644 AcrobatUpd707_all_incr.exe.sha1sum delete mode 100644 AcrobatUpd708_all_incr.exe.sha1sum delete mode 100644 AcrobatUpd709_all_incr.exe.sha1sum diff --git a/Ac705PrP_ddnsfsip.exe.sha1sum b/Ac705PrP_ddnsfsip.exe.sha1sum deleted file mode 100644 index 188a8f6..0000000 --- a/Ac705PrP_ddnsfsip.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -0cbbecc4fee7c28a2d3f1b838682da362b9ae3de /home/mario/.opsi-dist-cache/adobe.acrobatpro7-7.1/X86/Ac705PrP_ddnsfsip.exe diff --git a/AcrobatUpd707_all_incr.exe.sha1sum b/AcrobatUpd707_all_incr.exe.sha1sum deleted file mode 100644 index cec9ac3..0000000 --- a/AcrobatUpd707_all_incr.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -517a9cdd5ca4c507a261b020de328de0114cd982 /home/mario/.opsi-dist-cache/adobe.acrobatpro7-7.1/X86/AcrobatUpd707_all_incr.exe diff --git a/AcrobatUpd708_all_incr.exe.sha1sum b/AcrobatUpd708_all_incr.exe.sha1sum deleted file mode 100644 index 0ab32c5..0000000 --- a/AcrobatUpd708_all_incr.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -0b8320e1f52f9e92950b5231b2d87d0718a4c0c0 /home/mario/.opsi-dist-cache/adobe.acrobatpro7-7.1/X86/AcrobatUpd708_all_incr.exe diff --git a/AcrobatUpd709_all_incr.exe.sha1sum b/AcrobatUpd709_all_incr.exe.sha1sum deleted file mode 100644 index 6c4b44b..0000000 --- a/AcrobatUpd709_all_incr.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -b45942c5678a6ebf8c14f49d388977feee96e9da /home/mario/.opsi-dist-cache/adobe.acrobatpro7-7.1.4/X86/AcrobatUpd709_all_incr.exe diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 21cf189..d15b3bd 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -73,22 +73,6 @@ else Winbatch_install Sub_check_exitcode - comment "Update to 7.0.5" - Winbatch_705_update - Sub_check_exitcode - - comment "Update to 7.0.7" - Winbatch_707_update - Sub_check_exitcode - - comment "Update to 7.0.8" - Winbatch_708_update - Sub_check_exitcode - - comment "Update to 7.0.9" - Winbatch_709_update - Sub_check_exitcode - comment "Update to 7.1.0" Winbatch_710_update Sub_check_exitcode @@ -121,34 +105,22 @@ else endif [Winbatch_install] -msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress EULA_ACCEPT=YES ISX_SERIALNUMBER=$Licensekey$ USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" - -[Winbatch_705_update] -msiexec /p "$Install705Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress - -[Winbatch_707_update] -msiexec /p "$Install707Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress - -[Winbatch_708_update] -msiexec /p "$Install708Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress - -[Winbatch_709_update] -msiexec /p "$Install709Msp$" /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$" 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 +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 +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 +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 +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 /p "$Install714Msp$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 EULA_ACCEPT=YES REINSTALLMODE=omus REINSTALL=ALL REBOOT=ReallySuppress [Files_install] ; copy the ini file to the InstallDir diff --git a/builder-product.cfg b/builder-product.cfg index 1dfe51d..67167fe 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -21,61 +21,31 @@ DL_FILE[1]="22020134.exe" DL_SOURCE[1]="http://download.adobe.com/pub/adobe/magic/creativesuite/CS2_EOL/APRO/22020134.exe" DL_ARCH[1]="X86" DL_EXTRACT_FORMAT[1]="7zip" -DL_EXTRACT_TO[1]="7.0" -DL_FILE[2]="Ac705PrP_ddnsfsip.exe" -DL_SOURCE[2]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.0.5/misc/Ac705PrP_ddnsfsip.exe" +DL_FILE[2]="AcroProUpd710_all_cum.exe" +DL_SOURCE[2]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.0/misc/AcroProUpd710_all_cum.exe" DL_ARCH[2]="X86" DL_EXTRACT_FORMAT[2]="7zip" -DL_EXTRACT_TO[2]="7.0.5" -DL_FILE[3]="AcrobatUpd707_all_incr.exe" -DL_SOURCE[3]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.0.7/misc/AcrobatUpd707_all_incr.exe" +DL_FILE[3]="AcroUpd711_all_incr.msp" +DL_SOURCE[3]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.1/misc/AcroUpd711_all_incr.msp" DL_ARCH[3]="X86" -DL_EXTRACT_FORMAT[3]="7zip" -DL_EXTRACT_TO[3]="7.0.7" +DL_EXTRACT_FORMAT[3]="cp" -DL_FILE[4]="AcrobatUpd708_all_incr.exe" -DL_SOURCE[4]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.0.8/misc/AcrobatUpd708_all_incr.exe" +DL_FILE[4]="AcrobatUpd712_all_incr.msp" +DL_SOURCE[4]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.2/misc/AcrobatUpd712_all_incr.msp" DL_ARCH[4]="X86" -DL_EXTRACT_FORMAT[4]="7zip" -DL_EXTRACT_TO[4]="7.0.8" +DL_EXTRACT_FORMAT[4]="cp" -DL_FILE[5]="AcrobatUpd709_all_incr.exe" -DL_SOURCE[5]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.0.9/misc/AcrobatUpd709_all_incr.exe" +DL_FILE[5]="AcrobatUpd713_all_incr.msp" +DL_SOURCE[5]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.3/misc/AcrobatUpd713_all_incr.msp" DL_ARCH[5]="X86" -DL_EXTRACT_FORMAT[5]="7zip" -DL_EXTRACT_TO[5]="7.0.9" +DL_EXTRACT_FORMAT[5]="cp" -DL_FILE[6]="AcroProUpd710_all_cum.exe" -DL_SOURCE[6]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.0/misc/AcroProUpd710_all_cum.exe" +DL_FILE[6]="AcrobatUpd714_all_incr.msp" +DL_SOURCE[6]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.4/misc/AcrobatUpd714_all_incr.msp" DL_ARCH[6]="X86" -DL_EXTRACT_FORMAT[6]="7zip" -DL_EXTRACT_TO[6]="7.1.0" - -DL_FILE[7]="AcroUpd711_all_incr.msp" -DL_SOURCE[7]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.1/misc/AcroUpd711_all_incr.msp" -DL_ARCH[7]="X86" -DL_EXTRACT_FORMAT[7]="cp" -DL_EXTRACT_TO[7]="7.1.1" - -DL_FILE[8]="AcrobatUpd712_all_incr.msp" -DL_SOURCE[8]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.2/misc/AcrobatUpd712_all_incr.msp" -DL_ARCH[8]="X86" -DL_EXTRACT_FORMAT[8]="cp" -DL_EXTRACT_TO[8]="7.1.2" - -DL_FILE[9]="AcrobatUpd713_all_incr.msp" -DL_SOURCE[9]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.3/misc/AcrobatUpd713_all_incr.msp" -DL_ARCH[9]="X86" -DL_EXTRACT_FORMAT[9]="cp" -DL_EXTRACT_TO[9]="7.1.3" - -DL_FILE[10]="AcrobatUpd714_all_incr.msp" -DL_SOURCE[10]="ftp://ftp.adobe.com/pub/adobe/acrobat/win/7x/7.1.4/misc/AcrobatUpd714_all_incr.msp" -DL_ARCH[10]="X86" -DL_EXTRACT_FORMAT[10]="cp" -DL_EXTRACT_TO[10]="7.1.4" +DL_EXTRACT_FORMAT[6]="cp" # File array index for the image showing while installing the program ICON_DL_INDEX=0 @@ -83,32 +53,20 @@ ICON_DL_INDEX=0 WINST_NAME[0]="Install7Msi" WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\AcroPro.msi" -WINST_NAME[1]="Install705Msp" -WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\7.0.5\\Ac705PrP_ddnsfsip.msp" +WINST_NAME[1]="Install710Msp" +WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\AcPr710.msp" -WINST_NAME[2]="Install707Msp" -WINST_VALUE[2]="@DL_EXTRACT_WINST_PATH[3]@\\7.0.7\\Acro707.msp" +WINST_NAME[2]="Install711Msp" +WINST_VALUE[2]="@DL_EXTRACT_WINST_PATH[3]@\\AcroUpd711_all_incr.msp" -WINST_NAME[3]="Install708Msp" -WINST_VALUE[3]="@DL_EXTRACT_WINST_PATH[4]@\\7.0.8\\Acro708.msp" +WINST_NAME[3]="Install712Msp" +WINST_VALUE[3]="@DL_EXTRACT_WINST_PATH[4]@\\AcrobatUpd712_all_incr.msp" -WINST_NAME[4]="Install709Msp" -WINST_VALUE[4]="@DL_EXTRACT_WINST_PATH[5]@\\7.0.9\\Acro709.msp" +WINST_NAME[4]="Install713Msp" +WINST_VALUE[4]="@DL_EXTRACT_WINST_PATH[5]@\\AcrobatUpd713_all_incr.msp" -WINST_NAME[5]="Install710Msp" -WINST_VALUE[5]="@DL_EXTRACT_WINST_PATH[6]@\\7.1.0\\AcPr710.msp" - -WINST_NAME[6]="Install711Msp" -WINST_VALUE[6]="@DL_EXTRACT_WINST_PATH[7]@\\7.1.1\\AcroUpd711_all_incr.msp" - -WINST_NAME[7]="Install712Msp" -WINST_VALUE[7]="@DL_EXTRACT_WINST_PATH[8]@\\7.1.2\\AcrobatUpd712_all_incr.msp" - -WINST_NAME[8]="Install713Msp" -WINST_VALUE[8]="@DL_EXTRACT_WINST_PATH[9]@\\7.1.3\\AcrobatUpd713_all_incr.msp" - -WINST_NAME[9]="Install714Msp" -WINST_VALUE[9]="@DL_EXTRACT_WINST_PATH[10]@\\7.1.4\\AcrobatUpd714_all_incr.msp" +WINST_NAME[5]="Install714Msp" +WINST_VALUE[5]="@DL_EXTRACT_WINST_PATH[6]@\\AcrobatUpd714_all_incr.msp" OPSI_INI_SECTION[0]="X86"