bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: quote all uses of BUILDSCRIPT

Browse source 
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>
This commit is contained in:
Allan McRae 2008-12-26 17:49:49 +10:00 • committed by Dan McGee
parent 08980fb4bc
commit 751d37e749
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/makepkg.sh.in
View file

@ -1094,9 +1094,9 @@ devel_update() {
# #
if [ "$newpkgver" != "" ]; then if [ "$newpkgver" != "" ]; then
if [ "$newpkgver" != "$pkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then
sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT"
sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT"
source $BUILDSCRIPT source "$BUILDSCRIPT"
fi fi
fi fi
} }
@ -1360,7 +1360,7 @@ if [ "$CLEANCACHE" = "1" ]; then
fi fi
fi fi
if [ -z $BUILDSCRIPT ]; then if [ -z "$BUILDSCRIPT" ]; then
error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$confdir/makepkg.conf" error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$confdir/makepkg.conf"
exit 1 exit 1
fi fi