moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

makepkg: fix sourcing BUILDSCRIPT and PATH issues

Browse Source 
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>
This commit is contained in:
Allan McRae 2009-05-16 13:48:10 +10:00
parent 5e32928a42
commit 250e66e57b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/makepkg.sh.in
View File

@ -1527,6 +1527,7 @@ if [ ! -f "$BUILDSCRIPT" ]; then
else else
# PKGBUILD passed through a pipe # PKGBUILD passed through a pipe
BUILDSCRIPT=/dev/stdin BUILDSCRIPT=/dev/stdin
source "$BUILDSCRIPT"
fi fi
else else
crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true) crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true)
@ -1534,9 +1535,9 @@ else
error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT" error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT"
exit 1 exit 1
fi fi
fi
source "$BUILDSCRIPT" source ./"$BUILDSCRIPT"
fi
if [ "$GENINTEG" -eq 1 ]; then if [ "$GENINTEG" -eq 1 ]; then
mkdir -p "$srcdir" mkdir -p "$srcdir"