aio/aio-builder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct all temlates about the installer versions

Browse Source
This commit is contained in:
Mario Fetka 2013-03-12 07:10:21 +01:00
parent df790e40f7
commit 110aa28057
26 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sample/32bit/installer/license/CLIENT_DATA/delsub32.ins
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

1
sample/32bit/installer/license/CLIENT_DATA/setup32.ins
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$

1
sample/32bit/installer/license/CLIENT_DATA/uninstall32.ins
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$

4
sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins
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

1
sample/32bit/installer/nolicense/CLIENT_DATA/setup32.ins
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$

1
sample/32bit/installer/nolicense/CLIENT_DATA/uninstall32.ins
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$

8
sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins
View File

@ -5,11 +5,9 @@
Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.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 $UninstallProgr64$ = 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

2
sample/32bit64/installer/license/CLIENT_DATA/setup3264.ins
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$

8
sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins
View File

@ -5,11 +5,9 @@
Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.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

2
sample/32bit64/installer/nolicense/CLIENT_DATA/setup3264.ins
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$

2
sample/32bit64/installer/nolicense/CLIENT_DATA/uninstall3264.ins
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$

4
sample/64bit/installer/license/CLIENT_DATA/delsub64.ins
View File

@ -5,7 +5,6 @@
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
if FileExists($IniFile$) if FileExists($IniFile$)
@ -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

1
sample/64bit/installer/license/CLIENT_DATA/setup64.ins
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$

1
sample/64bit/installer/license/CLIENT_DATA/uninstall64.ins
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$

4
sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins
View File

@ -5,7 +5,6 @@
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
if FileExists($IniFile$) if FileExists($IniFile$)
@ -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

1
sample/64bit/installer/nolicense/CLIENT_DATA/setup64.ins
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$

1
sample/64bit/installer/nolicense/CLIENT_DATA/uninstall64.ins
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$

4
sample/All/CLIENT_DATA/delsub32.ins
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

8
sample/All/CLIENT_DATA/delsub3264.ins
View File

@ -5,11 +5,9 @@
Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.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
@ -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..." 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

4
sample/All/CLIENT_DATA/delsub64.ins
View File

@ -5,7 +5,6 @@
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
if FileExists($IniFile$) if FileExists($IniFile$)
@ -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

1
sample/All/CLIENT_DATA/setup32.ins
View File

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

2
sample/All/CLIENT_DATA/setup3264.ins
View File

@ -7,10 +7,12 @@
requiredWinstVersion >= "4.11.2.6" requiredWinstVersion >= "4.11.2.6"
DefVar $MsiIdOld32$ DefVar $MsiIdOld32$
DefVar $UninstallProg32$
DefVar $UninstallProgram32$ DefVar $UninstallProgram32$
DefVar $UninstallProgramOld32$ DefVar $UninstallProgramOld32$
DefVar $IniFile32$ DefVar $IniFile32$
DefVar $MsiIdOld64$ DefVar $MsiIdOld64$
DefVar $UninstallProg64$
DefVar $UninstallProgram64$ DefVar $UninstallProgram64$
DefVar $UninstallProgramOld64$ DefVar $UninstallProgramOld64$
DefVar $IniFile64$ DefVar $IniFile64$

1
sample/All/CLIENT_DATA/setup64.ins
View File

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

1
sample/All/CLIENT_DATA/uninstall32.ins
View File

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

2
sample/All/CLIENT_DATA/uninstall3264.ins
View File

@ -7,10 +7,12 @@
requiredWinstVersion >= "4.11.2.6" requiredWinstVersion >= "4.11.2.6"
DefVar $MsiIdOld32$ DefVar $MsiIdOld32$
DefVar $UninstallProg32$
DefVar $UninstallProgram32$ DefVar $UninstallProgram32$
DefVar $UninstallProgramOld32$ DefVar $UninstallProgramOld32$
DefVar $IniFile32$ DefVar $IniFile32$
DefVar $MsiIdOld64$ DefVar $MsiIdOld64$
DefVar $UninstallProg64$
DefVar $UninstallProgram64$ DefVar $UninstallProgram64$
DefVar $UninstallProgramOld64$ DefVar $UninstallProgramOld64$
DefVar $IniFile64$ DefVar $IniFile64$

1
sample/All/CLIENT_DATA/uninstall64.ins
View File

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