From 6aaa962a1528c03ea5c0d565aef48d095de4c0f5 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 14 Sep 2013 15:40:44 +0200
Subject: [PATCH] add unimstall

---
 CLIENT_DATA/cleanup3264.ins | 46 ++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index 056a495..53784f9 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -69,17 +69,17 @@ if ($reboot$ = "true")
 endif
 
 if ($sereby_msjsharp$ = "reinstall")
-    Winbatch_msjsharp_uninstall
+    Dosbatch_msjsharp_uninstall
     opsiservicecall_msjsharp_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msfsharp$ = "reinstall")
-    Winbatch_msfsharp_uninstall
+    Dosbatch_msfsharp_uninstall
     opsiservicecall_msfsharp_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_silver$ = "reinstall")
-    Winbatch_silver_uninstall
+    Dosbatch_silver_uninstall
     opsiservicecall_silver_uninstall
     Set $reboot$ = "true"
 endif
@@ -89,37 +89,37 @@ if ($sereby_jre$ = "reinstall")
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeShock$ = "reinstall")
-    Winbatch_AdobeShock_uninstall
+    Dosbatch_AdobeShock_uninstall
     opsiservicecall_AdobeShock_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_basicruntimes$ = "reinstall")
-    Winbatch_basicruntimes_uninstall
+    Dosbatch_basicruntimes_uninstall
     opsiservicecall_basicruntimes_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msdx9$ = "reinstall")
-    Winbatch_msdx9_uninstall
+    Dosbatch_msdx9_uninstall
     opsiservicecall_msdx9_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msdxm$ = "reinstall")
-    Winbatch_msdxm_uninstall
+    Dosbatch_msdxm_uninstall
     opsiservicecall_msdxm_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msvc$ = "reinstall")
-    Winbatch_msvc_uninstall
+    Dosbatch_msvc_uninstall
     opsiservicecall_msvc_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeFlash$ = "reinstall")
-    Winbatch_AdobeFlash_uninstall
+    Dosbatch_AdobeFlash_uninstall
     opsiservicecall_AdobeFlash_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeAir$ = "reinstall")
-    Winbatch_AdobeAir_uninstall
+    Dosbatch_AdobeAir_uninstall
     opsiservicecall_AdobeAir_uninstall
     Set $reboot$ = "true"
 endif
@@ -202,7 +202,7 @@ endif
 "%opsiserviceUser%"
 ]
 
-[Winbatch_msjsharp_uninstall]
+[Dosbatch_msjsharp_uninstall]
 
 [opsiservicecall_msjsharp_uninstall]
 "method": "setProductProperty"
@@ -213,7 +213,7 @@ endif
 "%opsiserviceUser%"
 ]
 
-[Winbatch_msfsharp_uninstall]
+[Dosbatch_msfsharp_uninstall]
 
 [opsiservicecall_msfsharp_uninstall]
 "method": "setProductProperty"
@@ -224,9 +224,10 @@ endif
 "%opsiserviceUser%"
 ]
 
-[Winbatch_silver_uninstall]
+[Dosbatch_silver_uninstall]
 ; wmic product where caption='Microsoft Silverlight' call uninstall
-"%ScriptPath%\UnInstall\Package\Silverlight\CleanSilverlight.cmd"
+;"%ScriptPath%\UnInstall\Package\Silverlight\CleanSilverlight.cmd"
+wmic product where name="Microsoft Silverlight" call uninstall /INTERACTIVE:OFF
 
 
 [opsiservicecall_silver_uninstall]
@@ -253,8 +254,9 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
-[Winbatch_AdobeShock_uninstall]
+[Dosbatch_AdobeShock_uninstall]
 "%ScriptPath%\UnInstall\Packages\Shockwave\uninstall_shock_player.exe" /s
+wmic product where name="Adobe Shockwave Player 12.0" call uninstall /INTERACTIVE:OFF
 
 [opsiservicecall_AdobeShock_uninstall]
 "method": "setProductProperty"
@@ -265,7 +267,8 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
-[Winbatch_basicruntimes_uninstall]
+[Dosbatch_basicruntimes_uninstall]
+wmic product where name="Allgemeine Runtime Files (x86)" call uninstall /INTERACTIVE:OFF
 
 [opsiservicecall_basicruntimes_uninstall]
 "method": "setProductProperty"
@@ -276,7 +279,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
-[Winbatch_msdx9_uninstall]
+[Dosbatch_msdx9_uninstall]
 
 [opsiservicecall_msdx9_uninstall]
 "method": "setProductProperty"
@@ -287,7 +290,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
-[Winbatch_msdxm_uninstall]
+[Dosbatch_msdxm_uninstall]
 
 [opsiservicecall_msdxm_uninstall]
 "method": "setProductProperty"
@@ -298,7 +301,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
-[Winbatch_msvc_uninstall]
+[Dosbatch_msvc_uninstall]
 
 [opsiservicecall_msvc_uninstall]
 "method": "setProductProperty"
@@ -309,7 +312,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
-[Winbatch_AdobeFlash_uninstall]
+[Dosbatch_AdobeFlash_uninstall]
 $UninstallFlashExe$ -uninstall
 
 [opsiservicecall_AdobeFlash_uninstall]
@@ -321,7 +324,8 @@ $UninstallFlashExe$ -uninstall
 "%opsiserviceUser%"
 ]
 
-[Winbatch_AdobeAir_uninstall]
+[Dosbatch_AdobeAir_uninstall]
+wmic product where name="Adobe AIR" call uninstall /INTERACTIVE:OFF
 
 [opsiservicecall_AdobeAir_uninstall]
 "method": "setProductProperty"