From 77719527ff217bc076b28027067287f0363d7db8 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 5 Sep 2013 07:34:02 +0200 Subject: [PATCH] no need for generel runtimes update --- builder-product.cfg | 2 +- builder-targets-cb.sh | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/builder-product.cfg b/builder-product.cfg index 544e11a..58e050a 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -75,7 +75,7 @@ RICKTENDONET="2013.8.15" # ================================== # General Runtimes Verison # ================================== - +GENERALUPDATE="0" GENERALVERSION="1.1.0.4" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 63814cc..0bc958b 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -118,12 +118,14 @@ function create() { # Replace the General Runtimes with the Msi version off GeosOne # ========================================================================================================== - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/* - - mv -v $INST_DIR/CLIENT_DATA/GeosOne_BR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml - mv -v $INST_DIR/CLIENT_DATA/X86/Geos_One_General_Runtimes_Installer_${GENERALVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/Geos_One_General_Runtimes_Installer.msi - sed "s!.\..\..\..!${GENERALVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml - + if [ "$GENERALUPDATE" = "1" ]; then + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/* + mv -v $INST_DIR/CLIENT_DATA/GeosOne_BR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml + mv -v $INST_DIR/CLIENT_DATA/X86/Geos_One_General_Runtimes_Installer_${GENERALVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/Geos_One_General_Runtimes_Installer.msi + sed "s!.\..\..\..!${GENERALVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml + else + rm $INST_DIR/CLIENT_DATA/GeosOne_BR_package.xml + fi # ========================================================================================================== # integrate Adobe AIR # ==========================================================================================================