From ac9954daee91c8bdfcf38e09d514a39d7cc86d30 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 24 Jun 2013 14:46:31 +0200 Subject: [PATCH] Bump --- aio-runtimes_v2.0.5.1.7z.sha1sum | 1 - aio-runtimes_v2.0.6.1.7z.sha1sum | 1 + builder-product.cfg | 4 ++-- builder-targets-cb.sh | 21 +++++++++++---------- 4 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 aio-runtimes_v2.0.5.1.7z.sha1sum create mode 100644 aio-runtimes_v2.0.6.1.7z.sha1sum diff --git a/aio-runtimes_v2.0.5.1.7z.sha1sum b/aio-runtimes_v2.0.5.1.7z.sha1sum deleted file mode 100644 index e5982dc..0000000 --- a/aio-runtimes_v2.0.5.1.7z.sha1sum +++ /dev/null @@ -1 +0,0 @@ -07d89a37b4e68a407460f2505d19770084034362 /home/mario/.opsi-dist-cache/sereby.aio-2.0.5.1/X86/aio-runtimes_v2.0.5.1.7z diff --git a/aio-runtimes_v2.0.6.1.7z.sha1sum b/aio-runtimes_v2.0.6.1.7z.sha1sum new file mode 100644 index 0000000..f146b5e --- /dev/null +++ b/aio-runtimes_v2.0.6.1.7z.sha1sum @@ -0,0 +1 @@ +f836e0ea28053285173770218d94990dd7dd0c7b /home/mario/.opsi-dist-cache/sereby.aio-2.0.6.1/X86/aio-runtimes_v2.0.6.1.7z diff --git a/builder-product.cfg b/builder-product.cfg index ad52434..64dd123 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="sereby.org" PN="sereby.aio" NAME="All in One Runtimes " DESCRIPTION="Das All in One Runtimes Paket buendelt alle wichtigen Runtime Pakete die benoetigt werden um sicherzustellen, dass alle Programme auch reibungslos funktionieren." -VERSION="2.0.5.1" +VERSION="2.0.6.1" RELEASE="1" PRIORITY="0" ADVICE="" @@ -28,7 +28,7 @@ DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg" ## 1: 32 & 64 Bit Runtimes DL_FILE[5]="aio-runtimes_v${VERSION}.7z" -DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/63255/?download" +DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/63888/?download" DL_ARCH[5]="X86" DL_EXTRACT_FORMAT[5]="7zip" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index d76a56c..8a2c4a5 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -89,11 +89,12 @@ function create() { mv $INST_DIR/CLIENT_DATA/Install/Packages/JRE/_x64 $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64 # Update Java - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe - mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe - mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe - sed "s!Update ..!Update ${JREUVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml - sed "s!.\..\....\...!${JREVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml +# rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe +# mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe +# mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe +# sed "s!Update ..!Update ${JREUVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml +# sed "s!.\..\....\...!${JREVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml + sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/fixup.bat echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/fixup.bat @@ -102,11 +103,11 @@ function create() { sed 's/.*\t<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml # Update Flash - rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe - cp $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe - cp $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe - sed "s!..\..\....\....!${FLASHVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml - sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml +# rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe +# cp $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe +# cp $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe +# sed "s!..\..\....\....!${FLASHVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml +# sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml # move the uninstallers in place (directory layout like the sereby package) mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE