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

Remove java7 and add java9 Early access in disbaled mode

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
CLIENT_DATA/Sereby_JRE7_package.xml
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>

12
CLIENT_DATA/Sereby_JRE9_package.xml Normal file
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>

3
CLIENT_DATA/Sereby_JRE9_x64_silent.bat Normal file
View File

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

6
CLIENT_DATA/Sereby_JRE9_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 9
%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre9"

30
CLIENT_DATA/cleanup3264.ins
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%"
]

8
CLIENT_DATA/config3264.ins
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"

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_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$