correct old uninstaller handling

This commit is contained in:
Mario Fetka 2013-03-12 07:28:22 +01:00
parent 5e2352bcb7
commit e4ada415e8
3 changed files with 4 additions and 2 deletions

View File

@ -4,7 +4,6 @@
; credits: http://www.opsi.org/en/credits/ ; credits: http://www.opsi.org/en/credits/
Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
@ -16,7 +15,8 @@ endif
Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
if FileExists($IniFile$) 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$) if FileExists($UninstallProgramOld$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old Winbatch_uninstall_old

View File

@ -6,6 +6,7 @@
[Actions] [Actions]
requiredWinstVersion >= "4.11.2.6" requiredWinstVersion >= "4.11.2.6"
DefVar $UninstallProg$
DefVar $UninstallProgram$ DefVar $UninstallProgram$
DefVar $UninstallProgramOld$ DefVar $UninstallProgramOld$
DefVar $IniFile$ DefVar $IniFile$

View File

@ -6,6 +6,7 @@
[Actions] [Actions]
requiredWinstVersion >= "4.11.2.6" requiredWinstVersion >= "4.11.2.6"
DefVar $UninstallProg$
DefVar $UninstallProgram$ DefVar $UninstallProgram$
DefVar $UninstallProgramOld$ DefVar $UninstallProgramOld$
DefVar $IniFile$ DefVar $IniFile$