From: Matthew Monaco
Use pushd/popd, quote args, handle some more errors
---
scripts/makepkg.sh.in | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 11de2b7..0169bbf 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1763,8 +1763,7 @@ devel_check() {
newpkgver=$(bzr revno ${_bzrtrunk})
;;
hg)
- if [[ -d ./src/$_hgrepo ]] ; then
- cd ./src/$_hgrepo
+ if pushd "./src/$_hgrepo" > /dev/null; then
local ret=0
hg pull || ret=$?
if (( ! ret )); then
@@ -1774,11 +1773,14 @@ devel_check() {
fi
else
[[ ! -d ./src/ ]] && mkdir ./src/
- hg clone $_hgroot/$_hgrepo ./src/$_hgrepo
- cd ./src/$_hgrepo
+ hg clone "$_hgroot/$_hgrepo" "./src/$_hgrepo"
+ if ! pushd "./src/$_hgrepo" > /dev/null; then
+ warning "$(gettext "An error occured while determining the hg version number.")"
+ return 0
+ fi
fi
newpkgver=$(hg tip --template "{rev}")
- cd ../../
+ popd > /dev/null
;;
esac
--
1.7.9.3