diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index d1554f2..a85be84 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -33,6 +33,13 @@ if ($sereby_dotnet4.5$ = "uninstall") opsiservicecall_dotnet4.5_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" + ExitWindows /ImmediateReboot +endif + if ($sereby_msjsharp$ = "uninstall") Winbatch_msjsharp_uninstall opsiservicecall_msjsharp_uninstall @@ -82,6 +89,7 @@ if ($sereby_java_reinstall$ = "true") Dosbatch_java_reinstall endif +; and the final reboot after the uninstall is done if ($reboot$ = "true") comment "uninstall done now force Reboot" ExitWindows /ImmediateReboot @@ -95,7 +103,7 @@ endif "params": [ "$ProductId$", "sereby_dotnet1.1", -"installed", +"install", "%opsiserviceUser%" ] @@ -107,7 +115,7 @@ endif "params": [ "$ProductId$", "sereby_dotnet2.0", -"installed", +"install", "%opsiserviceUser%" ] @@ -119,7 +127,7 @@ endif "params": [ "$ProductId$", "sereby_dotnet3.0", -"installed", +"install", "%opsiserviceUser%" ] @@ -131,7 +139,7 @@ endif "params": [ "$ProductId$", "sereby_dotnet3.5", -"installed", +"install", "%opsiserviceUser%" ] @@ -143,7 +151,7 @@ endif "params": [ "$ProductId$", "sereby_dotnet4.0", -"installed", +"install", "%opsiserviceUser%" ] @@ -155,7 +163,7 @@ endif "params": [ "$ProductId$", "sereby_dotnet4.5", -"installed", +"install", "%opsiserviceUser%" ] @@ -166,7 +174,7 @@ endif "params": [ "$ProductId$", "sereby_msjsharp", -"installed", +"install", "%opsiserviceUser%" ] @@ -177,14 +185,14 @@ endif "params": [ "$ProductId$", "sereby_silver", -"installed", +"install", "%opsiserviceUser%" ] [DosBatch_jre_uninstall] -; copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\" -; $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS @echo off +rem copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\" +rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /keeponly [opsiservicecall_jre_uninstall] @@ -192,7 +200,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /ke "params": [ "$ProductId$", "sereby_jre", -"installed", +"install", "%opsiserviceUser%" ] @@ -207,7 +215,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k "params": [ "$ProductId$", "sereby_AdobeShock", -"installed", +"install", "%opsiserviceUser%" ] @@ -218,7 +226,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k "params": [ "$ProductId$", "sereby_basicruntimes", -"installed", +"install", "%opsiserviceUser%" ] @@ -229,7 +237,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k "params": [ "$ProductId$", "sereby_msdx9", -"installed", +"install", "%opsiserviceUser%" ] @@ -240,7 +248,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k "params": [ "$ProductId$", "sereby_msdxm", -"installed", +"install", "%opsiserviceUser%" ] @@ -251,18 +259,19 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k "params": [ "$ProductId$", "sereby_msvc", -"installed", +"install", "%opsiserviceUser%" ] [Winbatch_AdobeFlash_uninstall] +$UninstallFlashExe$ -uninstall [opsiservicecall_AdobeFlash_uninstall] "method": "setProductProperty" "params": [ "$ProductId$", "sereby_AdobeFlash", -"installed", +"install", "%opsiserviceUser%" ] diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 9ec0562..0812072 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -64,6 +64,11 @@ else comment "Show product picture" ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ + if FileExists("%ScriptPath%\cleanup3264.ins") + comment "Start uninstall sub section" + Sub "%ScriptPath%\cleanup3264.ins" + endif + if FileExists("%ScriptPath%\delsub3264.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub3264.ins" @@ -125,7 +130,10 @@ else comment "Create shortcuts" LinkFolder_install endif - + + comment "Reboot" + ExitWindows /Reboot + endif [Dosbatch_install_dotNet8] diff --git a/OPSI/control b/OPSI/control index e16bdcd..e6d1780 100644 --- a/OPSI/control +++ b/OPSI/control @@ -43,7 +43,7 @@ multivalue: False editable: True description: Time until installation starts (0 for immediate installation) values: ["40"] -default: ["40"] +default: ["5"] [ProductProperty] type: unicode diff --git a/aio-runtimes_v2.0.4.1.7z.sha1sum b/aio-runtimes_v2.0.4.1.7z.sha1sum new file mode 100644 index 0000000..d33e761 --- /dev/null +++ b/aio-runtimes_v2.0.4.1.7z.sha1sum @@ -0,0 +1 @@ +9c0c0c3319430e4f468fca860eda5ab7e89c8c7a /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/aio-runtimes_v2.0.4.1.7z diff --git a/builder-product.cfg b/builder-product.cfg index 66bcb2b..bc19c8f 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.0.3.1" +VERSION="2.0.4.1" RELEASE="1" PRIORITY="0" ADVICE="" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 52953e3..77a0d25 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -49,9 +49,9 @@ function create() { # update parts of the sereby with the Dimple package (Dimpel just updates everything exept dotnet) # rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/JRE/* $INST_DIR/CLIENT_DATA/Install/Packages/JRE - rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Flash/* $INST_DIR/CLIENT_DATA/Install/Packages/Flash + #rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Flash/* $INST_DIR/CLIENT_DATA/Install/Packages/Flash # rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Shockwave/* $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave - rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Silverlight/* $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight + #rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Silverlight/* $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight # move the Windows 8 dotnet 2 - 3.5 in place mv -v $INST_DIR/CLIENT_DATA/X86/win8dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET8 diff --git a/dimpel-aio-runtimes_v2.0.4.1.7z.sha1sum b/dimpel-aio-runtimes_v2.0.4.1.7z.sha1sum new file mode 100644 index 0000000..fdf467a --- /dev/null +++ b/dimpel-aio-runtimes_v2.0.4.1.7z.sha1sum @@ -0,0 +1 @@ +8d075a36be7631960d545e68a84d7ce4987f4631 /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/dimpel-aio-runtimes_v2.0.4.1.7z