From 6261d4a62ae31cc40f1e2c2665beddda12278fc3 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 12 Mar 2013 07:25:26 +0100
Subject: [PATCH] correct old uninstaller handling

---
 CLIENT_DATA/delsub3264.ins    | 8 ++++----
 CLIENT_DATA/setup3264.ins     | 2 ++
 CLIENT_DATA/uninstall3264.ins | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index 093e040..360d308 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -5,11 +5,9 @@
 
 
 Set $UninstallProgram32$ = $InstallDir32$ + "\unins000.exe"
-Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
 Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
 
 Set $UninstallProgram64$ = $InstallDir64$ + "\unins000.exe"
-Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
 Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
@@ -21,7 +19,8 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
 
         if FileExists($IniFile32$)
-		Set $UninstallProgramOld32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe")
+		Set $UninstallProg32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe")
+		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
 		if FileExists($UninstallProgramOld32$)
 			comment "Uninstall program found, starting uninstall"
 			Winbatch_uninstall_old_32
@@ -64,7 +63,8 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
 
         if FileExists($IniFile64$)
-		Set $UninstallProgramOld64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe")
+		Set $UninstallProg64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe")
+		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
 		if FileExists($UninstallProgramOld64$)
 			comment "Uninstall program found, starting uninstall"
 			Winbatch_uninstall_old_64
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index ff1532f..3d733f8 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -7,10 +7,12 @@
 requiredWinstVersion >= "4.11.2.6"
 
 DefVar $MsiIdOld32$
+DefVar $UninstallProg32$
 DefVar $UninstallProgram32$
 DefVar $UninstallProgramOld32$
 DefVar $IniFile32$
 DefVar $MsiIdOld64$
+DefVar $UninstallProg64$
 DefVar $UninstallProgram64$
 DefVar $UninstallProgramOld64$
 DefVar $IniFile64$
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
index 4276f40..c6a5561 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -7,10 +7,12 @@
 requiredWinstVersion >= "4.11.2.6"
 
 DefVar $MsiIdOld32$
+DefVar $UninstallProg32$
 DefVar $UninstallProgram32$
 DefVar $UninstallProgramOld32$
 DefVar $IniFile32$
 DefVar $MsiIdOld64$
+DefVar $UninstallProg64$
 DefVar $UninstallProgram64$
 DefVar $UninstallProgramOld64$
 DefVar $IniFile64$