summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-06-09 16:48:50 +1000
committerAllan McRae <allan@archlinux.org>2010-06-09 16:52:49 +1000
commitd73d055c6fc194ce7b383308ed283ef3100ab26f (patch)
tree41f7b5b66b92383e143d02861d1ac3694ff6f21f
parentb8863622828287fc0ba204ce7270176753df6bd2 (diff)
downloadpacman-d73d055c6fc194ce7b383308ed283ef3100ab26f.tar.xz
makepkg: use BUILDFILE rather than BUILDSCRIPT
In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 7785ff19..d9867016 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1237,7 +1237,7 @@ check_sanity() {
local i
for i in 'changelog' 'install'; do
- local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT")
+ local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE")
local file
for file in $filelist; do
# evaluate any bash variables used
@@ -1280,7 +1280,7 @@ check_sanity() {
if [[ -n "${PKGLIST[@]}" ]]; then
for pkg in ${PKGLIST[@]}; do
if ! in_array $pkg ${pkgname[@]}; then
- error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDSCRIPT"
+ error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDFILE"
return 1
fi
done