Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   ArchLinux Pacman Development (http://www.linux-archive.org/archlinux-pacman-development/)
-   -   contrib/bacman: fix package architecture in filename (http://www.linux-archive.org/archlinux-pacman-development/682413-contrib-bacman-fix-package-architecture-filename.html)

Allan McRae 07-11-2012 12:32 PM

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>
---
contrib/bacman.sh.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in
index ffb9d6d..7895a40 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%%$' '*}" >> .PKGINFO
;;
esac
-done
+done < <(cat "$pkg_dir"/{desc,files})

comp_files=".PKGINFO"

--
1.7.11.1


All times are GMT. The time now is 07:45 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.