From 5ccde1ef5827fb35bc3d3968db0f48df072e0153 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 18 Mar 2013 15:51:17 +0100 Subject: [PATCH] correct some templates and correct the overwrite support on all extractors --- lib/builder-utils.sh | 2 +- sample/32bit/installer/license/CLIENT_DATA/delsub32.ins | 2 +- sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins | 2 +- .../32bit64/installer/license/CLIENT_DATA/delsub3264.ins | 8 ++++---- .../installer/nolicense/CLIENT_DATA/delsub3264.ins | 8 ++++---- sample/64bit/installer/license/CLIENT_DATA/delsub64.ins | 2 +- sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/builder-utils.sh b/lib/builder-utils.sh index 01a7f0a..9ffcb66 100644 --- a/lib/builder-utils.sh +++ b/lib/builder-utils.sh @@ -65,7 +65,7 @@ function process_file() { elif [ "$format" = "unzip" ]; then $CMD_unzip -o $src -d $dst elif [ "$format" = "unrar" ]; then - $CMD_unrar xy $src $dst + $CMD_unrar x -y $src $dst elif [ "$format" = "lha" ]; then $CMD_lha x -w=$dst $src elif [ "$format" = "targz" ]; then diff --git a/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins b/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins index 8fa5926..b83987c 100644 --- a/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$) diff --git a/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins b/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins index 8fa5926..b83987c 100644 --- a/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$) diff --git a/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins b/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins index 4b30338..036ddbf 100644 --- a/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins @@ -4,10 +4,10 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" +Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" -Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" +Set $UninstallProgram64$ = $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") @@ -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..." if FileExists($IniFile32$) - Set $UninstallProg32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe") + Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe") Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ if FileExists($UninstallProgramOld32$) 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..." 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$ if FileExists($UninstallProgramOld64$) comment "Uninstall program found, starting uninstall" diff --git a/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins b/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins index 20104e4..6fb74cf 100644 --- a/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins @@ -4,10 +4,10 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" +Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" -Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" +Set $UninstallProgram64$ = $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") @@ -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..." if FileExists($IniFile32$) - Set $UninstallProg32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe") + Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe") Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ if FileExists($UninstallProgramOld32$) 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..." 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$ if FileExists($UninstallProgramOld64$) comment "Uninstall program found, starting uninstall" diff --git a/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins b/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins index 982775d..8091e14 100644 --- a/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$) diff --git a/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins b/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins index 982775d..8091e14 100644 --- a/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$)