diff options
| author | Allan McRae <allan@archlinux.org> | 2013-05-18 14:47:35 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-05-29 06:08:02 +0200 |
| commit | 28dd29dedbc0a0e7fe1514043944b35aec8d2949 (patch) | |
| tree | 8f65362f600c7c25d459c3ae2010e0149acd2f97 | |
| parent | 296e630edd129989856b1ebfaa7e8497a90bc937 (diff) | |
| download | pacman-28dd29dedbc0a0e7fe1514043944b35aec8d2949.tar.gz pacman-28dd29dedbc0a0e7fe1514043944b35aec8d2949.tar.xz | |
makepkg: remove sourcing PKGBUILD from stdin
Using PKGBUILDs from stdin means that we can not use pkgver() in
packages. Given we have the "-p" option to pass any file to
makepkg and passing a PKGBUILD in the form "cat foo | makepkg"
does not work, this feature is unneeded.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a59e13e5..fca6f43a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2760,14 +2760,8 @@ unset makedepends optdepends options noextract BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} if [[ ! -f $BUILDFILE ]]; then - if [[ -t 0 ]]; then - error "$(gettext "%s does not exist.")" "$BUILDFILE" - exit 1 - else - # PKGBUILD passed through a pipe - BUILDFILE=/dev/stdin - source_safe "$BUILDFILE" - fi + error "$(gettext "%s does not exist.")" "$BUILDFILE" + exit 1 else if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" |