Bump
This commit is contained in:
Mario Fetka
parent
1f2d566a9c
commit
fea9dc2689
|
|
@ -1,12 +1,10 @@
|
|||
<package id="jre9" name="%NAME%" group="Standard Programme" priority="10">
|
||||
<variable name="NAME" value="Java Runtime Environment 9 Update 60" />
|
||||
<variable name="BUILD" value="8.0.60.27" />
|
||||
<check type="file" condition="<" arch="x86" value="%BUILD%" path="%programfiles%\Java\jre9\bin\java.exe" />
|
||||
<check type="file" condition="<" arch="x64" value="%BUILD%" path="%programfiles(x86)%\Java\jre9\bin\java.exe" />
|
||||
<install>
|
||||
<cmd name="Java: Fix MS SystemUser Bug" path="..\SystemFix.bat" />
|
||||
<cmd name="Java: Remove old Installation" path="..\uninstall.bat" param="9" />
|
||||
<cmd path="x86\silent.bat" />
|
||||
<cmd path="x64\silent.bat" arch="x64" name="%NAME% x64" />
|
||||
</install>
|
||||
</package>
|
||||
|
|
|
|||
|
|
@ -36,10 +36,11 @@ AIRMAJOR="28.0"
|
|||
# Update Java 7/8
|
||||
# ==================================
|
||||
|
||||
JRE9UPDATE="0"
|
||||
JRE9UVERSION="181"
|
||||
JRE9BUILD="ea"
|
||||
JRE9VERSION="9.0.000.001"
|
||||
JRE9UPDATE="1"
|
||||
JRE9UVERSION="9.0.4"
|
||||
JRE9BUILD="11"
|
||||
JRE9VERSION="9.0.4"
|
||||
JRE9DLID="c2514751926b4512b076cc82f959763f"
|
||||
|
||||
JRE8UPDATE="1"
|
||||
JRE8UVERSION="162"
|
||||
|
|
@ -177,19 +178,13 @@ DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${
|
|||
DL_ARCH[13]="X86"
|
||||
DL_WINST_NAME[13]=InstallJ8re64Exe
|
||||
|
||||
DL_FILE[14]="jre9u${JRE9UVERSION}-b${JRE9BUILD}-x86.exe"
|
||||
#DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/9u${JRE9UVERSION}-b${JRE9BUILD}/jre-9u${JRE9UVERSION}-windows-i586.exe"
|
||||
#DL_SOURCE[14]="http://www.java.net/download/java/jdk9/archive/${JRE9UVERSION}/binaries/jre-9-${JRE9BUILD}+${JRE9UVERSION}_windows-x86_bin.exe"
|
||||
#DL_SOURCE[14]="http://download.java.net/java/jdk9/archive/${JRE9UVERSION}/binaries/jre-9-${JRE9BUILD}+${JRE9UVERSION}_windows-x86_bin.exe"
|
||||
DL_SOURCE[14]="http://download.java.net/java/jdk9/archive/${JRE9UVERSION}/binaries/jre-9+${JRE9UVERSION}_windows-x86_bin.exe"
|
||||
DL_FILE[14]="jre${JRE9UVERSION}-b${JRE9BUILD}-x86.exe"
|
||||
DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/${JRE9UVERSION}+${JRE9BUILD}/${JRE9DLID}/jre-${JRE9UVERSION}_windows-x64_bin.exe"
|
||||
DL_ARCH[14]="X86"
|
||||
DL_WINST_NAME[14]=Install9Jre32Exe
|
||||
|
||||
DL_FILE[15]="jre9u${JRE9UVERSION}-b${JRE9BUILD}-x64.exe"
|
||||
#DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/9u${JRE9UVERSION}-b${JRE9BUILD}/jre-9u${JRE9UVERSION}-windows-x64.exe"
|
||||
#DL_SOURCE[15]="http://www.java.net/download/java/jdk9/archive/${JRE9UVERSION}/binaries/jre-9-${JRE9BUILD}+${JRE9UVERSION}_windows-x64_bin.exe"
|
||||
#DL_SOURCE[15]="http://download.java.net/java/jdk9/archive/${JRE9UVERSION}/binaries/jre-9-${JRE9BUILD}+${JRE9UVERSION}_windows-x64_bin.exe"
|
||||
DL_SOURCE[15]="http://download.java.net/java/jdk9/archive/${JRE9UVERSION}/binaries/jre-9+${JRE9UVERSION}_windows-x64_bin.exe"
|
||||
DL_FILE[15]="jre${JRE9UVERSION}-b${JRE9BUILD}-x64.exe"
|
||||
DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/${JRE9UVERSION}+${JRE9BUILD}/${JRE9DLID}/jre-${JRE9UVERSION}_windows-x64_bin.exe"
|
||||
DL_ARCH[15]="X86"
|
||||
DL_WINST_NAME[15]=Install9Jre64Exe
|
||||
|
||||
|
|
|
|||
|
|
@ -167,6 +167,7 @@ function create() {
|
|||
# ==========================================================================================================
|
||||
|
||||
if [ "$JRE8UPDATE" = "1" ]; then
|
||||
mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/{x86,x64}
|
||||
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
|
||||
|
|
@ -187,8 +188,8 @@ function create() {
|
|||
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_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_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/check[@type='os']"
|
||||
|
|
@ -276,16 +277,16 @@ function create() {
|
|||
if [ "$MSVCUPDATE" = "1" ]; then
|
||||
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
|
||||
mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
|
||||
else
|
||||
patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml "/package/install/cmd[@param='2005']"
|
||||
patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml "/package/install/cmd[@param='2008']"
|
||||
sed -e 's!vcredist.msi!Install.cmd!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC05_x64_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x64/msvc_05/Install.cmd
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC05_x86_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x86/msvc_05/Install.cmd
|
||||
sed -e 's!vc_red.msi!Install.cmd!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC08_x64_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x64/msvc_08/Install.cmd
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC08_x86_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x86/msvc_08/Install.cmd
|
||||
sed -e 's!2008!2013!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/uninstall_all.bat
|
||||
#else
|
||||
#patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml "/package/install/cmd[@param='2005']"
|
||||
#patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml "/package/install/cmd[@param='2008']"
|
||||
#sed -e 's!vcredist.msi!Install.cmd!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
#mv -v $INST_DIR/CLIENT_DATA/MSVC05_x64_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x64/msvc_05/Install.cmd
|
||||
#mv -v $INST_DIR/CLIENT_DATA/MSVC05_x86_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x86/msvc_05/Install.cmd
|
||||
#sed -e 's!vc_red.msi!Install.cmd!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
#mv -v $INST_DIR/CLIENT_DATA/MSVC08_x64_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x64/msvc_08/Install.cmd
|
||||
#mv -v $INST_DIR/CLIENT_DATA/MSVC08_x86_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x86/msvc_08/Install.cmd
|
||||
#sed -e 's!2008!2013!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/uninstall_all.bat
|
||||
fi
|
||||
|
||||
# ==========================================================================================================
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
27b83f9f26649898a5271dc765c7c0aab80807f1 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/jre9.0.4-b11-x64.exe
|
||||
|
|
@ -0,0 +1 @@
|
|||
27b83f9f26649898a5271dc765c7c0aab80807f1 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/jre9.0.4-b11-x86.exe
|
||||
|
|
@ -1 +0,0 @@
|
|||
7551a8bfb75aa6b8dc39f81b0ebbe1ac44394cf8 /home/mario/.opsi-dist-cache/sereby.aio-2.4.2.1/X86/jre9u181-bea-x64.exe
|
||||
|
|
@ -1 +0,0 @@
|
|||
f4648567a63ae721b4fede603a74aff244519cb9 /home/mario/.opsi-dist-cache/sereby.aio-2.4.2.1/X86/jre9u181-bea-x86.exe
|
||||
Loading…
Reference in New Issue