go-opsi/sereby.aio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update java to AdoptOpenJDK JRE Package as Oracle changed the license for the JRE

Browse Source
This commit is contained in:
Mario Fetka
2019-09-06 12:11:08 +02:00
parent 5845537e69
commit 03359c6f54
23 changed files with 99 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CLIENT_DATA/Sereby_JRE10_package.xml
View File

@@ -1,10 +0,0 @@
<package id="jre10" name="%NAME%" group="Standard Programme" priority="10">
<variable name="NAME" value="Java Runtime Environment 10 Update 60" />
<variable name="BUILD" value="8.0.60.27" />
<check type="file" condition="<" arch="x64" value="%BUILD%" path="%programfiles(x86)%\Java\jre10\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="x64\silent.bat" arch="x64" name="%NAME% x64" />
</install>
</package>

3
CLIENT_DATA/Sereby_JRE10_x64_silent.bat
View File

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

6
CLIENT_DATA/Sereby_JRE10_x86_silent.bat
View File

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

12
CLIENT_DATA/Sereby_JRE11_package.xml Normal file
View File

@@ -0,0 +1,12 @@
<package id="jre11" 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\jre11\bin\java.exe" />
<check type="file" condition="<" arch="x64" value="%BUILD%" path="%programfiles(x86)%\Java\jre11\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>

3
CLIENT_DATA/Sereby_JRE11_x64_silent.bat Normal file
View File

@@ -0,0 +1,3 @@
@echo off
title Installiere Java 11
msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%ProgramFiles%\Java\jre11" /quiet

6
CLIENT_DATA/Sereby_JRE11_x86_silent.bat Normal file
View File

@@ -0,0 +1,6 @@
@echo off
SET pfdir=%ProgramFiles(x86)%
IF "%pfdir%"=="" SET pfdir=%ProgramFiles%
title Installiere Java 11
msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%pfdir%\Java\jre11" /quiet

2
CLIENT_DATA/Sereby_JRE8_x64_silent.bat
View File

@@ -1,3 +1,3 @@
@echo off
title Installiere Java 8
%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre8"
msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%ProgramFiles%\Java\jre8" /quiet

2
CLIENT_DATA/Sereby_JRE8_x86_silent.bat
View File

@@ -3,4 +3,4 @@ SET pfdir=%ProgramFiles(x86)%
IF "%pfdir%"=="" SET pfdir=%ProgramFiles%
title Installiere Java 8
%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre8"
msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%pfdir%\Java\jre8" /quiet

2
CLIENT_DATA/WinPKG.xml
View File

@@ -3,7 +3,7 @@
<set component="net4.7.1" checked="1" />
<set component="msjsharp" checked="1" />
<set component="silver" checked="1" />
<set component="jre10" checked="1" />
<set component="jre11" checked="1" />
<set component="AdobeShock" checked="1" />
<set component="basicruntimes" checked="1" />
<set component="msdx9" checked="1" />

22
CLIENT_DATA/cleanup3264.ins
View File

@@ -58,14 +58,14 @@ if ($sereby_jre8$ = "uninstall")
opsiservicecall_jre8_uninstall
Set $reboot$ = "true"
endif
if ($sereby_jre10$ = "reinstall")
DosInAnIcon_jre10_uninstall
opsiservicecall_jre10_reinstall
if ($sereby_jre11$ = "reinstall")
DosInAnIcon_jre11_uninstall
opsiservicecall_jre11_reinstall
Set $reboot$ = "true"
endif
if ($sereby_jre10$ = "uninstall")
DosInAnIcon_jre10_uninstall
opsiservicecall_jre10_uninstall
if ($sereby_jre11$ = "uninstall")
DosInAnIcon_jre11_uninstall
opsiservicecall_jre11_uninstall
Set $reboot$ = "true"
endif
if ($sereby_AdobeShock$ = "reinstall")
@@ -269,7 +269,7 @@ wmic /INTERACTIVE:OFF product where name="Microsoft Silverlight" call uninstall
"%opsiserviceUser%"
]
[DosInAnIcon_jre10_uninstall]
[DosInAnIcon_jre11_uninstall]
@echo off
rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
@@ -281,20 +281,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_jre10_reinstall]
[opsiservicecall_jre11_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_jre10",
"sereby_jre11",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_jre10_uninstall]
[opsiservicecall_jre11_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_jre10",
"sereby_jre11",
"none",
"%opsiserviceUser%"
]

8
CLIENT_DATA/config3264.ins
View File

@@ -16,8 +16,8 @@ endif
if ($sereby_silver$ = "install")
DosInAnIcon_silver_config
endif
if ($sereby_jre10$ = "install")
DosInAnIcon_jre10_config
if ($sereby_jre11$ = "install")
DosInAnIcon_jre11_config
endif
if ($sereby_jre8$ = "install")
DosInAnIcon_jre8_config
@@ -87,9 +87,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_jre10_config]
[DosInAnIcon_jre11_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='jre10']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
xml ed -O -u "/settings/set[@component='jre11']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_jre8_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"

4
CLIENT_DATA/define3264.inc
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_jre10$
Set $sereby_jre10$ = GetProductProperty("sereby_jre10", "install")
DefVar $sereby_jre11$
Set $sereby_jre11$ = GetProductProperty("sereby_jre11", "install")
DefVar $sereby_jre8$
Set $sereby_jre8$ = GetProductProperty("sereby_jre8", "install")
DefVar $sereby_AdobeShock$