Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2009-07-01 13:52:52 +1000
committerAllan McRae <allan@archlinux.org>2009-07-10 16:29:57 +1000
commit617e7d512ff6fb7d6c5e5232091b528148cc40c7 (patch)
tree5e9961f634a9d61b319b04b576c479a1d7431a99 /scripts
parentc72b4543b69f5a80d254a3f408748e19db758947 (diff)
makepkg: clean up moving PKGINFO creation to a function
Someone forgot to commit this when pulling in the original patch to his working branch... Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index d52398c0..34e156ae 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -881,14 +881,13 @@ write_pkginfo() {
fi
local size=$(du -sk | awk '{print $1 * 1024}')
- # write the .PKGINFO file
msg2 "$(gettext "Generating .PKGINFO file...")"
echo "# Generated by makepkg $myver" >.PKGINFO
if [ "$INFAKEROOT" -eq 1 ]; then
echo "# using $(fakeroot -v)" >>.PKGINFO
fi
echo "# $(LC_ALL=C date -u)" >>.PKGINFO
- echo "pkgname = $nameofpkg" >>.PKGINFO
+ echo "pkgname = $1" >>.PKGINFO
echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO
echo "pkgdesc = $pkgdesc" >>.PKGINFO
echo "url = $url" >>.PKGINFO