summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-08-01 09:21:33 -0500
committerDan McGee <dan@archlinux.org>2012-08-01 09:21:33 -0500
commit7193ce1ecd0089545d100fd11647cb346d15331b (patch)
treeba0135e4a166e82219a2c709fdd34ab74e7bbfbd /contrib
parent647b9ea6d9e7ff084d3c59c1005aac2670bd469f (diff)
parentb782388f1670d9ff819461cfa7e365f7e8178173 (diff)
downloadpacman-7193ce1ecd0089545d100fd11647cb346d15331b.tar.xz
Merge branch 'maint'
Diffstat (limited to 'contrib')
-rw-r--r--contrib/bacman.sh.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in
index ffb9d6d3..7895a40c 100644
--- a/contrib/bacman.sh.in
+++ b/contrib/bacman.sh.in
@@ -4,7 +4,8 @@
# This script rebuilds an already installed package using metadata
# stored into the pacman database and system files
#
-# (c) 2008 - locci <carlocci_at_gmail_dot_com>
+# Copyright (c) 2008 locci <carlocci_at_gmail_dot_com>
+# Copyright (c) 2008-2012 Pacman Development Team <pacman-dev@archlinux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -90,7 +91,6 @@ if [[ -r ~/.makepkg.conf ]]; then
source ~/.makepkg.conf
fi
-pkg_arch=${CARCH:-'unknown'}
pkg_dest="${PKGDEST:-$PWD}"
pkg_pkger=${PACKAGER:-'Unknown Packager'}
@@ -186,7 +186,6 @@ fi
echo "# $(LC_ALL=C date)" >> .PKGINFO
echo "#" >> .PKGINFO
-cat "$pkg_dir"/{desc,files} |
while read i; do
if [[ -z $i ]]; then
continue;
@@ -216,6 +215,7 @@ while read i; do
;;
%ARCH%)
echo "arch = $i" >> .PKGINFO
+ pkg_arch="$i"
;;
%BUILDDATE%)
echo "builddate = $(date -u "+%s")" >> .PKGINFO
@@ -251,7 +251,7 @@ while read i; do
echo "backup = ${i%%$'\t'*}" >> .PKGINFO
;;
esac
-done
+done < <(cat "$pkg_dir"/{desc,files})
comp_files=".PKGINFO"