Remove java7 and add java9 Early access in disbaled mode

This commit is contained in:
Mario Fetka 2016-08-27 20:00:14 +02:00
parent 46718ef523
commit 9c16a49b42
14 changed files with 91 additions and 81 deletions

View File

@ -1,11 +0,0 @@
<package id="jre7" name="%NAME%" group="Standard Programme" priority="10">
<variable name="NAME" value="Java Runtime Environment 7 Update 55" />
<variable name="BUILD" value="7.0.550.13" />
<check type="file" condition="<" path="%programfiles%\Java\jre7\bin\java.exe" arch="x86" value="%BUILD%" />
<check type="file" condition="<" path="%programfiles(x86)%\Java\jre7\bin\java.exe" arch="x64" value="%BUILD%" />
<install>
<cmd name="Fix MS SystemUser Bug" path="..\SystemFix.bat" />
<cmd path="x86\jre.exe" param="/s REBOOT=Suppress" />
<cmd path="x64\jre.exe" param="/s REBOOT=Suppress" arch="x64" name="%NAME% x64" />
</install>
</package>

View File

@ -0,0 +1,12 @@
<package id="jre8" 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="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 9
%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre9"

View File

@ -0,0 +1,6 @@
@echo off
SET pfdir=%ProgramFiles(x86)%
IF "%pfdir%"=="" SET pfdir=%ProgramFiles%
title Installiere Java 9
%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre9"

View File

@ -48,16 +48,6 @@ if ($sereby_silver$ = "uninstall")
opsiservicecall_silver_uninstall
Set $reboot$ = "true"
endif
if ($sereby_jre7$ = "reinstall")
DosInAnIcon_jre7_uninstall
opsiservicecall_jre7_reinstall
Set $reboot$ = "true"
endif
if ($sereby_jre7$ = "uninstall")
DosInAnIcon_jre7_uninstall
opsiservicecall_jre7_uninstall
Set $reboot$ = "true"
endif
if ($sereby_jre8$ = "reinstall")
DosInAnIcon_jre8_uninstall
opsiservicecall_jre8_reinstall
@ -68,6 +58,16 @@ if ($sereby_jre8$ = "uninstall")
opsiservicecall_jre8_uninstall
Set $reboot$ = "true"
endif
if ($sereby_jre9$ = "reinstall")
DosInAnIcon_jre9_uninstall
opsiservicecall_jre9_reinstall
Set $reboot$ = "true"
endif
if ($sereby_jre9$ = "uninstall")
DosInAnIcon_jre9_uninstall
opsiservicecall_jre9_uninstall
Set $reboot$ = "true"
endif
if ($sereby_AdobeShock$ = "reinstall")
DosInAnIcon_AdobeShock_uninstall
opsiservicecall_AdobeShock_reinstall
@ -219,7 +219,7 @@ wmic /INTERACTIVE:OFF product where name="Microsoft Silverlight" call uninstall
"%opsiserviceUser%"
]
[DosInAnIcon_jre7_uninstall]
[DosInAnIcon_jre9_uninstall]
@echo off
rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
@ -231,20 +231,20 @@ rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly
[opsiservicecall_jre7_reinstall]
[opsiservicecall_jre9_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_jre7",
"sereby_jre9",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_jre7_uninstall]
[opsiservicecall_jre9_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_jre7",
"sereby_jre9",
"none",
"%opsiserviceUser%"
]

View File

@ -16,8 +16,8 @@ endif
if ($sereby_silver$ = "install")
DosInAnIcon_silver_config
endif
if ($sereby_jre7$ = "install")
DosInAnIcon_jre7_config
if ($sereby_jre9$ = "install")
DosInAnIcon_jre9_config
endif
if ($sereby_jre8$ = "install")
DosInAnIcon_jre8_config
@ -72,9 +72,9 @@ xml ed -O -u "/settings/set[@component='msfsharp']/@checked" -v 1 "$LogDir$\WinP
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='silver']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_jre7_config]
[DosInAnIcon_jre9_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='jre7']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
xml ed -O -u "/settings/set[@component='jre9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_jre8_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"

View File

@ -14,8 +14,8 @@ DefVar $sereby_msfsharp$
Set $sereby_msfsharp$ = GetProductProperty("sereby_msfsharp", "install")
DefVar $sereby_silver$
Set $sereby_silver$ = GetProductProperty("sereby_silver", "install")
DefVar $sereby_jre7$
Set $sereby_jre7$ = GetProductProperty("sereby_jre7", "install")
DefVar $sereby_jre9$
Set $sereby_jre9$ = GetProductProperty("sereby_jre9", "install")
DefVar $sereby_jre8$
Set $sereby_jre8$ = GetProductProperty("sereby_jre8", "install")
DefVar $sereby_AdobeShock$

View File

@ -101,10 +101,10 @@ default: ["install"]
[ProductProperty]
type: unicode
name: sereby_jre7
name: sereby_jre9
multivalue: False
editable: False
description: Install Java 7 Runtime Environment
description: Install Java 9 Runtime Environment
values: ["install", "none", "reinstall", "uninstall"]
default: ["none"]

