summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-07-11 03:10:56 +0200
committerDan McGee <dan@archlinux.org>2012-08-01 16:02:30 +0200
commit958b41fa5fcbb6ac806bd969d6333019ba3c6441 (patch)
tree143ce842861d027b16dbfc6e3d1d1717088b3ee9
parent7520c0facb23887fe93057736834061c6dedfdec (diff)
downloadpacman-958b41fa5fcbb6ac806bd969d6333019ba3c6441.tar.gz
pacman-958b41fa5fcbb6ac806bd969d6333019ba3c6441.tar.xz
contrib/bacman: fix package architecture in filename
Give the generated package the correct architecture in its filename rather than assuming the system architecture. Also add updated copyright notice. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rwxr-xr-xcontrib/bacman.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/bacman.in b/contrib/bacman.in
index c55d7161..f7e3202f 100755
--- a/contrib/bacman.in
+++ b/contrib/bacman.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
@@ -88,7 +89,6 @@ if [[ -r ~/.makepkg.conf ]]; then
source ~/.makepkg.conf
fi
-pkg_arch=${CARCH:-'unknown'}
pkg_dest="${PKGDEST:-$PWD}"
pkg_pkger=${PACKAGER:-'Unknown Packager'}
@@ -184,7 +184,6 @@ fi
echo "# $(LC_ALL=C date)" >> .PKGINFO
echo "#" >> .PKGINFO
-cat "$pkg_dir"/{desc,files} |
while read i; do
if [[ -z $i ]]; then
continue;
@@ -214,6 +213,7 @@ while read i; do
;;
%ARCH%)
echo "arch = $i" >> .PKGINFO
+ pkg_arch="$i"
;;
%BUILDDATE%)
echo "builddate = $(date -u "+%s")" >> .PKGINFO
@@ -249,7 +249,7 @@ while read i; do
echo "backup = ${i%%$'\t'*}" >> .PKGINFO
;;
esac
-done
+done < <(cat "$pkg_dir"/{desc,files})
comp_files=".PKGINFO"