From ad4a02dc5d7d89d9f29e5113cafcef89df2bf11f Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 20 Aug 2015 20:39:09 +0200 Subject: [PATCH] Use wincert .net 4.6 --- builder-product.cfg | 2 +- builder-targets-cb.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builder-product.cfg b/builder-product.cfg index a9ecc33..236575a 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -82,7 +82,7 @@ RICKTENDOAIO="2014.11.11" RICKTENDONET45UPDATE="1" RICKTENDONET45VER="452" RICKTENDONET45LANGVER="452" -RICKTENDONET46UPDATE="0" +RICKTENDONET46UPDATE="1" RICKTENDONET46VER="46" RICKTENDONET46LANGVER="46" RICKTENDONET="2015.08.16" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index b9f4212..18dab97 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -261,7 +261,10 @@ function create() { if [ "$RICKTENDONET46UPDATE" = "1" ]; then rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.6 mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/4.6 - 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]} + mkdir -p $INST_DIR/CLIENT_DATA/X86/net46 + 7z x -o$INST_DIR/CLIENT_DATA/X86/net46 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]} + #7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]} + 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/net46/*.exe 7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[26]} mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.6/package.xml else