From a61fcf17c675067d69844874554f678784bb16fe Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 11 May 2014 13:39:38 +0200 Subject: [PATCH] Bump .net and rename .net to 4.5 --- ...451_package.xml => Ricktendo_NET45_package.xml} | 2 +- CLIENT_DATA/cleanup3264.ins | 14 +++++++------- CLIENT_DATA/config3264.ins | 8 ++++---- CLIENT_DATA/define3264.inc | 4 ++-- OPSI/control | 4 ++-- builder-product.cfg | 10 +++++----- builder-targets-cb.sh | 12 ++++++------ ...x40LP_Full_x86_x64de_Slim_2014.05.06.7z.sha1sum | 2 +- ...etFx40_Full_x86_x64_Slim_2014.05.06.exe.sha1sum | 2 +- ...P_Full_LDR_x86_x64de_Slim_2014.04.25.7z.sha1sum | 1 - ...51_Full_LDR_x86_x64_Slim_2014.04.25.exe.sha1sum | 1 - ...P_Full_LDR_x86_x64de_Slim_2014.05.06.7z.sha1sum | 1 + ...45_Full_LDR_x86_x64_Slim_2014.05.06.exe.sha1sum | 1 + 13 files changed, 31 insertions(+), 31 deletions(-) rename CLIENT_DATA/{Ricktendo_NET451_package.xml => Ricktendo_NET45_package.xml} (79%) rename dotNetFx40LP_Full_x86_x64de_Slim_2014.04.25.7z.sha1sum => dotNetFx40LP_Full_x86_x64de_Slim_2014.05.06.7z.sha1sum (90%) rename dotNetFx40_Full_x86_x64_Slim_2014.04.25.exe.sha1sum => dotNetFx40_Full_x86_x64_Slim_2014.05.06.exe.sha1sum (92%) delete mode 100644 dotNetFx451LP_Full_LDR_x86_x64de_Slim_2014.04.25.7z.sha1sum delete mode 100644 dotNetFx451_Full_LDR_x86_x64_Slim_2014.04.25.exe.sha1sum create mode 100644 dotNetFx45LP_Full_LDR_x86_x64de_Slim_2014.05.06.7z.sha1sum create mode 100644 dotNetFx45_Full_LDR_x86_x64_Slim_2014.05.06.exe.sha1sum diff --git a/CLIENT_DATA/Ricktendo_NET451_package.xml b/CLIENT_DATA/Ricktendo_NET45_package.xml similarity index 79% rename from CLIENT_DATA/Ricktendo_NET451_package.xml rename to CLIENT_DATA/Ricktendo_NET45_package.xml index c3327eb..52bfadf 100644 --- a/CLIENT_DATA/Ricktendo_NET451_package.xml +++ b/CLIENT_DATA/Ricktendo_NET45_package.xml @@ -1,4 +1,4 @@ - + diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index 6289b5e..507da9c 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -56,9 +56,9 @@ if ($sereby_dotnet4.0$ = "reinstall") opsiservicecall_dotnet4.0_uninstall Set $reboot$ = "true" endif -if ($sereby_dotnet4.5.1$ = "reinstall") - Winbatch_dotnet4.5.1_uninstall - opsiservicecall_dotnet4.5.1_uninstall +if ($sereby_dotnet4.5$ = "reinstall") + Winbatch_dotnet4.5_uninstall + opsiservicecall_dotnet4.5_uninstall Set $reboot$ = "true" endif @@ -196,14 +196,14 @@ endif "%opsiserviceUser%" ] -[Winbatch_dotnet4.5.1_uninstall] -%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5.1 /u" +[Winbatch_dotnet4.5_uninstall] +%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5 /u" -[opsiservicecall_dotnet4.5.1_uninstall] +[opsiservicecall_dotnet4.5_uninstall] "method": "setProductProperty" "params": [ "$ProductId$", -"sereby_dotnet4.5.1", +"sereby_dotnet4.5", "install", "%opsiserviceUser%" ] diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins index d461faa..34b6acb 100644 --- a/CLIENT_DATA/config3264.ins +++ b/CLIENT_DATA/config3264.ins @@ -16,8 +16,8 @@ endif if ($sereby_dotnet4.0$ = "install") DosInAnIcon_dotnet4.0_config endif -if ($sereby_dotnet4.5.1$ = "install") - DosInAnIcon_dotnet4.5.1_config +if ($sereby_dotnet4.5$ = "install") + DosInAnIcon_dotnet4.5_config endif if ($sereby_win8xdotnet3x$ = "install") DosInAnIcon_win8xdotnet3x_config @@ -90,9 +90,9 @@ xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[DosInAnIcon_dotnet4.5.1_config] +[DosInAnIcon_dotnet4.5_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='net4.5.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" +xml ed -O -u "/settings/set[@component='net4.5']/@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 42c9baa..663a1f6 100644 --- a/CLIENT_DATA/define3264.inc +++ b/CLIENT_DATA/define3264.inc @@ -14,8 +14,8 @@ DefVar $sereby_dotnet3.5$ Set $sereby_dotnet3.5$ = GetProductProperty("sereby_dotnet3.5", "install") DefVar $sereby_dotnet4.0$ Set $sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none") -DefVar $sereby_dotnet4.5.1$ -Set $sereby_dotnet4.5.1$ = GetProductProperty("sereby_dotnet4.5.1", "install") +DefVar $sereby_dotnet4.5$ +Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install") DefVar $sereby_win8xdotnet3x$ Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install") DefVar $sereby_msjsharp$ diff --git a/OPSI/control b/OPSI/control index 33eb119..ff5f360 100644 --- a/OPSI/control +++ b/OPSI/control @@ -101,10 +101,10 @@ default: ["install"] [ProductProperty] type: unicode -name: sereby_dotnet4.5.1 +name: sereby_dotnet4.5 multivalue: False editable: False -description: Install Microsoft Netframework 4.5.1 +description: Install Microsoft Netframework 4.5 values: ["install", "none", "reinstall"] default: ["install"] diff --git a/builder-product.cfg b/builder-product.cfg index 36d3552..9fd4134 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -76,7 +76,7 @@ RICKTENDOAIO="2014.04.07" RICKTENDONET40UPDATE="1" RICKTENDONET45UPDATE="1" -RICKTENDONET="2014.04.25" +RICKTENDONET="2014.05.06" # ================================== # General Runtimes Verison @@ -228,13 +228,13 @@ DL_ARCH[24]="X86" DL_WINST_NAME[24]=RicktendoNet40Lang #DL_FILE[25]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe" -DL_FILE[25]="dotNetFx451_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe" -DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx451_Full_LDR_x86_x64_Slim.exe" +DL_FILE[25]="dotNetFx45_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe" +DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx452_Full_LDR_x86_x64_Slim.exe" DL_ARCH[25]="X86" DL_WINST_NAME[25]=Ricktendo45Exe -DL_FILE[26]="dotNetFx451LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z" -DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx451LP_Full_LDR_x86_x64de_Slim.7z" +DL_FILE[26]="dotNetFx45LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z" +DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx452LP_Full_LDR_x86_x64de_Slim.7z" DL_ARCH[26]="X86" DL_WINST_NAME[26]=RicktendoNet45Lang diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 1e3f455..0f2286e 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -227,7 +227,7 @@ function create() { sed 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml # ========================================================================================================== - # Update .NET 4.0 & 4.5.1 with Ricktendo + # Update .NET 4.0 & 4.5 with Ricktendo # ========================================================================================================== if [ "$RICKTENDONET40UPDATE" = "1" ]; then @@ -240,12 +240,12 @@ function create() { fi if [ "$RICKTENDONET45UPDATE" = "1" ]; then - rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5.1/* - 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5.1 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]} - #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5.1 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]} - mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET451_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5.1/package.xml + rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5/* + 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]} + #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]} + mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5/package.xml else - rm $INST_DIR/CLIENT_DATA/Ricktendo_NET451_package.xml + rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml fi # ========================================================================================================== diff --git a/dotNetFx40LP_Full_x86_x64de_Slim_2014.04.25.7z.sha1sum b/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.06.7z.sha1sum similarity index 90% rename from dotNetFx40LP_Full_x86_x64de_Slim_2014.04.25.7z.sha1sum rename to dotNetFx40LP_Full_x86_x64de_Slim_2014.05.06.7z.sha1sum index d73852f..1041d58 100644 --- a/dotNetFx40LP_Full_x86_x64de_Slim_2014.04.25.7z.sha1sum +++ b/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.06.7z.sha1sum @@ -1 +1 @@ -72f33ba4874da23777bd004841b7ed989a721311 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40LP_Full_x86_x64de_Slim_2014.04.25.7z +72f33ba4874da23777bd004841b7ed989a721311 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.06.7z diff --git a/dotNetFx40_Full_x86_x64_Slim_2014.04.25.exe.sha1sum b/dotNetFx40_Full_x86_x64_Slim_2014.05.06.exe.sha1sum similarity index 92% rename from dotNetFx40_Full_x86_x64_Slim_2014.04.25.exe.sha1sum rename to dotNetFx40_Full_x86_x64_Slim_2014.05.06.exe.sha1sum index a5c8514..de1087a 100644 --- a/dotNetFx40_Full_x86_x64_Slim_2014.04.25.exe.sha1sum +++ b/dotNetFx40_Full_x86_x64_Slim_2014.05.06.exe.sha1sum @@ -1 +1 @@ -8e7b229c5812fb81c1d5c6122637d17f3b215f80 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40_Full_x86_x64_Slim_2014.04.25.exe +8e7b229c5812fb81c1d5c6122637d17f3b215f80 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40_Full_x86_x64_Slim_2014.05.06.exe diff --git a/dotNetFx451LP_Full_LDR_x86_x64de_Slim_2014.04.25.7z.sha1sum b/dotNetFx451LP_Full_LDR_x86_x64de_Slim_2014.04.25.7z.sha1sum deleted file mode 100644 index c9f0d82..0000000 --- a/dotNetFx451LP_Full_LDR_x86_x64de_Slim_2014.04.25.7z.sha1sum +++ /dev/null @@ -1 +0,0 @@ -9c7019de003f9280b7f4ee1b10dc79956c2412c7 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx451LP_Full_LDR_x86_x64de_Slim_2014.04.25.7z diff --git a/dotNetFx451_Full_LDR_x86_x64_Slim_2014.04.25.exe.sha1sum b/dotNetFx451_Full_LDR_x86_x64_Slim_2014.04.25.exe.sha1sum deleted file mode 100644 index c9801a7..0000000 --- a/dotNetFx451_Full_LDR_x86_x64_Slim_2014.04.25.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -2fd6422e633e315d8d8013697260a71cb0cb8d9b /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx451_Full_LDR_x86_x64_Slim_2014.04.25.exe diff --git a/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2014.05.06.7z.sha1sum b/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2014.05.06.7z.sha1sum new file mode 100644 index 0000000..06d1b92 --- /dev/null +++ b/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2014.05.06.7z.sha1sum @@ -0,0 +1 @@ +965784760209703992b774519a29418064b9959c /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2014.05.06.7z diff --git a/dotNetFx45_Full_LDR_x86_x64_Slim_2014.05.06.exe.sha1sum b/dotNetFx45_Full_LDR_x86_x64_Slim_2014.05.06.exe.sha1sum new file mode 100644 index 0000000..f6c7ba8 --- /dev/null +++ b/dotNetFx45_Full_LDR_x86_x64_Slim_2014.05.06.exe.sha1sum @@ -0,0 +1 @@ +f6543104a6ce4a83cc9eaaed1235c83c338e07c4 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx45_Full_LDR_x86_x64_Slim_2014.05.06.exe