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

correct some templates and correct the overwrite support on all extractors

Browse Source
This commit is contained in:
Mario Fetka 2013-03-18 15:51:17 +01:00
parent 159c0f8660
commit 5ccde1ef58
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/builder-utils.sh
View File

@ -65,7 +65,7 @@ function process_file() {
elif [ "$format" = "unzip" ]; then elif [ "$format" = "unzip" ]; then
$CMD_unzip -o $src -d $dst $CMD_unzip -o $src -d $dst
elif [ "$format" = "unrar" ]; then elif [ "$format" = "unrar" ]; then
$CMD_unrar xy $src $dst $CMD_unrar x -y $src $dst
elif [ "$format" = "lha" ]; then elif [ "$format" = "lha" ]; then
$CMD_lha x -w=$dst $src $CMD_lha x -w=$dst $src
elif [ "$format" = "targz" ]; then elif [ "$format" = "targz" ]; then

2
sample/32bit/installer/license/CLIENT_DATA/delsub32.ins
View File

@ -4,7 +4,7 @@
; credits: http://www.opsi.org/en/credits/ ; credits: http://www.opsi.org/en/credits/
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
if FileExists($IniFile$) if FileExists($IniFile$)

2
sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins
View File

@ -4,7 +4,7 @@
; credits: http://www.opsi.org/en/credits/ ; credits: http://www.opsi.org/en/credits/
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
if FileExists($IniFile$) if FileExists($IniFile$)

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

@ -4,10 +4,10 @@
; credits: http://www.opsi.org/en/credits/ ; credits: http://www.opsi.org/en/credits/
Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" Set $UninstallProgram64$ = $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")
@ -19,7 +19,7 @@ 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 $UninstallProg32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe") Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe")
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
if FileExists($UninstallProgramOld32$) if FileExists($UninstallProgramOld32$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
@ -48,7 +48,7 @@ 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 $UninstallProgr64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe") Set $UninstallProgr64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$ Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
if FileExists($UninstallProgramOld64$) if FileExists($UninstallProgramOld64$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"

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

@ -4,10 +4,10 @@
; credits: http://www.opsi.org/en/credits/ ; credits: http://www.opsi.org/en/credits/
Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" Set $UninstallProgram64$ = $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")
@ -19,7 +19,7 @@ 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 $UninstallProg32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe") Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe")
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
if FileExists($UninstallProgramOld32$) if FileExists($UninstallProgramOld32$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
@ -48,7 +48,7 @@ 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 $UninstallProg64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe") Set $UninstallProg64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$ Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
if FileExists($UninstallProgramOld64$) if FileExists($UninstallProgramOld64$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"

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

@ -4,7 +4,7 @@
; credits: http://www.opsi.org/en/credits/ ; credits: http://www.opsi.org/en/credits/
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
if FileExists($IniFile$) if FileExists($IniFile$)

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

@ -4,7 +4,7 @@
; credits: http://www.opsi.org/en/credits/ ; credits: http://www.opsi.org/en/credits/
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
if FileExists($IniFile$) if FileExists($IniFile$)