From 2bcbdb62765910a3a97ba1332a765f910e47e3ba Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 23 May 2013 19:14:54 +0200 Subject: [PATCH] Bump Flash and Air --- air3-8_win.exe.sha1sum | 1 - air_3.8.0.440_win.exe.sha1sum | 1 + builder-product.cfg | 8 +++++--- builder-targets-cb.sh | 5 +++-- createjrepack.sh | 20 +++++++++++-------- install_flash_player-11.7.700.169.exe.sha1sum | 1 - install_flash_player-11.7.700.202.exe.sha1sum | 1 + ...l_flash_player_ax-11.7.700.169.exe.sha1sum | 1 - ...l_flash_player_ax-11.7.700.202.exe.sha1sum | 1 + ...tall_flash_player-11.7.700.202.exe.sha1sum | 1 + uninstall_flash_player.exe.sha1sum | 1 - 11 files changed, 24 insertions(+), 17 deletions(-) delete mode 100644 air3-8_win.exe.sha1sum create mode 100644 air_3.8.0.440_win.exe.sha1sum mode change 100644 => 100755 createjrepack.sh delete mode 100644 install_flash_player-11.7.700.169.exe.sha1sum create mode 100644 install_flash_player-11.7.700.202.exe.sha1sum delete mode 100644 install_flash_player_ax-11.7.700.169.exe.sha1sum create mode 100644 install_flash_player_ax-11.7.700.202.exe.sha1sum create mode 100644 uninstall_flash_player-11.7.700.202.exe.sha1sum delete mode 100644 uninstall_flash_player.exe.sha1sum diff --git a/air3-8_win.exe.sha1sum b/air3-8_win.exe.sha1sum deleted file mode 100644 index 46a3b0c..0000000 --- a/air3-8_win.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -6b84789bba106d2e120ad9a4a06b46e3e505c324 /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/air3-8_win.exe diff --git a/air_3.8.0.440_win.exe.sha1sum b/air_3.8.0.440_win.exe.sha1sum new file mode 100644 index 0000000..0b0ec33 --- /dev/null +++ b/air_3.8.0.440_win.exe.sha1sum @@ -0,0 +1 @@ +22bf78d9a84dcedba5eeffbff8991d75b700eb3e /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/air_3.8.0.440_win.exe diff --git a/builder-product.cfg b/builder-product.cfg index 22824b7..65a3e11 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -43,7 +43,9 @@ DL_EXTRACT_TO[6]="win8dotnet35" # DL_EXTRACT_FORMAT[6]="7zip" # DL_EXTRACT_TO[6]="win8dotnet35" -DL_FILE[7]="air3-8_win.exe" +AIRVERSION="3.8.0.440" + +DL_FILE[7]="air_${AIRVERSION}_win.exe" DL_SOURCE[7]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-8_win.exe" DL_ARCH[7]="X86" DL_WINST_NAME[7]=AdobeAirInstallExe @@ -53,7 +55,7 @@ DL_SOURCE[8]="http://ftp.disconnected-by-peer.at/opsi/jre7u21.zip" DL_ARCH[8]="X86" DL_EXTRACT_FORMAT[8]="7zip" -FLASHVERSION="11.7.700.169" +FLASHVERSION="11.7.700.202" DL_FILE[9]="install_flash_player-${FLASHVERSION}.exe" DL_SOURCE[9]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe" @@ -81,7 +83,7 @@ DL_SOURCE[2]="http://download.thewebatom.net/50f69935741f0/JavaRa-2.1.zip" DL_ARCH[2]="X86" DL_EXTRACT_FORMAT[2]="unzip" -DL_FILE[3]="uninstall_flash_player.exe" +DL_FILE[3]="uninstall_flash_player-${FLASHVERSION}.exe" DL_SOURCE[3]="http://download.macromedia.com/get/flashplayer/current/support/uninstall_flash_player.exe" DL_ARCH[3]="X86" DL_WINST_NAME[3]=UninstallFlashExe diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index d5cf065..50e1906 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -80,9 +80,10 @@ function create() { sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml # Move Adobe Air and sereby config in place - mv -v $INST_DIR/CLIENT_DATA/X86/air3-8_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air + mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe mv -v $INST_DIR/CLIENT_DATA/AdobeAIR.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml sed 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml + sed "s!.\..\..\....!${AIRVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml # Update Java rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE @@ -100,7 +101,7 @@ function create() { mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE mv -v $INST_DIR/CLIENT_DATA/CleanSilverlight.cmd $INST_DIR/CLIENT_DATA/UnInstall/Packages/Silverlight mv -v $INST_DIR/CLIENT_DATA/X86/dotnet $INST_DIR/CLIENT_DATA/UnInstall/NET - mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash + mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash/uninstall_flash_player.exe mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave diff --git a/createjrepack.sh b/createjrepack.sh old mode 100644 new mode 100755 index f99e47e..8c6c092 --- a/createjrepack.sh +++ b/createjrepack.sh @@ -6,6 +6,7 @@ BUILD="11" TEMPDIR=$( mktemp -d ) +USERNAME=$( whoami ) pushd $TEMPDIR wget http://javadl.sun.com/webapps/download/AutoDL?BundleId=76860 -O jre-${VERSION}u${UPDATE}-windows-i586.exe @@ -13,23 +14,26 @@ wget http://javadl.sun.com/webapps/download/AutoDL?BundleId=76862 -O jre-${VERSI mkdir JRE WINEPREFIX=$TEMPDIR/prefix32 WINEARCH=win32 wine jre-${VERSION}u${UPDATE}-windows-i586.exe & -while [ ! -s $TEMPDIR/prefix32/drive_c/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.7.0_21/jre1.${VERSION}.0_${UPDATE}/*.msi ] - do - printf "." + +while : ; do + [[ -f "$TEMPDIR/prefix32/drive_c/users/${USERNAME}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}/Data1.cab" ]] && break + echo "Pausing until file exists." + sleep 1 done pushd JRE mkdir X86 -cp -v $TEMPDIR/prefix32/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}/* X86 +cp -v "$TEMPDIR/prefix32/drive_c/users/${USERNAME}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}/*" "X86" popd killall wine WINEPREFIX=$TEMPDIR/prefix64 WINEARCH=win64 wine jre-${VERSION}u${UPDATE}-windows-x64.exe & -while [ ! -s $TEMPDIR/prefix64/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/*.msi ] - do - printf "." +while : ; do + [[ -f "$TEMPDIR/prefix64/drive_c/users/${USERNAME}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/Data1.cab" ]] && break + echo "Pausing until file exists." + sleep 1 done pushd JRE mkdir X64 -cp -v $TEMPDIR/prefix64/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/* X64 +cp -v "$TEMPDIR/prefix64/drive_c/users/${USERNAME}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/*" "X64" popd killall wine diff --git a/install_flash_player-11.7.700.169.exe.sha1sum b/install_flash_player-11.7.700.169.exe.sha1sum deleted file mode 100644 index e7fa1d7..0000000 --- a/install_flash_player-11.7.700.169.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -6f82c11e0dc67283fee46f5982cafad8eff7103a /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/install_flash_player-11.7.700.169.exe diff --git a/install_flash_player-11.7.700.202.exe.sha1sum b/install_flash_player-11.7.700.202.exe.sha1sum new file mode 100644 index 0000000..8428c7a --- /dev/null +++ b/install_flash_player-11.7.700.202.exe.sha1sum @@ -0,0 +1 @@ +8398b349f04200a8d422f0102b6fa94b7d73ec34 /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/install_flash_player-11.7.700.202.exe diff --git a/install_flash_player_ax-11.7.700.169.exe.sha1sum b/install_flash_player_ax-11.7.700.169.exe.sha1sum deleted file mode 100644 index 98cbfa6..0000000 --- a/install_flash_player_ax-11.7.700.169.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -91a22404552cc95ad129c1fb42adb86c046aba8f /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/install_flash_player_ax-11.7.700.169.exe diff --git a/install_flash_player_ax-11.7.700.202.exe.sha1sum b/install_flash_player_ax-11.7.700.202.exe.sha1sum new file mode 100644 index 0000000..a02d3bd --- /dev/null +++ b/install_flash_player_ax-11.7.700.202.exe.sha1sum @@ -0,0 +1 @@ +29bc8c2e36a0af8c5b2cfb7e1ff62fbb3cb2bdd4 /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/install_flash_player_ax-11.7.700.202.exe diff --git a/uninstall_flash_player-11.7.700.202.exe.sha1sum b/uninstall_flash_player-11.7.700.202.exe.sha1sum new file mode 100644 index 0000000..d8b0fb3 --- /dev/null +++ b/uninstall_flash_player-11.7.700.202.exe.sha1sum @@ -0,0 +1 @@ +b10a983ff1fc234791ab82d4f5b56f739455a600 /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/uninstall_flash_player-11.7.700.202.exe diff --git a/uninstall_flash_player.exe.sha1sum b/uninstall_flash_player.exe.sha1sum deleted file mode 100644 index 3fb6d43..0000000 --- a/uninstall_flash_player.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -1cf5f425c5b968a8f8ae3386800afee1987ea3cc /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/uninstall_flash_player.exe