Merge branch 'maint'

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"