Changeset 950 for opsi/products/xenserver-tools/CLIENT_DATA/delsub.ins

Timestamp:

Jun 18, 2011, 11:42:56 PM (13 years ago)

Author:

joergs

Message:

adapted for Citrix XenServer Tools

File:

• opsi/products/xenserver-tools/CLIENT_DATA/delsub.ins (modified) (4 diffs)

opsi/products/xenserver-tools/CLIENT_DATA/delsub.ins

@@ -5 +5 @@
 
 
-Set $MsiId32$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
-Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
+;Set $MsiId32$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
+;Set $MsiId32$ = 'Citrix XenTools'
+Set $UninstallProgram32$ = $InstallDir32$ + "\uninstaller.exe"
 
-Set $MsiId64$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
-Set $UninstallProgram32$ = $InstallDir64$ + "\uninstall.exe"
+    if FileExists($UninstallProgram32$)
+        comment "Uninstall program found (32 bit), starting uninstall"
+        Winbatch_uninstall_32
+        sub_check_exitcode
+        ExitWindows /Reboot
+    endif
+
+    if FileExists($UninstallProgram64$)
+        comment "Uninstall program found (64 bit), starting uninstall"
+        Winbatch_uninstall_64
+        sub_check_exitcode
+        ExitWindows /Reboot
+    endif
+
+
+;Set $MsiId64$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
+;Set $MsiId64$ = 'Citrix XenTools'
+Set $UninstallProgram64$ = $InstallDir64$ + "\uninstaller.exe"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
         Message "Uninstalling " + $ProductId$ + " 32 Bit..."
 
-        if FileExists($UninstallProgram32$)
-                comment "Uninstall program found, starting uninstall"
-                Winbatch_uninstall_32
-                sub_check_exitcode
-        endif
+;       if FileExists($UninstallProgram32$)
+;               comment "Uninstall program found, starting uninstall"
+;               Winbatch_uninstall_32
+;               sub_check_exitcode
+;       endif
 
         if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
@@ -35 +52 @@
         Message "Uninstalling " + $ProductId$ + " 64 Bit..."
 
-        if FileExists($UninstallProgram64$)
-                comment "Uninstall program found, starting uninstall"
-                Winbatch_uninstall_64
-                sub_check_exitcode
-        endif
+;       if FileExists($UninstallProgram64$)
+;               comment "Uninstall program found, starting uninstall"
+;               Winbatch_uninstall_64
+;               sub_check_exitcode
+;       endif
 
         if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
@@ -61 +78 @@
 ; === Nullsoft Scriptable Install System ================================================================
 ; "$UninstallProgram32$" /S
-;
+"$UninstallProgram32$" /S /norestart
+
 ; === Inno Setup ========================================================================================
 ; "$UninstallProgram32$" /silent /norestart
@@ -78 +96 @@
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-; "$UninstallProgram64$" /S
-;
+; "$UninstallProgram64$" /S 
+"$UninstallProgram64$" /S /norestart
+
 ; === Inno Setup ========================================================================================
 ; "$UninstallProgram64$" /silent /norestart