Reset java8 installpath back jre8

This commit is contained in:
Mario Fetka 2015-10-23 19:17:31 +02:00
parent e54bb82288
commit a27b909672
4 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,12 @@
<package id="jre8" name="%NAME%" group="Standard Programme" priority="10">
<variable name="NAME" value="Java Runtime Environment 8 Update 60" />
<variable name="BUILD" value="8.0.60.27" />
<check type="file" condition="<" arch="x86" value="%BUILD%" path="%programfiles%\Java\jre8\bin\java.exe" />
<check type="file" condition="<" arch="x64" value="%BUILD%" path="%programfiles(x86)%\Java\jre8\bin\java.exe" />
<install>
<cmd name="Java: Fix MS SystemUser Bug" path="..\SystemFix.bat" />
<cmd name="Java: Remove old Installation" path="..\uninstall.bat" param="8" />
<cmd path="x86\silent.bat" />
<cmd path="x64\silent.bat" arch="x64" name="%NAME% x64" />
</install>
</package>

View File

@ -0,0 +1,3 @@
@echo off
title Installiere Java 8
%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre8"

View File

@ -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"

View File

@ -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}"