From d73d055c6fc194ce7b383308ed283ef3100ab26f Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 9 Jun 2010 16:48:50 +1000 Subject: makepkg: use BUILDFILE rather than BUILDSCRIPT In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 4 ++-- 1 file 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 -- cgit v1.2.3-24-g4f1b