From e4ada415e864a6382f29094879b2675668601799 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 12 Mar 2013 07:28:22 +0100 Subject: [PATCH] correct old uninstaller handling --- CLIENT_DATA/delsub32.ins | 4 ++-- CLIENT_DATA/setup32.ins | 1 + CLIENT_DATA/uninstall32.ins | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 1184960..77a5bef 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -4,7 +4,6 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" @@ -16,7 +15,8 @@ endif Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." if FileExists($IniFile$) - Set $UninstallProgramOld$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") + Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") + Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ if FileExists($UninstallProgramOld$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_old diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index f7c6283..052a116 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index 9a6c553..fd78f90 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$