diff --git a/CLIENT_DATA/Sereby_JRE8_package.xml b/CLIENT_DATA/Sereby_JRE8_package.xml new file mode 100644 index 0000000..1483f1a --- /dev/null +++ b/CLIENT_DATA/Sereby_JRE8_package.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/CLIENT_DATA/Sereby_JRE8_x64_silent.bat b/CLIENT_DATA/Sereby_JRE8_x64_silent.bat new file mode 100644 index 0000000..6b6e730 --- /dev/null +++ b/CLIENT_DATA/Sereby_JRE8_x64_silent.bat @@ -0,0 +1,3 @@ +@echo off +title Installiere Java 8 +%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre8" \ No newline at end of file diff --git a/CLIENT_DATA/Sereby_JRE8_x86_silent.bat b/CLIENT_DATA/Sereby_JRE8_x86_silent.bat new file mode 100644 index 0000000..e729e61 --- /dev/null +++ b/CLIENT_DATA/Sereby_JRE8_x86_silent.bat @@ -0,0 +1,6 @@ +@echo off +SET pfdir=%ProgramFiles(x86)% +IF "%pfdir%"=="" SET pfdir=%ProgramFiles% + +title Installiere Java 8 +%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre8" \ No newline at end of file diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 496ed15..7e1274b 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -178,7 +178,12 @@ function create() { if [ "$JRE8UPDATE" = "1" ]; then rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/jre.exe + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/silent.bat + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*.xml + mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE8_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml + mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE8_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x86/silent.bat mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x86/jre.exe + mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE8_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/silent.bat mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/jre.exe patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/check[@type='os']" patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 8 Update ${JRE8UVERSION}"