From 816784f869df04f25ce33bd46939372252a096c8 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 25 Jun 2013 18:10:58 +0200
Subject: [PATCH] add change exec bits & make jre and flash update optional

---
 builder-product.cfg   |  2 ++
 builder-targets-cb.sh | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/builder-product.cfg b/builder-product.cfg
index 64dd123..b8140b3 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -53,6 +53,7 @@ DL_WINST_NAME[7]=AdobeAirInstallExe
 
 JREUVERSION="21"
 JREVERSION="7.0.210.11"
+JREUPDATE="0"
 
 DL_FILE[8]="jre7u${JREUVERSION}-x86.exe"
 DL_SOURCE[8]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=76860"
@@ -65,6 +66,7 @@ DL_ARCH[9]="X86"
 DL_WINST_NAME[9]=InstallJre64Exe
 
 FLASHVERSION="11.7.700.224"
+FLASHUPDATE="0"
 
 DL_FILE[10]="install_flash_player-${FLASHVERSION}.exe"
 DL_SOURCE[10]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 8a2c4a5..d0da2b2 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -89,11 +89,13 @@ 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
+    if [ "$JREUPDATE" = "1" ]; then
+	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
+    fi
 
     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
@@ -103,11 +105,13 @@ function create() {
     sed 's/.*\t<\/install>.*/\t\t<cmd path="fixup.bat" \/>\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
+    if [ "$FLASHUPDATE" = "1" ]; then
+	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
+    fi
 
     # 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
@@ -122,6 +126,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/
 
+    # set exec bit on executeables
+    find $INST_DIR/CLIENT_DATA -type f -iname "*.exe" -o -iname "*.bat" -o -iname "*.cmd" -o -iname "*.msi" -o -iname "*.msp" | xargs chmod +x -v
+
     # delete the temp directory
     rm -rf $INST_DIR/CLIENT_DATA/X86
 }
\ No newline at end of file