correct old uninstaller handling

This commit is contained in:
Mario Fetka 2013-03-12 07:20:22 +01:00
parent 414d2fc772
commit 6b97db8c4d
3 changed files with 8 additions and 4 deletions

View File

@ -5,11 +5,9 @@
Set $UninstallProgram32$ = $InstallDir32$ + "\uninstgs.exe" Set $UninstallProgram32$ = $InstallDir32$ + "\uninstgs.exe"
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $UninstallProgram64$ = $InstallDir64$ + "\uninstgs.exe" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstgs.exe"
Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini" 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") 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..." Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
if FileExists($IniFile32$) 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$) if FileExists($UninstallProgramOld32$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old_32 Winbatch_uninstall_old_32
@ -49,7 +48,8 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..." Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
if FileExists($IniFile64$) 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$) if FileExists($UninstallProgramOld64$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old_64 Winbatch_uninstall_old_64

View File

@ -6,9 +6,11 @@
[Actions] [Actions]
requiredWinstVersion >= "4.11.2.6" requiredWinstVersion >= "4.11.2.6"
DefVar $UninstallProg32$
DefVar $UninstallProgram32$ DefVar $UninstallProgram32$
DefVar $UninstallProgramOld32$ DefVar $UninstallProgramOld32$
DefVar $IniFile32$ DefVar $IniFile32$
DefVar $UninstallProg64$
DefVar $UninstallProgram64$ DefVar $UninstallProgram64$
DefVar $UninstallProgramOld64$ DefVar $UninstallProgramOld64$
DefVar $IniFile64$ DefVar $IniFile64$

View File

@ -6,9 +6,11 @@
[Actions] [Actions]
requiredWinstVersion >= "4.11.2.6" requiredWinstVersion >= "4.11.2.6"
DefVar $UninstallProg32$
DefVar $UninstallProgram32$ DefVar $UninstallProgram32$
DefVar $UninstallProgramOld32$ DefVar $UninstallProgramOld32$
DefVar $IniFile32$ DefVar $IniFile32$
DefVar $UninstallProg64$
DefVar $UninstallProgram64$ DefVar $UninstallProgram64$
DefVar $UninstallProgramOld64$ DefVar $UninstallProgramOld64$
DefVar $IniFile64$ DefVar $IniFile64$