From 110aa280579c9c963c0c6acbc634e292e95e2bc0 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 12 Mar 2013 07:10:21 +0100 Subject: [PATCH] correct all temlates about the installer versions --- sample/32bit/installer/license/CLIENT_DATA/delsub32.ins | 4 ++-- sample/32bit/installer/license/CLIENT_DATA/setup32.ins | 1 + .../32bit/installer/license/CLIENT_DATA/uninstall32.ins | 1 + sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins | 4 ++-- sample/32bit/installer/nolicense/CLIENT_DATA/setup32.ins | 1 + .../32bit/installer/nolicense/CLIENT_DATA/uninstall32.ins | 1 + .../32bit64/installer/license/CLIENT_DATA/delsub3264.ins | 8 ++++---- .../32bit64/installer/license/CLIENT_DATA/setup3264.ins | 2 ++ .../installer/nolicense/CLIENT_DATA/delsub3264.ins | 8 ++++---- .../32bit64/installer/nolicense/CLIENT_DATA/setup3264.ins | 2 ++ .../installer/nolicense/CLIENT_DATA/uninstall3264.ins | 2 ++ sample/64bit/installer/license/CLIENT_DATA/delsub64.ins | 4 ++-- sample/64bit/installer/license/CLIENT_DATA/setup64.ins | 1 + .../64bit/installer/license/CLIENT_DATA/uninstall64.ins | 1 + sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins | 4 ++-- sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins | 1 + .../64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins | 1 + sample/All/CLIENT_DATA/delsub32.ins | 4 ++-- sample/All/CLIENT_DATA/delsub3264.ins | 8 ++++---- sample/All/CLIENT_DATA/delsub64.ins | 4 ++-- sample/All/CLIENT_DATA/setup32.ins | 1 + sample/All/CLIENT_DATA/setup3264.ins | 2 ++ sample/All/CLIENT_DATA/setup64.ins | 1 + sample/All/CLIENT_DATA/uninstall32.ins | 1 + sample/All/CLIENT_DATA/uninstall3264.ins | 2 ++ sample/All/CLIENT_DATA/uninstall64.ins | 1 + 26 files changed, 46 insertions(+), 24 deletions(-) diff --git a/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins b/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins index 64d26bf..8fa5926 100644 --- a/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/installer/license/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/sample/32bit/installer/license/CLIENT_DATA/setup32.ins b/sample/32bit/installer/license/CLIENT_DATA/setup32.ins index dc4f738..044d098 100644 --- a/sample/32bit/installer/license/CLIENT_DATA/setup32.ins +++ b/sample/32bit/installer/license/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/sample/32bit/installer/license/CLIENT_DATA/uninstall32.ins b/sample/32bit/installer/license/CLIENT_DATA/uninstall32.ins index b012f35..9001941 100644 --- a/sample/32bit/installer/license/CLIENT_DATA/uninstall32.ins +++ b/sample/32bit/installer/license/CLIENT_DATA/uninstall32.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins b/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins index 64d26bf..8fa5926 100644 --- a/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/installer/nolicense/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/sample/32bit/installer/nolicense/CLIENT_DATA/setup32.ins b/sample/32bit/installer/nolicense/CLIENT_DATA/setup32.ins index df49a0b..f73d657 100644 --- a/sample/32bit/installer/nolicense/CLIENT_DATA/setup32.ins +++ b/sample/32bit/installer/nolicense/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/sample/32bit/installer/nolicense/CLIENT_DATA/uninstall32.ins b/sample/32bit/installer/nolicense/CLIENT_DATA/uninstall32.ins index c66d114..f76605e 100644 --- a/sample/32bit/installer/nolicense/CLIENT_DATA/uninstall32.ins +++ b/sample/32bit/installer/nolicense/CLIENT_DATA/uninstall32.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins b/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins index f742775..4b30338 100644 --- a/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins @@ -5,11 +5,9 @@ Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" -Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.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 @@ -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..." if FileExists($IniFile64$) - Set $UninstallProgramOld64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe") + Set $UninstallProgr64$ = 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/sample/32bit64/installer/license/CLIENT_DATA/setup3264.ins b/sample/32bit64/installer/license/CLIENT_DATA/setup3264.ins index 0c8ce73..0ee959e 100644 --- a/sample/32bit64/installer/license/CLIENT_DATA/setup3264.ins +++ b/sample/32bit64/installer/license/CLIENT_DATA/setup3264.ins @@ -6,9 +6,11 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg32$ DefVar $UninstallProgram32$ DefVar $UninstallProgramOld32$ DefVar $IniFile32$ +DefVar $UninstallProg64$ DefVar $UninstallProgram64$ DefVar $UninstallProgramOld64$ DefVar $IniFile64$ diff --git a/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins b/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins index 514d219..20104e4 100644 --- a/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins @@ -5,11 +5,9 @@ Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" -Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.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 @@ -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..." 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/sample/32bit64/installer/nolicense/CLIENT_DATA/setup3264.ins b/sample/32bit64/installer/nolicense/CLIENT_DATA/setup3264.ins index 766dcad..a462485 100644 --- a/sample/32bit64/installer/nolicense/CLIENT_DATA/setup3264.ins +++ b/sample/32bit64/installer/nolicense/CLIENT_DATA/setup3264.ins @@ -6,9 +6,11 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg32$ DefVar $UninstallProgram32$ DefVar $UninstallProgramOld32$ DefVar $IniFile32$ +DefVar $UninstallProg64$ DefVar $UninstallProgram64$ DefVar $UninstallProgramOld64$ DefVar $IniFile64$ diff --git a/sample/32bit64/installer/nolicense/CLIENT_DATA/uninstall3264.ins b/sample/32bit64/installer/nolicense/CLIENT_DATA/uninstall3264.ins index e6c3eab..b24987d 100644 --- a/sample/32bit64/installer/nolicense/CLIENT_DATA/uninstall3264.ins +++ b/sample/32bit64/installer/nolicense/CLIENT_DATA/uninstall3264.ins @@ -6,9 +6,11 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg32$ DefVar $UninstallProgram32$ DefVar $UninstallProgramOld32$ DefVar $IniFile32$ +DefVar $UninstallProg64$ DefVar $UninstallProgram64$ DefVar $UninstallProgramOld64$ DefVar $IniFile64$ diff --git a/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins b/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins index 3169807..982775d 100644 --- a/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins @@ -5,7 +5,6 @@ Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" -Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$) @@ -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/sample/64bit/installer/license/CLIENT_DATA/setup64.ins b/sample/64bit/installer/license/CLIENT_DATA/setup64.ins index 8c40345..d3afbd2 100644 --- a/sample/64bit/installer/license/CLIENT_DATA/setup64.ins +++ b/sample/64bit/installer/license/CLIENT_DATA/setup64.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/64bit/installer/license/CLIENT_DATA/uninstall64.ins b/sample/64bit/installer/license/CLIENT_DATA/uninstall64.ins index e5e5bba..ae7c000 100644 --- a/sample/64bit/installer/license/CLIENT_DATA/uninstall64.ins +++ b/sample/64bit/installer/license/CLIENT_DATA/uninstall64.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins b/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins index 3169807..982775d 100644 --- a/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins @@ -5,7 +5,6 @@ Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" -Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$) @@ -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/sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins b/sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins index 79674d2..59664c9 100644 --- a/sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins +++ b/sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins b/sample/64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins index aa1b813..44eaf1f 100644 --- a/sample/64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins +++ b/sample/64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins @@ -6,6 +6,7 @@ [Actions] requiredWinstVersion >= "4.11.2.6" +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/All/CLIENT_DATA/delsub32.ins b/sample/All/CLIENT_DATA/delsub32.ins index f8dbedd..4857753 100644 --- a/sample/All/CLIENT_DATA/delsub32.ins +++ b/sample/All/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/sample/All/CLIENT_DATA/delsub3264.ins b/sample/All/CLIENT_DATA/delsub3264.ins index 078a9bb..a581c36 100644 --- a/sample/All/CLIENT_DATA/delsub3264.ins +++ b/sample/All/CLIENT_DATA/delsub3264.ins @@ -5,11 +5,9 @@ Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" -Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.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/sample/All/CLIENT_DATA/delsub64.ins b/sample/All/CLIENT_DATA/delsub64.ins index e5510cd..2a521a5 100644 --- a/sample/All/CLIENT_DATA/delsub64.ins +++ b/sample/All/CLIENT_DATA/delsub64.ins @@ -5,7 +5,6 @@ Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" -Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$) @@ -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/sample/All/CLIENT_DATA/setup32.ins b/sample/All/CLIENT_DATA/setup32.ins index a9afa4c..9c026a2 100644 --- a/sample/All/CLIENT_DATA/setup32.ins +++ b/sample/All/CLIENT_DATA/setup32.ins @@ -7,6 +7,7 @@ requiredWinstVersion >= "4.11.2.6" DefVar $MsiIdOld$ +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/All/CLIENT_DATA/setup3264.ins b/sample/All/CLIENT_DATA/setup3264.ins index 0b41e43..c33a0ee 100644 --- a/sample/All/CLIENT_DATA/setup3264.ins +++ b/sample/All/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/sample/All/CLIENT_DATA/setup64.ins b/sample/All/CLIENT_DATA/setup64.ins index e3172b4..e83985c 100644 --- a/sample/All/CLIENT_DATA/setup64.ins +++ b/sample/All/CLIENT_DATA/setup64.ins @@ -7,6 +7,7 @@ requiredWinstVersion >= "4.11.2.6" DefVar $MsiIdOld$ +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/All/CLIENT_DATA/uninstall32.ins b/sample/All/CLIENT_DATA/uninstall32.ins index c040138..56ef80e 100644 --- a/sample/All/CLIENT_DATA/uninstall32.ins +++ b/sample/All/CLIENT_DATA/uninstall32.ins @@ -7,6 +7,7 @@ requiredWinstVersion >= "4.11.2.6" DefVar $MsiIdOld$ +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$ diff --git a/sample/All/CLIENT_DATA/uninstall3264.ins b/sample/All/CLIENT_DATA/uninstall3264.ins index b575698..8d698ed 100644 --- a/sample/All/CLIENT_DATA/uninstall3264.ins +++ b/sample/All/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$ diff --git a/sample/All/CLIENT_DATA/uninstall64.ins b/sample/All/CLIENT_DATA/uninstall64.ins index d81dd62..545891e 100644 --- a/sample/All/CLIENT_DATA/uninstall64.ins +++ b/sample/All/CLIENT_DATA/uninstall64.ins @@ -7,6 +7,7 @@ requiredWinstVersion >= "4.11.2.6" DefVar $MsiIdOld$ +DefVar $UninstallProg$ DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ DefVar $IniFile$