On 17/06/10 22:44, Andres P wrote:
Combine changelog and install file creation as in previous commits.
Signed-off-by: Andres P<aepd87@gmail.com> --- scripts/makepkg.sh.in | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0bfb607..37241bd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -996,21 +996,17 @@ create_package() {
local comp_files=".PKGINFO"
- # check for an install script - if [[ -n $install ]]; then - msg2 "$(gettext "Adding install script...")" - cp "$startdir/$install" .INSTALL - chmod 644 .INSTALL - comp_files="$comp_files .INSTALL" - fi - - # do we have a changelog? - if [[ -n $changelog ]]; then - msg2 "$(gettext "Adding package changelog...")" - cp "$startdir/$changelog" .CHANGELOG - chmod 644 .CHANGELOG - comp_files="$comp_files .CHANGELOG" - fi + # check for changelog/install files + for i in 'changelog' 'install'; do + orig="${!i}" + dest=".${i^^}"
That is a bash4 command so will break cygwin compatibility (which currently has bash-3.2). Resubmit with something like "tr [:lower:] [:upper:]" usage. (I know the ${i^^} is used elsewhere, but that slipped passed my notice and will be being reverted.
+ if [[ -n $orig ]]; then + msg2 "$(gettext "Adding %s file...")" "$i" + cp "$startdir/$orig" "$dest" + chmod 644 "$dest" + comp_files+=" $dest" + fi + done
# tar it up msg2 "$(gettext "Compressing package...")"