From 250e66e57b6a187b5643ea6db088552e4efef488 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 16 May 2009 13:48:10 +1000 Subject: makepkg: fix sourcing BUILDSCRIPT and PATH issues The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fefcc73a..f94f925e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1527,6 +1527,7 @@ if [ ! -f "$BUILDSCRIPT" ]; then else # PKGBUILD passed through a pipe BUILDSCRIPT=/dev/stdin + source "$BUILDSCRIPT" fi else crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true) @@ -1534,9 +1535,9 @@ else error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT" exit 1 fi -fi -source "$BUILDSCRIPT" + source ./"$BUILDSCRIPT" +fi if [ "$GENINTEG" -eq 1 ]; then mkdir -p "$srcdir" -- cgit v1.2.3