diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index f564d54..d1554f2 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -5,218 +5,265 @@ Set $reboot$ = "false" if ($sereby_dotnet1.1$ = "uninstall") Winbatch_dotnet1.1_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet1.1") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_dotnet1.1_uninstall Set $reboot$ = "true" endif if ($sereby_dotnet2.0$ = "uninstall") Winbatch_dotnet2.0_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet2.0") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_dotnet2.0_uninstall Set $reboot$ = "true" endif if ($sereby_dotnet3.0$ = "uninstall") Winbatch_dotnet3.0_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet3.0") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_dotnet3.0_uninstall Set $reboot$ = "true" endif if ($sereby_dotnet3.5$ = "uninstall") Winbatch_dotnet3.5_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet3.5") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_dotnet3.5_uninstall Set $reboot$ = "true" endif if ($sereby_dotnet4.0$ = "uninstall") Winbatch_dotnet4.0_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet4.0") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_dotnet4.0_uninstall Set $reboot$ = "true" endif if ($sereby_dotnet4.5$ = "uninstall") Winbatch_dotnet4.5_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet4.5") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_dotnet4.5_uninstall Set $reboot$ = "true" endif if ($sereby_msjsharp$ = "uninstall") Winbatch_msjsharp_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_msjsharp") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_msjsharp_uninstall Set $reboot$ = "true" endif if ($sereby_silver$ = "uninstall") Winbatch_silver_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_silver") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_silver_uninstall Set $reboot$ = "true" endif if ($sereby_jre$ = "uninstall") Dosbatch_jre_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_jre") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_jre_uninstall Set $reboot$ = "true" endif if ($sereby_AdobeShock$ = "uninstall") Winbatch_AdobeShock_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_AdobeShock") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_AdobeShock_uninstall Set $reboot$ = "true" endif if ($sereby_basicruntimes$ = "uninstall") Winbatch_basicruntimes_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_basicruntimes") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_basicruntimes_uninstall Set $reboot$ = "true" endif if ($sereby_msdx9$ = "uninstall") Winbatch_msdx9_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_msdx9") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_msdx9_uninstall Set $reboot$ = "true" endif if ($sereby_msdxm$ = "uninstall") Winbatch_msdxm_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_msdxm") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_msdxm_uninstall Set $reboot$ = "true" endif if ($sereby_msvc$ = "uninstall") Winbatch_msvc_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_msvc") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_msvc_uninstall Set $reboot$ = "true" endif if ($sereby_AdobeFlash$ = "uninstall") Winbatch_AdobeFlash_uninstall - set $productProperty$ = addtolist($productProperty$, "[newmap]") - set $productProperty$ = addtolist($productProperty$, "type=productProperty") - set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") - set $productProperty$ = addtolist($productProperty$, "property=sereby_AdobeFlash") - set $productProperty$ = addtolist($productProperty$, "value=install") - set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + opsiservicecall_AdobeFlash_uninstall Set $reboot$ = "true" endif if ($sereby_java_reinstall$ = "true") Dosbatch_java_reinstall endif -markErrorNumber -OpsiServiceHashList_productProperty_updateObjects -if errorsOccuredSinceMark > 0 - isFatalError -endif - if ($reboot$ = "true") comment "uninstall done now force Reboot" ExitWindows /ImmediateReboot endif -[OpsiServiceHashList_productProperty_updateObjects] -"method": "productProperty_updateObjects" -"HashList": "$productProperty$" -"params": [ - ] - [Winbatch_dotnet1.1_uninstall] %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 1.1 /u" +[opsiservicecall_dotnet1.1_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet1.1", +"installed", +"%opsiserviceUser%" +] + [Winbatch_dotnet2.0_uninstall] %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 2.0 /u" +[opsiservicecall_dotnet2.0_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet2.0", +"installed", +"%opsiserviceUser%" +] + [Winbatch_dotnet3.0_uninstall] %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 3.0 /u" +[opsiservicecall_dotnet3.0_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet3.0", +"installed", +"%opsiserviceUser%" +] + [Winbatch_dotnet3.5_uninstall] %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 3.5 /u" +[opsiservicecall_dotnet3.5_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet3.5", +"installed", +"%opsiserviceUser%" +] + [Winbatch_dotnet4.0_uninstall] %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.0 /u" +[opsiservicecall_dotnet4.0_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet4.0", +"installed", +"%opsiserviceUser%" +] + [Winbatch_dotnet4.5_uninstall] %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5 /u" +[opsiservicecall_dotnet4.5_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_dotnet4.5", +"installed", +"%opsiserviceUser%" +] + [Winbatch_msjsharp_uninstall] +[opsiservicecall_msjsharp_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_msjsharp", +"installed", +"%opsiserviceUser%" +] + [Winbatch_silver_uninstall] +[opsiservicecall_silver_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_silver", +"installed", +"%opsiserviceUser%" +] + [DosBatch_jre_uninstall] ; copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\" ; $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS @echo off cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /keeponly +[opsiservicecall_jre_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_jre", +"installed", +"%opsiserviceUser%" +] + [Dosbatch_java_reinstall] @echo off cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly [Winbatch_AdobeShock_uninstall] +[opsiservicecall_AdobeShock_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_AdobeShock", +"installed", +"%opsiserviceUser%" +] + [Winbatch_basicruntimes_uninstall] +[opsiservicecall_basicruntimes_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_basicruntimes", +"installed", +"%opsiserviceUser%" +] + [Winbatch_msdx9_uninstall] +[opsiservicecall_msdx9_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_msdx9", +"installed", +"%opsiserviceUser%" +] + [Winbatch_msdxm_uninstall] +[opsiservicecall_msdxm_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_msdxm", +"installed", +"%opsiserviceUser%" +] + [Winbatch_msvc_uninstall] +[opsiservicecall_msvc_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_msvc", +"installed", +"%opsiserviceUser%" +] + [Winbatch_AdobeFlash_uninstall] +[opsiservicecall_AdobeFlash_uninstall] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"sereby_AdobeFlash", +"installed", +"%opsiserviceUser%" +] diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins index 86d293d..9b5afa6 100644 --- a/CLIENT_DATA/config3264.ins +++ b/CLIENT_DATA/config3264.ins @@ -54,9 +54,9 @@ DosInAnIcon_finish_config copy "%ScriptPath%\Config\WinPKG.xml" "$LogDir$" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/timer[@value=40]/@value" -v $timer_value$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" +xml ed -O -u "/settings/timer[@value=40]/@value" -v $sereby_timer_value$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $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_dotnet1.1_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 0719b42..9ec0562 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -80,7 +80,7 @@ else Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." comment "Start setup program" ChangeDirectory "%SCRIPTPATH%" - if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) + if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($sereby_dotnet3.5$ = "install") or ($sereby_dotnet3.0$ = "install") or ($sereby_dotnet2.0$ = "install")) comment "Install Netframework 2.0 - 3.5 for Windows 8" if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) Message "Install Netframework 2.0 - 3.5 for Windows 8" @@ -105,7 +105,7 @@ else Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." comment "Start setup program" ChangeDirectory "%SCRIPTPATH%" - if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) + if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($sereby_dotnet3.5$ = "install") or ($sereby_dotnet3.0$ = "install") or ($sereby_dotnet2.0$ = "install")) comment "Install Netframework 2.0 - 3.5 for Windows 8" if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) Message "Install Netframework 2.0 - 3.5 for Windows 8" diff --git a/OPSI/control b/OPSI/control index 67001bb..e16bdcd 100644 --- a/OPSI/control +++ b/OPSI/control @@ -36,12 +36,6 @@ requiredProduct: sourceforge.xmlstarlet requiredStatus: installed requirementType: before -[ProductDependency] -action: setup -requiredProduct: horstmuc.inifile -requiredStatus: installed -requirementType: before - [ProductProperty] type: unicode name: sereby_timer_value @@ -112,7 +106,7 @@ multivalue: False editable: False description: Install Microsoft Netframework 4.0 values: ["install", "none", "uninstall"] -default: ["none", "uninstall"] +default: ["install"] [ProductProperty] type: unicode