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

makepkg: devel_check(): cleanup for hg version

Browse source 
Use pushd/popd, quote args, handle some more errors
This commit is contained in:
Matthew Monaco 2012-03-12 19:14:22 -06:00 • committed by Dan McGee
parent 0fd477238f
commit bb71d254e2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/makepkg.sh.in
View file

@ -1761,8 +1761,7 @@ devel_check() {
newpkgver=$(bzr revno ${_bzrtrunk}) newpkgver=$(bzr revno ${_bzrtrunk})
;; ;;
hg) hg)
if [[ -d ./src/$_hgrepo ]] ; then if pushd "./src/$_hgrepo" > /dev/null; then
cd ./src/$_hgrepo
local ret=0 local ret=0
hg pull || ret=$? hg pull || ret=$?
if (( ! ret )); then if (( ! ret )); then
@ -1772,11 +1771,14 @@ devel_check() {
fi fi
else else
[[ ! -d ./src/ ]] && mkdir ./src/ [[ ! -d ./src/ ]] && mkdir ./src/
hg clone $_hgroot/$_hgrepo ./src/$_hgrepo hg clone "$_hgroot/$_hgrepo" "./src/$_hgrepo"
cd ./src/$_hgrepo if ! pushd "./src/$_hgrepo" > /dev/null; then
warning "$(gettext "An error occured while determining the hg version number.")"
return 0
fi
fi fi
newpkgver=$(hg tip --template "{rev}") newpkgver=$(hg tip --template "{rev}")
cd ../../ popd > /dev/null
;; ;;
esac esac