diff options
| author | Dan McGee <dan@archlinux.org> | 2009-05-18 22:51:25 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-05-18 22:51:25 -0500 |
| commit | 4a582fac2a24b6fca170721ec7adcca9239457ff (patch) | |
| tree | 5489c280ed11c19b140ebf5e5c62bc8589c9d7a2 /scripts | |
| parent | 86cd72573b03297044112e50a88bd651190aa284 (diff) | |
| parent | 80caeabce0f28125f3b68388996ce39e58f2e5e8 (diff) | |
| download | pacman-4a582fac2a24b6fca170721ec7adcca9239457ff.tar.xz | |
Merge commit 'allan/working'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d978107f..f94f925e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1100,14 +1100,13 @@ install_package() { devel_check() { newpkgver="" - # Only update pkgver if --holdver is not set - if [ "$HOLDVER" -eq 1 ]; then - return - fi - # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe - if [ ! -f "./$BUILDSCRIPT" ]; then + + # Do not update pkgver if --holdver is set, when building a source package, + # or when reading PKGBUILD from pipe + if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "./$BUILDSCRIPT" ]; then return fi + if [ -z "$FORCE_VER" ]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent @@ -1309,7 +1308,7 @@ usage() { printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 - echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" + echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" @@ -1528,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) @@ -1535,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" |