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

Bump

Browse Source
This commit is contained in:
Mario Fetka
2018-06-28 17:36:08 +02:00
parent 5da6f284e9
commit c850c5f93c
34 changed files with 85 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CLIENT_DATA/Sereby_JRE9_package.xml → CLIENT_DATA/Sereby_JRE10_package.xml
View File

@@ -1,7 +1,7 @@
<package id="jre9" name="%NAME%" group="Standard Programme" priority="10">
<variable name="NAME" value="Java Runtime Environment 9 Update 60" />
<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\jre9\bin\java.exe" />
<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" />

3
CLIENT_DATA/Sereby_JRE10_x64_silent.bat Normal file
View File

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

2
CLIENT_DATA/Sereby_JRE9_x86_silent.bat → CLIENT_DATA/Sereby_JRE10_x86_silent.bat
View File

@@ -3,4 +3,4 @@ SET pfdir=%ProgramFiles(x86)%
IF "%pfdir%"=="" SET pfdir=%ProgramFiles%
title Installiere Java 9
%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre9"
%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre10"

3
CLIENT_DATA/Sereby_JRE9_x64_silent.bat
View File

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

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="jre9" checked="1" />
<set component="jre10" 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_jre9$ = "reinstall")
DosInAnIcon_jre9_uninstall
opsiservicecall_jre9_reinstall
if ($sereby_jre10$ = "reinstall")
DosInAnIcon_jre10_uninstall
opsiservicecall_jre10_reinstall
Set $reboot$ = "true"
endif
if ($sereby_jre9$ = "uninstall")
DosInAnIcon_jre9_uninstall
opsiservicecall_jre9_uninstall
if ($sereby_jre10$ = "uninstall")
DosInAnIcon_jre10_uninstall
opsiservicecall_jre10_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_jre9_uninstall]
[DosInAnIcon_jre10_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_jre9_reinstall]
[opsiservicecall_jre10_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_jre9",
"sereby_jre10",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_jre9_uninstall]
[opsiservicecall_jre10_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_jre9",
"sereby_jre10",
"none",
"%opsiserviceUser%"
]

8
CLIENT_DATA/config3264.ins
View File

@@ -16,8 +16,8 @@ endif
if ($sereby_silver$ = "install")
DosInAnIcon_silver_config
endif
if ($sereby_jre9$ = "install")
DosInAnIcon_jre9_config
if ($sereby_jre10$ = "install")
DosInAnIcon_jre10_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_jre9_config]
[DosInAnIcon_jre10_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='jre9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
xml ed -O -u "/settings/set[@component='jre10']/@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_jre9$
Set $sereby_jre9$ = GetProductProperty("sereby_jre9", "install")
DefVar $sereby_jre10$
Set $sereby_jre10$ = GetProductProperty("sereby_jre10", "install")
DefVar $sereby_jre8$
Set $sereby_jre8$ = GetProductProperty("sereby_jre8", "install")
DefVar $sereby_AdobeShock$