From 425d2db56aae35d66bac39e3a06396a4a0dfcd6d Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 5 Aug 2013 23:25:40 +0200 Subject: [PATCH] update adboe air and workaround the basic runtimes update problem with zlib1.dll --- CLIENT_DATA/AdobeFlash_mms.cfg | 1 + air_3.8.0.1040_win.exe.sha1sum | 1 + air_3.8.0.970_win.exe.sha1sum | 1 - builder-product.cfg | 2 +- builder-targets-cb.sh | 9 ++++++++- 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 air_3.8.0.1040_win.exe.sha1sum delete mode 100644 air_3.8.0.970_win.exe.sha1sum diff --git a/CLIENT_DATA/AdobeFlash_mms.cfg b/CLIENT_DATA/AdobeFlash_mms.cfg index 119f1e8..bf58237 100644 --- a/CLIENT_DATA/AdobeFlash_mms.cfg +++ b/CLIENT_DATA/AdobeFlash_mms.cfg @@ -1 +1,2 @@ AutoUpdateDisable=1 + diff --git a/air_3.8.0.1040_win.exe.sha1sum b/air_3.8.0.1040_win.exe.sha1sum new file mode 100644 index 0000000..5117bc7 --- /dev/null +++ b/air_3.8.0.1040_win.exe.sha1sum @@ -0,0 +1 @@ +0894068198eca1d54b7b72cae3a165c248132924 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/air_3.8.0.1040_win.exe diff --git a/air_3.8.0.970_win.exe.sha1sum b/air_3.8.0.970_win.exe.sha1sum deleted file mode 100644 index 779709b..0000000 --- a/air_3.8.0.970_win.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -4dc8f68b1217ec0267a10721fe790292d6170f61 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/air_3.8.0.970_win.exe diff --git a/builder-product.cfg b/builder-product.cfg index 35e4d08..60e48dc 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -56,7 +56,7 @@ DL_WINST_NAME[7]=DotNet81Source # DL_ARCH[7]="X86" # DL_WINST_NAME[7]=DotNet81Source -AIRVERSION="3.8.0.970" +AIRVERSION="3.8.0.1040" DL_FILE[8]="air_${AIRVERSION}_win.exe" DL_SOURCE[8]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-8_win.exe" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index cd9b839..c5c69c9 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -115,6 +115,12 @@ function create() { # sed force update on flash sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml + + # Workaround the update bug of the sereby Basic Runtimes + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp.bat + echo "del /f /q %WINDIR%\System32\zlib1.dll" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp.bat + echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp.bat + sed 's/.*\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml # Move Adobe Air and sereby config in place mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe @@ -190,8 +196,9 @@ function create() { # move the opsi wrapper to the right dir (close the error window if nothing needs to be done) mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/ - # change linefeed of bat files to work correctly + # change linefeed of bat & xml files to work correctly find $INST_DIR/CLIENT_DATA -name *.bat -print0 | xargs -0 unix2dos + find $INST_DIR/CLIENT_DATA -name package.xml -print0 | xargs -0 unix2dos # set exec bit on executeables find $INST_DIR/CLIENT_DATA/Install/ -type f -print0 | xargs -0 chmod +x