update config file

This commit is contained in:
Mario Fetka 2019-09-06 13:54:40 +02:00
parent 2cd7adb7a2
commit b0d7ec7507
9 changed files with 34 additions and 35 deletions

22
CLIENT_DATA/Sereby_NET_package.xml Normal file → Executable file
View File

@ -1,11 +1,11 @@
<package id="net4.7.1" name="%NAME%" group="Microsoft .NET Framework" priority="44"> <package id="net4.8.0" name="%NAME%" group="Microsoft .NET Framework" priority="44">
<variable name="NAME"value=".NET Framework 4.7.1 (KB4054856)" /> <variable name="NAME" value=".NET Framework 4.8 (KB4054530)" />
<check type="file" condition="<" value="4.7.2563.0" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" /> <check type="file" condition="<" value="4.8.3761.0" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.Core.dll" />
<check type="os" condition=">" value="6.1.7600.16385" /> <check type="os" condition=">" value="6.1.7600.16385" />
<check type="os" condition="<" value="6.2.9200.0" /> <check type="os" condition="<" value="6.2.9200.0" />
<install>
<install> <cmd name="%NAME% - KB4019990" path="KB4019990.bat" />
<cmd arch="x86" path="netfx_Full_x86.msi" param="/norestart /qb-!" /> <cmd arch="x86" path="netfx_Full_x86.msi" param="/norestart /qb-!" />
<cmd arch="x64" path="netfx_Full_x64.msi" param="/norestart /qb-!" /> <cmd arch="x64" path="netfx_Full_x64.msi" param="/norestart /qb-!" />
</install> </install>
</package> </package>

View File

@ -1,6 +1,6 @@
<settings maximized="1"> <settings maximized="1">
<timer value="40" enabled="1" /> <timer value="40" enabled="1" />
<set component="net4.7.1" checked="1" /> <set component="net4.8.0" checked="1" />
<set component="msjsharp" checked="1" /> <set component="msjsharp" checked="1" />
<set component="silver" checked="1" /> <set component="silver" checked="1" />
<set component="jre11" checked="1" /> <set component="jre11" checked="1" />

View File

@ -1,14 +1,14 @@
DefVar $reboot$ DefVar $reboot$
Set $reboot$ = "false" Set $reboot$ = "false"
if ($sereby_dotnet4.7.1$ = "reinstall") if ($sereby_dotnet4.8.0$ = "reinstall")
Winbatch_dotnet4.7.1_uninstall Winbatch_dotnet4.8.0_uninstall
opsiservicecall_dotnet4.7.1_reinstall opsiservicecall_dotnet4.8.0_reinstall
Set $reboot$ = "true" Set $reboot$ = "true"
endif endif
if ($sereby_dotnet4.7.1$ = "uninstall") if ($sereby_dotnet4.8.0$ = "uninstall")
Winbatch_dotnet4.7.1_uninstall Winbatch_dotnet4.8.0_uninstall
opsiservicecall_dotnet4.7.1_uninstall opsiservicecall_dotnet4.8.0_uninstall
Set $reboot$ = "true" Set $reboot$ = "true"
endif endif
@ -185,23 +185,23 @@ if ($reboot$ = "true")
ExitWindows /ImmediateReboot ExitWindows /ImmediateReboot
endif endif
[Winbatch_dotnet4.7.1_uninstall] [Winbatch_dotnet4.8.0_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.7 /u" %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.8 /u"
[opsiservicecall_dotnet4.7.1_reinstall] [opsiservicecall_dotnet4.8.0_reinstall]
"method": "setProductProperty" "method": "setProductProperty"
"params": [ "params": [
"$ProductId$", "$ProductId$",
"sereby_dotnet4.7.1", "sereby_dotnet4.8.0",
"install", "install",
"%opsiserviceUser%" "%opsiserviceUser%"
] ]
[opsiservicecall_dotnet4.7.1_uninstall] [opsiservicecall_dotnet4.8.0_uninstall]
"method": "setProductProperty" "method": "setProductProperty"
"params": [ "params": [
"$ProductId$", "$ProductId$",
"sereby_dotnet4.7.1", "sereby_dotnet4.8.0",
"none", "none",
"%opsiserviceUser%" "%opsiserviceUser%"
] ]

View File

@ -1,8 +1,8 @@
DosInAnIcon_init_config DosInAnIcon_init_config
if ($sereby_dotnet4.7.1$ = "install") if ($sereby_dotnet4.8.0$ = "install")
DosInAnIcon_dotnet4.7.1_config DosInAnIcon_dotnet4.8.0_config
endif endif
if ($sereby_win8xdotnet3x$ = "install") if ($sereby_win8xdotnet3x$ = "install")
DosInAnIcon_win8xdotnet3x_config DosInAnIcon_win8xdotnet3x_config
@ -67,9 +67,9 @@ xml ed -O -u "/settings/timer[@value=40]/@value" -v $sereby_timer_value$ "$LogDi
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_dotnet4.7.1_config] [DosInAnIcon_dotnet4.8.0_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.7.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='net4.8.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_win8xdotnet3x_config] [DosInAnIcon_win8xdotnet3x_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"

View File

@ -4,8 +4,8 @@ DefVar $sereby_timer_value$
Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "5") Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "5")
DefVar $sereby_timer_enabled$ DefVar $sereby_timer_enabled$
Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1") Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1")
DefVar $sereby_dotnet4.7.1$ DefVar $sereby_dotnet4.8.0$
Set $sereby_dotnet4.7.1$ = GetProductProperty("sereby_dotnet4.7.1", "install") Set $sereby_dotnet4.8.0$ = GetProductProperty("sereby_dotnet4.8.0", "install")
DefVar $sereby_win8xdotnet3x$ DefVar $sereby_win8xdotnet3x$
Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install") Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install")
DefVar $sereby_msjsharp$ DefVar $sereby_msjsharp$

View File

@ -1 +0,0 @@
43631a1506681c167de93d288ed7daae41eaa134 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/JavaRa-2.6.1.zip

View File

@ -56,10 +56,10 @@ default: ["1"]
[ProductProperty] [ProductProperty]
type: unicode type: unicode
name: sereby_dotnet4.7.1 name: sereby_dotnet4.8.0
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 4.7.1 description: Install Microsoft Netframework 4.8.0
values: ["install", "none", "reinstall", "uninstall"] values: ["install", "none", "reinstall", "uninstall"]
default: ["install"] default: ["install"]

View File

@ -270,7 +270,7 @@ DL_ARCH[1]="X86"
DL_EXTRACT_FORMAT[1]="unzip" DL_EXTRACT_FORMAT[1]="unzip"
DL_EXTRACT_TO[1]="dotnet" DL_EXTRACT_TO[1]="dotnet"
DL_FILE[2]="JavaRa-2.6.1.zip" DL_FILE[2]="JavaRa-2.6.1.1.zip"
DL_SOURCE[2]="https://singularlabs.com/download/10306/" DL_SOURCE[2]="https://singularlabs.com/download/10306/"
DL_ARCH[2]="X86" DL_ARCH[2]="X86"
DL_EXTRACT_FORMAT[2]="unzip" DL_EXTRACT_FORMAT[2]="unzip"

View File

@ -272,7 +272,7 @@ function create() {
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.6/package.xml mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.6/package.xml
else else
rm $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml rm $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml
mv -v $INST_DIR/CLIENT_DATA/Sereby_NET_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.7.1/package.xml mv -v $INST_DIR/CLIENT_DATA/Sereby_NET_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.8/package.xml
fi fi
# ========================================================================================================== # ==========================================================================================================