From 7125b6a83a04a24b22b5e8f31a114b4ba8885c7f Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 27 Aug 2016 20:09:15 +0200
Subject: [PATCH] correct java9 install script part

---
 builder-targets-cb.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 2171a6f..de974a0 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -180,15 +180,19 @@ function create() {
   
   if [ "$JRE9UPDATE" = "1" ]; then
     mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/{x86,x64}
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/*/jre.exe
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/*/silent.bat
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/*.xml
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE9_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml
+    mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE9_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x86/silent.bat
     mv $INST_DIR/CLIENT_DATA/X86/jre9u${JRE9UVERSION}-b${JRE9BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x86/jre.exe
+    mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE9_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x64/silent.bat
     mv $INST_DIR/CLIENT_DATA/X86/jre9u${JRE9UVERSION}-b${JRE9BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x64/jre.exe
-    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 9 Update ${JRE9UVERSION} (Under Construction)"
+    patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/check[@type='os']"
+    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 9 Update ${JRE9UVERSION} (Early Access)"
     patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/variable[@name='BUILD']/@value" "${JRE9VERSION}"
-    sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml
-  else
-  rm $INST_DIR/CLIENT_DATA/Sereby_jre9_package.xml
   fi
+  sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml
   sed -e 's/.*<\/settings>.*/\t<set component="jre9" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
   
   # ==========================================================================================================