From fb65ec846622e15d35054d18ee4e32f7c76ea14d Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 20 Feb 2012 07:04:08 +0100
Subject: [PATCH] move uninstall to dosbatch for cd $installdir$

---
 CLIENT_DATA/delsub.ins | 16 ++++++++++------
 CLIENT_DATA/setup.ins  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub.ins
index 6c4c09b..8dd2ad1 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub.ins
@@ -18,7 +18,7 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32
+		Dosbatch_uninstall_32
 		sub_check_exitcode
 	endif
 
@@ -42,7 +42,7 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64
+		Dosbatch_uninstall_64
 		sub_check_exitcode
 	endif
 
@@ -66,12 +66,14 @@ LinkFolder_uninstall
 net stop immunetprotect
 taskkill /IM iptray.exe
 
-[Winbatch_uninstall_32]
+[Dosbatch_uninstall_32]
 ; Choose one of the following examples as basis for program uninstall
 ;
 ; === Nullsoft Scriptable Install System ================================================================
 ;"$UninstallProgram32$" /S
-"$UninstallProgram32$"
+;"$UninstallProgram32$"
+cd $InstallDir32$"\"$uVersion$
+immunet-uninstall.exe
 
 
 [Winbatch_uninstall_msi_32]
@@ -82,12 +84,14 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 ;
 delete -sf "$InstallDir32$\"
 
-[Winbatch_uninstall_64]
+[Dosbatch_uninstall_64]
 ; Choose one of the following examples as basis for program uninstall
 ;
 ; === Nullsoft Scriptable Install System ================================================================
 ;"$UninstallProgram64$" /S
-"$UninstallProgram64$"
+;"$UninstallProgram64$"
+cd $InstallDir32$"\"$uVersion$
+immunet-uninstall.exe
 
 
 [Winbatch_uninstall_msi_64]
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index f195eff..19d1d6b 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -538,7 +538,7 @@ copy -s "%ScriptPath%\*.exe" "$InstallDir32$\$uVersion$"
 ; Example of recursively copying some files into the installation directory:
 ;
 copy -s "%ScriptPath%\*.xml" "$InstallDir64$"
-copy -s "%ScriptPath%\*.exe" "$InstallDir64$\$uVersion$"
+copy -s "%ScriptPath%\immunet-uninstall.exe" "$InstallDir64$\$uVersion$"
 
 [Registry_install]
 ; Example of setting some values of an registry key: