From 1edcab19b7393f6cfb5de6966ce5082bb45e6240 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 24 Jul 2015 13:57:53 +0200 Subject: [PATCH] Bump and add .net 4.6 --- CLIENT_DATA/Ricktendo_NET46_package.xml | 21 +++++++++ CLIENT_DATA/cleanup3264.ins | 32 +++++++++++++ CLIENT_DATA/config3264.ins | 7 +++ CLIENT_DATA/define3264.inc | 2 + OPSI/control | 9 ++++ Silverlight-5.1.40620.0.exe.sha1sum | 1 + Silverlight_x64-5.1.40620.0.exe.sha1sum | 1 + aio-runtimes_v2.2.2.1.exe.sha1sum | 1 - aio-runtimes_v2.2.3.1.exe.sha1sum | 1 + builder-product.cfg | 45 ++++++++++++------- builder-targets-cb.sh | 15 +++++++ ...l_LDR_x86_x64de_Slim_2015.06.25.7z.sha1sum | 1 - ...l_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum | 1 + ...ll_LDR_x86_x64_Slim_2015.06.25.exe.sha1sum | 1 - ...ll_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum | 1 + ...l_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum | 1 + ...ll_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum | 1 + ...5F00_cleanup_5F00_tool-2.2.2.1.zip.sha1sum | 1 - ...5F00_cleanup_5F00_tool-2.2.3.1.zip.sha1sum | 1 + 19 files changed, 123 insertions(+), 20 deletions(-) create mode 100644 CLIENT_DATA/Ricktendo_NET46_package.xml create mode 100644 Silverlight-5.1.40620.0.exe.sha1sum create mode 100644 Silverlight_x64-5.1.40620.0.exe.sha1sum delete mode 100644 aio-runtimes_v2.2.2.1.exe.sha1sum create mode 100644 aio-runtimes_v2.2.3.1.exe.sha1sum delete mode 100644 dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.06.25.7z.sha1sum create mode 100644 dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum delete mode 100644 dotNetFx45_Full_LDR_x86_x64_Slim_2015.06.25.exe.sha1sum create mode 100644 dotNetFx45_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum create mode 100644 dotNetFx46LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum create mode 100644 dotNetFx46_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum delete mode 100644 dotnetfx_5F00_cleanup_5F00_tool-2.2.2.1.zip.sha1sum create mode 100644 dotnetfx_5F00_cleanup_5F00_tool-2.2.3.1.zip.sha1sum diff --git a/CLIENT_DATA/Ricktendo_NET46_package.xml b/CLIENT_DATA/Ricktendo_NET46_package.xml new file mode 100644 index 0000000..078cef3 --- /dev/null +++ b/CLIENT_DATA/Ricktendo_NET46_package.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index 27d3e5c..0f77043 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -12,6 +12,17 @@ if ($sereby_dotnet4.5$ = "uninstall") Set $reboot$ = "true" endif +if ($sereby_dotnet4.6$ = "reinstall") + Winbatch_dotnet4.6_uninstall + opsiservicecall_dotnet4.6_reinstall + Set $reboot$ = "true" +endif +if ($sereby_dotnet4.6$ = "uninstall") + Winbatch_dotnet4.6_uninstall + opsiservicecall_dotnet4.6_uninstall + Set $reboot$ = "true" +endif + ; a reboot is requred after the .net cleanup so that further uninstalls can work if ($reboot$ = "true") comment "uninstall done now force Reboot" @@ -264,6 +275,27 @@ endif "%opsiserviceUser%" ] +[Winbatch_dotnet4.6_uninstall] +%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.6 /u" + +[opsiservicecall_dotnet4.6_reinstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet4.6", +"install", +"%opsiserviceUser%" +] + +[opsiservicecall_dotnet4.6_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet4.6", +"none", +"%opsiserviceUser%" +] + [Dosbatch_msjsharp_uninstall] [opsiservicecall_msjsharp_reinstall] diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins index eecc09a..23faca1 100644 --- a/CLIENT_DATA/config3264.ins +++ b/CLIENT_DATA/config3264.ins @@ -4,6 +4,9 @@ DosInAnIcon_init_config if ($sereby_dotnet4.5$ = "install") DosInAnIcon_dotnet4.5_config endif +if ($sereby_dotnet4.6$ = "install") + DosInAnIcon_dotnet4.6_config +endif if ($sereby_win8xdotnet3x$ = "install") DosInAnIcon_win8xdotnet3x_config endif @@ -56,6 +59,10 @@ xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$ copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" +[DosInAnIcon_dotnet4.6_config] +copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" +xml ed -O -u "/settings/set[@component='net4.6']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" + [DosInAnIcon_win8xdotnet3x_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='NetWin8']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc index 86d2059..d7d72f6 100644 --- a/CLIENT_DATA/define3264.inc +++ b/CLIENT_DATA/define3264.inc @@ -6,6 +6,8 @@ DefVar $sereby_timer_enabled$ Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1") DefVar $sereby_dotnet4.5$ Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install") +DefVar $sereby_dotnet4.6$ +Set $sereby_dotnet4.6$ = GetProductProperty("sereby_dotnet4.6", "install") DefVar $sereby_win8xdotnet3x$ Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install") DefVar $sereby_msjsharp$ diff --git a/OPSI/control b/OPSI/control index 5fddcf7..226747b 100644 --- a/OPSI/control +++ b/OPSI/control @@ -63,6 +63,15 @@ description: Install Microsoft Netframework 4.5 values: ["install", "none", "reinstall", "uninstall"] default: ["install"] +[ProductProperty] +type: unicode +name: sereby_dotnet4.6 +multivalue: False +editable: False +description: Install Microsoft Netframework 4.6 +values: ["install", "none", "reinstall", "uninstall"] +default: ["install"] + [ProductProperty] type: unicode name: sereby_win8xdotnet3x diff --git a/Silverlight-5.1.40620.0.exe.sha1sum b/Silverlight-5.1.40620.0.exe.sha1sum new file mode 100644 index 0000000..a4f5fb7 --- /dev/null +++ b/Silverlight-5.1.40620.0.exe.sha1sum @@ -0,0 +1 @@ +45f07952e2e6cf8bd972a733aacb213871d086f1 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/Silverlight-5.1.40620.0.exe diff --git a/Silverlight_x64-5.1.40620.0.exe.sha1sum b/Silverlight_x64-5.1.40620.0.exe.sha1sum new file mode 100644 index 0000000..b71da9c --- /dev/null +++ b/Silverlight_x64-5.1.40620.0.exe.sha1sum @@ -0,0 +1 @@ +56ade2a82b7083383c9e4453af1da0301b48ac53 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/Silverlight_x64-5.1.40620.0.exe diff --git a/aio-runtimes_v2.2.2.1.exe.sha1sum b/aio-runtimes_v2.2.2.1.exe.sha1sum deleted file mode 100644 index 06cf2e0..0000000 --- a/aio-runtimes_v2.2.2.1.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -8f27158d79c97a5e78ab59d77f067b91ac832c98 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/aio-runtimes_v2.2.2.1.exe diff --git a/aio-runtimes_v2.2.3.1.exe.sha1sum b/aio-runtimes_v2.2.3.1.exe.sha1sum new file mode 100644 index 0000000..d6de9bf --- /dev/null +++ b/aio-runtimes_v2.2.3.1.exe.sha1sum @@ -0,0 +1 @@ +e0eb74d1aca146ea0e1618846e90ca86fb938126 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/aio-runtimes_v2.2.3.1.exe diff --git a/builder-product.cfg b/builder-product.cfg index a13e8fb..4fd54f5 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="sereby.org" PN="sereby.aio" NAME="All in One Runtimes" DESCRIPTION="Das All in One Runtimes Paket buendelt alle wichtigen Runtime Pakete die benoetigt werden um sicherzustellen, dass alle Programme auch reibungslos funktionieren." -VERSION="2.2.2.1" +VERSION="2.2.3.1" RELEASE="1" PRIORITY="0" ADVICE="" @@ -66,7 +66,7 @@ SHOCKVERSION="12.1.9.159" # ================================== SILVERUPDATE="1" -SILVERVERSION="5.1.40416.0" +SILVERVERSION="5.1.40620.0" # ================================== # Take Parts of Ricktendo Update @@ -79,10 +79,13 @@ RICKTENDOAIO="2014.11.11" # Take Ricktendo .net Update # ================================== -RICKTENDONET45UPDATE="1" +RICKTENDONET45UPDATE="0" RICKTENDONET45VER="452" RICKTENDONET45LANGVER="452" -RICKTENDONET="2015.06.25" +RICKTENDONET46UPDATE="1" +RICKTENDONET46VER="46" +RICKTENDONET46LANGVER="46" +RICKTENDONET="2015.07.20" # ================================== # General Runtimes Verison @@ -205,12 +208,12 @@ DL_ARCH[18]="X86" DL_WINST_NAME[18]=InstallShockMsi DL_FILE[19]="Silverlight-${SILVERVERSION}.exe" -DL_SOURCE[19]="http://download.microsoft.com/download/B/D/C/BDCE18B1-73C1-47BA-9B11-46A4C14CF7B0/40416.00/Silverlight.exe" +DL_SOURCE[19]="http://silverlight.dlservice.microsoft.com/download/5/A/4/5A4F7D41-D714-42B4-9F5F-A2B0B985CBAC/40620.00/Silverlight.exe" DL_ARCH[19]="X86" DL_WINST_NAME[19]=InstallSilver32Exe DL_FILE[20]="Silverlight_x64-${SILVERVERSION}.exe" -DL_SOURCE[20]="http://download.microsoft.com/download/B/D/C/BDCE18B1-73C1-47BA-9B11-46A4C14CF7B0/40416.00/Silverlight_x64.exe" +DL_SOURCE[20]="http://silverlight.dlservice.microsoft.com/download/5/A/4/5A4F7D41-D714-42B4-9F5F-A2B0B985CBAC/40620.00/Silverlight_x64.exe" DL_ARCH[20]="X86" DL_WINST_NAME[20]=InstallSilver64Exe @@ -235,19 +238,29 @@ DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET45LANGVER} DL_ARCH[24]="X86" DL_WINST_NAME[24]=RicktendoNet45Lang -# General Runtimes -DL_FILE[25]="geos_one-general-runtimes_${GENERALVERSION}.7z" -DL_SOURCE[25]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z" +DL_FILE[25]="dotNetFx46_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe" +DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx${RICKTENDONET46VER}_Full_LDR_x86_x64_Slim.exe" DL_ARCH[25]="X86" -DL_EXTRACT_FORMAT[25]="7zip" -DL_EXTRACT_TO[25]="Basic" +DL_WINST_NAME[25]=Ricktendo46Exe + +DL_FILE[26]="dotNetFx46LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z" +DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET46LANGVER}LP_Full_LDR_x86_x64de_Slim.7z" +DL_ARCH[26]="X86" +DL_WINST_NAME[26]=RicktendoNet46Lang # General Runtimes -DL_FILE[26]="geos_one-microsoft-msvc_${MSVCVERSION}.7z" -DL_SOURCE[26]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z" -DL_ARCH[26]="X86" -DL_EXTRACT_FORMAT[26]="7zip" -DL_EXTRACT_TO[26]="MSVC" +DL_FILE[27]="geos_one-general-runtimes_${GENERALVERSION}.7z" +DL_SOURCE[27]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z" +DL_ARCH[27]="X86" +DL_EXTRACT_FORMAT[27]="7zip" +DL_EXTRACT_TO[27]="Basic" + +# General Runtimes +DL_FILE[28]="geos_one-microsoft-msvc_${MSVCVERSION}.7z" +DL_SOURCE[28]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z" +DL_ARCH[28]="X86" +DL_EXTRACT_FORMAT[28]="7zip" +DL_EXTRACT_TO[28]="MSVC" ################## ### Uninstallers diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index be34d15..c0357b1 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -254,6 +254,21 @@ function create() { rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml fi + # ========================================================================================================== + # Update .NET 4.6 with Ricktendo + # ========================================================================================================== + + sed -e 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml + if [ "$RICKTENDONET46UPDATE" = "1" ]; then + rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.6 + mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/4.6 + 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]} + 7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[26]} + 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 + fi + # ========================================================================================================== # Update MSVC # ========================================================================================================== diff --git a/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.06.25.7z.sha1sum b/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.06.25.7z.sha1sum deleted file mode 100644 index 92ac499..0000000 --- a/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.06.25.7z.sha1sum +++ /dev/null @@ -1 +0,0 @@ -965784760209703992b774519a29418064b9959c /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.06.25.7z diff --git a/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum b/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum new file mode 100644 index 0000000..951fad2 --- /dev/null +++ b/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum @@ -0,0 +1 @@ +965784760209703992b774519a29418064b9959c /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z diff --git a/dotNetFx45_Full_LDR_x86_x64_Slim_2015.06.25.exe.sha1sum b/dotNetFx45_Full_LDR_x86_x64_Slim_2015.06.25.exe.sha1sum deleted file mode 100644 index 3767430..0000000 --- a/dotNetFx45_Full_LDR_x86_x64_Slim_2015.06.25.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -200a31ebb0c8c5cf3d398e99694387a824d0293d /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/dotNetFx45_Full_LDR_x86_x64_Slim_2015.06.25.exe diff --git a/dotNetFx45_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum b/dotNetFx45_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum new file mode 100644 index 0000000..adad2c1 --- /dev/null +++ b/dotNetFx45_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum @@ -0,0 +1 @@ +0507729dc2c0fbc79db2558388a22e30380c7c02 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotNetFx45_Full_LDR_x86_x64_Slim_2015.07.20.exe diff --git a/dotNetFx46LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum b/dotNetFx46LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum new file mode 100644 index 0000000..115ce6d --- /dev/null +++ b/dotNetFx46LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum @@ -0,0 +1 @@ +feacf45e7e4465ced615d95903ff8443288456bb /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotNetFx46LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z diff --git a/dotNetFx46_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum b/dotNetFx46_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum new file mode 100644 index 0000000..2a984aa --- /dev/null +++ b/dotNetFx46_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum @@ -0,0 +1 @@ +ae74226e22dd21e520eb2a728ff684ad67f39910 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotNetFx46_Full_LDR_x86_x64_Slim_2015.07.20.exe diff --git a/dotnetfx_5F00_cleanup_5F00_tool-2.2.2.1.zip.sha1sum b/dotnetfx_5F00_cleanup_5F00_tool-2.2.2.1.zip.sha1sum deleted file mode 100644 index 5abc41c..0000000 --- a/dotnetfx_5F00_cleanup_5F00_tool-2.2.2.1.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -add9e0a7e3f4e5ca64c771402a5f6c3a93678187 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/dotnetfx_5F00_cleanup_5F00_tool-2.2.2.1.zip diff --git a/dotnetfx_5F00_cleanup_5F00_tool-2.2.3.1.zip.sha1sum b/dotnetfx_5F00_cleanup_5F00_tool-2.2.3.1.zip.sha1sum new file mode 100644 index 0000000..e4c134f --- /dev/null +++ b/dotnetfx_5F00_cleanup_5F00_tool-2.2.3.1.zip.sha1sum @@ -0,0 +1 @@ +add9e0a7e3f4e5ca64c771402a5f6c3a93678187 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotnetfx_5F00_cleanup_5F00_tool-2.2.3.1.zip