View File

@ -36,10 +36,10 @@ AIRMAJOR="22.0"
# Update Java 7/8
# ==================================
JRE7UPDATE="1"
JRE7UVERSION="80"
JRE7BUILD="15"
JRE7VERSION="7.0.800.15"
JRE9UPDATE="1"
JRE9UVERSION="133"
JRE9BUILD="ea"
JRE9VERSION="9.0.000.00"
JRE8UPDATE="1"
JRE8UVERSION="102"
@ -164,29 +164,29 @@ DL_ARCH[11]="X86"
DL_EXTRACT_FORMAT[11]="7zip"
DL_EXTRACT_TO[11]="7ZipSFX"
DL_FILE[12]="jre7u${JRE7UVERSION}-b${JRE7BUILD}-x86.exe"
#DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106367"
DL_SOURCE[12]="http://download.oracle.com/otn-pub/java/jdk/7u${JRE7UVERSION}-b${JRE7BUILD}/jre-7u${JRE7UVERSION}-windows-i586.exe"
DL_FILE[12]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.exe"
#DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106246"
DL_SOURCE[12]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-i586.exe"
DL_ARCH[12]="X86"
DL_WINST_NAME[12]=Install7Jre32Exe
DL_WINST_NAME[12]=Install8Jre32Exe
DL_FILE[13]="jre7u${JRE7UVERSION}-b${JRE7BUILD}-x64.exe"
#DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106369"
DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/7u${JRE7UVERSION}-b${JRE7BUILD}/jre-7u${JRE7UVERSION}-windows-x64.exe"
DL_FILE[13]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.exe"
#DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106248"
DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-x64.exe"
DL_ARCH[13]="X86"
DL_WINST_NAME[13]=Install7Jre64Exe
DL_WINST_NAME[13]=InstallJ8re64Exe
DL_FILE[14]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.exe"
#DL_SOURCE[14]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106246"
DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-i586.exe"
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_ARCH[14]="X86"
DL_WINST_NAME[14]=Install8Jre32Exe
DL_WINST_NAME[14]=Install9Jre32Exe
DL_FILE[15]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.exe"
#DL_SOURCE[15]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106248"
DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-x64.exe"
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_ARCH[15]="X86"
DL_WINST_NAME[15]=InstallJ8re64Exe
DL_WINST_NAME[15]=Install9Jre64Exe
DL_FILE[16]="install_flash_player-${FLASHVERSION}.exe"
DL_SOURCE[16]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"

View File

@ -163,19 +163,6 @@ function create() {
# Update Java
# ==========================================================================================================
if [ "$JRE7UPDATE" = "1" ]; then
mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/{x86,x64}
mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE7_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-b${JRE7BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x86/jre.exe
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-b${JRE7BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x64/jre.exe
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JRE7UVERSION} (No Public Updates after April 2015)"
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='BUILD']/@value" "${JRE7VERSION}"
sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
else
rm $INST_DIR/CLIENT_DATA/Sereby_JRE7_package.xml
fi
sed -e 's/.*<\/settings>.*/\t<set component="jre7" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
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
@ -191,6 +178,19 @@ function create() {
fi
sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
if [ "$JRE9UPDATE" = "1" ]; then
mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/{x86,x64}
mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE9_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml
mv $INST_DIR/CLIENT_DATA/X86/jre9u${JRE9UVERSION}-b${JRE9BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x86/jre.exe
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_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/.*<\/settings>.*/\t<set component="jre9" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
# ==========================================================================================================
# Update Flash
# ==========================================================================================================
@ -327,18 +327,6 @@ function create() {
# Disable Java Update check
# ==========================================================================================================
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v7 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
echo "if exist \"%PROGRAMFILES%\Java\jre8\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre8\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
echo "if exist \"%PROGRAMFILES(x86)%\Java\jre8\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre8\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
@ -351,6 +339,18 @@ function create() {
sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v8 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat
echo "if exist \"%PROGRAMFILES%\Java\jre9\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre9\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat
echo "if exist \"%PROGRAMFILES(x86)%\Java\jre9\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre9\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat
echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat
echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat
echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat
sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v9 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml
# ==========================================================================================================
# Disable Flash Update Check
# ==========================================================================================================

View File

@ -1 +0,0 @@
63bef6fda793a47223b423b84687ee645c787e08 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/jre7u80-b15-x64.exe

View File

@ -1 +0,0 @@
305c1493fca53ab63ba1686c9afdfb65142e59d3 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/jre7u80-b15-x86.exe

View File

@ -0,0 +1 @@
691708f02cd44f1b486256d122bbf5cb6fc0eabf /home/mario/.opsi-dist-cache/sereby.aio-2.3.8.1/X86/jre9u133-bea-x64.exe

View File

@ -0,0 +1 @@
47b06d28a3530c823169650ff514599c68855bef /home/mario/.opsi-dist-cache/sereby.aio-2.3.8.1/X86/jre9u133-bea-x86.exe