From b0d7ec7507e7e9cc3ed2db37f74d795120994c3d Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 6 Sep 2019 13:54:40 +0200 Subject: [PATCH] update config file --- CLIENT_DATA/Sereby_NET_package.xml | 22 +++++++++++----------- CLIENT_DATA/WinPKG.xml | 2 +- CLIENT_DATA/cleanup3264.ins | 24 ++++++++++++------------ CLIENT_DATA/config3264.ins | 8 ++++---- CLIENT_DATA/define3264.inc | 4 ++-- JavaRa-2.6.1.zip.sha1sum | 1 - OPSI/control | 4 ++-- builder-product.cfg | 2 +- builder-targets-cb.sh | 2 +- 9 files changed, 34 insertions(+), 35 deletions(-) mode change 100644 => 100755 CLIENT_DATA/Sereby_NET_package.xml delete mode 100644 JavaRa-2.6.1.zip.sha1sum diff --git a/CLIENT_DATA/Sereby_NET_package.xml b/CLIENT_DATA/Sereby_NET_package.xml old mode 100644 new mode 100755 index c082f5e..7d45025 --- a/CLIENT_DATA/Sereby_NET_package.xml +++ b/CLIENT_DATA/Sereby_NET_package.xml @@ -1,11 +1,11 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/CLIENT_DATA/WinPKG.xml b/CLIENT_DATA/WinPKG.xml index bd6444b..f84a75c 100644 --- a/CLIENT_DATA/WinPKG.xml +++ b/CLIENT_DATA/WinPKG.xml @@ -1,6 +1,6 @@ - + diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index c2e4118..5776a22 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -1,14 +1,14 @@ DefVar $reboot$ Set $reboot$ = "false" -if ($sereby_dotnet4.7.1$ = "reinstall") - Winbatch_dotnet4.7.1_uninstall - opsiservicecall_dotnet4.7.1_reinstall +if ($sereby_dotnet4.8.0$ = "reinstall") + Winbatch_dotnet4.8.0_uninstall + opsiservicecall_dotnet4.8.0_reinstall Set $reboot$ = "true" endif -if ($sereby_dotnet4.7.1$ = "uninstall") - Winbatch_dotnet4.7.1_uninstall - opsiservicecall_dotnet4.7.1_uninstall +if ($sereby_dotnet4.8.0$ = "uninstall") + Winbatch_dotnet4.8.0_uninstall + opsiservicecall_dotnet4.8.0_uninstall Set $reboot$ = "true" endif @@ -185,23 +185,23 @@ if ($reboot$ = "true") ExitWindows /ImmediateReboot endif -[Winbatch_dotnet4.7.1_uninstall] -%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.7 /u" +[Winbatch_dotnet4.8.0_uninstall] +%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" "params": [ "$ProductId$", -"sereby_dotnet4.7.1", +"sereby_dotnet4.8.0", "install", "%opsiserviceUser%" ] -[opsiservicecall_dotnet4.7.1_uninstall] +[opsiservicecall_dotnet4.8.0_uninstall] "method": "setProductProperty" "params": [ "$ProductId$", -"sereby_dotnet4.7.1", +"sereby_dotnet4.8.0", "none", "%opsiserviceUser%" ] diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins index 7c9bba9..2ec227f 100644 --- a/CLIENT_DATA/config3264.ins +++ b/CLIENT_DATA/config3264.ins @@ -1,8 +1,8 @@ DosInAnIcon_init_config -if ($sereby_dotnet4.7.1$ = "install") - DosInAnIcon_dotnet4.7.1_config +if ($sereby_dotnet4.8.0$ = "install") + DosInAnIcon_dotnet4.8.0_config endif if ($sereby_win8xdotnet3x$ = "install") 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" 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" -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] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc index 0e944d9..0eb1d9d 100644 --- a/CLIENT_DATA/define3264.inc +++ b/CLIENT_DATA/define3264.inc @@ -4,8 +4,8 @@ DefVar $sereby_timer_value$ Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "5") DefVar $sereby_timer_enabled$ Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1") -DefVar $sereby_dotnet4.7.1$ -Set $sereby_dotnet4.7.1$ = GetProductProperty("sereby_dotnet4.7.1", "install") +DefVar $sereby_dotnet4.8.0$ +Set $sereby_dotnet4.8.0$ = GetProductProperty("sereby_dotnet4.8.0", "install") DefVar $sereby_win8xdotnet3x$ Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install") DefVar $sereby_msjsharp$ diff --git a/JavaRa-2.6.1.zip.sha1sum b/JavaRa-2.6.1.zip.sha1sum deleted file mode 100644 index a2d0819..0000000 --- a/JavaRa-2.6.1.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -43631a1506681c167de93d288ed7daae41eaa134 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/JavaRa-2.6.1.zip diff --git a/OPSI/control b/OPSI/control index 27f2e0d..bdbbc55 100644 --- a/OPSI/control +++ b/OPSI/control @@ -56,10 +56,10 @@ default: ["1"] [ProductProperty] type: unicode -name: sereby_dotnet4.7.1 +name: sereby_dotnet4.8.0 multivalue: False editable: False -description: Install Microsoft Netframework 4.7.1 +description: Install Microsoft Netframework 4.8.0 values: ["install", "none", "reinstall", "uninstall"] default: ["install"] diff --git a/builder-product.cfg b/builder-product.cfg index d3a356a..907e203 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -270,7 +270,7 @@ DL_ARCH[1]="X86" DL_EXTRACT_FORMAT[1]="unzip" 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_ARCH[2]="X86" DL_EXTRACT_FORMAT[2]="unzip" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 309a2b4..c9424df 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -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 else 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 # ==========================================================================================================