summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2009-05-16 05:48:10 +0200
committerAllan McRae <allan@archlinux.org>2009-05-16 05:48:10 +0200
commit250e66e57b6a187b5643ea6db088552e4efef488 (patch)
tree9f5ce51dda82aeb27149894499ea1ccc59be4750
parent5e32928a42366fd3df27ffe108b44fcfe35617dd (diff)
downloadpacman-250e66e57b6a187b5643ea6db088552e4efef488.tar.gz
pacman-250e66e57b6a187b5643ea6db088552e4efef488.tar.xz
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 <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in5
1 files 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"