bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

contrib/bacman: fix package architecture in filename

Browse source 
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>
This commit is contained in:
Allan McRae 2012-07-11 11:10:56 +10:00 • committed by Dan McGee
parent 7520c0facb
commit 958b41fa5f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/bacman.in
View file

@ -4,7 +4,8 @@
# This script rebuilds an already installed package using metadata # This script rebuilds an already installed package using metadata
# stored into the pacman database and system files # 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 # 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 # 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 source ~/.makepkg.conf
fi fi
pkg_arch=${CARCH:-'unknown'}
pkg_dest="${PKGDEST:-$PWD}" pkg_dest="${PKGDEST:-$PWD}"
pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_pkger=${PACKAGER:-'Unknown Packager'}
@ -184,7 +184,6 @@ fi
echo "# $(LC_ALL=C date)" >> .PKGINFO echo "# $(LC_ALL=C date)" >> .PKGINFO
echo "#" >> .PKGINFO echo "#" >> .PKGINFO
cat "$pkg_dir"/{desc,files} |
while read i; do while read i; do
if [[ -z $i ]]; then if [[ -z $i ]]; then
continue; continue;
@ -214,6 +213,7 @@ while read i; do
;; ;;
%ARCH%) %ARCH%)
echo "arch = $i" >> .PKGINFO echo "arch = $i" >> .PKGINFO
pkg_arch="$i"
;; ;;
%BUILDDATE%) %BUILDDATE%)
echo "builddate = $(date -u "+%s")" >> .PKGINFO echo "builddate = $(date -u "+%s")" >> .PKGINFO
@ -249,7 +249,7 @@ while read i; do
echo "backup = ${i%%$'\t'*}" >> .PKGINFO echo "backup = ${i%%$'\t'*}" >> .PKGINFO
;; ;;
esac esac
done done < <(cat "$pkg_dir"/{desc,files})
comp_files=".PKGINFO" comp_files=".PKGINFO"