diff options
| author | Allan McRae <allan@archlinux.org> | 2008-12-26 17:49:49 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-01-02 22:46:37 -0600 |
| commit | 751d37e749fcb0a06bb21dee4b5b6d0b062ed284 (patch) | |
| tree | 114ec0e6c21f0d5bea4c30ab284ad1731247cbd2 | |
| parent | 08980fb4bcf4078b4b22b2c1f6f36cbbdee89ec4 (diff) | |
| download | pacman-751d37e749fcb0a06bb21dee4b5b6d0b062ed284.tar.xz | |
makepkg: quote all uses of BUILDSCRIPT
Allows specifying alternative build script with spaces in name
Signed-off-by: Allan McRae <allan@archlinux.org>
[Dan: backport some of the fixes to maint]
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a6dcb2f..06595094 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1094,9 +1094,9 @@ devel_update() { # if [ "$newpkgver" != "" ]; then if [ "$newpkgver" != "$pkgver" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT - source $BUILDSCRIPT + sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + source "$BUILDSCRIPT" fi fi } @@ -1360,7 +1360,7 @@ if [ "$CLEANCACHE" = "1" ]; then fi fi -if [ -z $BUILDSCRIPT ]; then +if [ -z "$BUILDSCRIPT" ]; then error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$confdir/makepkg.conf" exit 1 fi |