summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Swain <robert.swain@collabora.co.uk>2010-03-12 13:33:00 +0000
committerRobert Swain <robert.swain@collabora.co.uk>2010-03-12 13:33:00 +0000
commitcc05668e9d36d8bedcdcffa6ffea3d4c8db25b0c (patch)
tree35a095348d6e1fe600db25277fd88a29820ebee8
parent374b4b343f754917d4c35b693215410502eb36c0 (diff)
git-update: Fix error return value and make the script exit on errors
Newer versions of BASH (4.x?) seem to dislike using -1 for a return. Even though it's documented as being signed, BASH complains about it, so use 255 instead.
-rwxr-xr-xscripts/git-update.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/git-update.sh b/scripts/git-update.sh
index cdea09e12c..6bfae3459d 100755
--- a/scripts/git-update.sh
+++ b/scripts/git-update.sh
@@ -26,6 +26,7 @@ tmp=$tmp/git-update.$(date +%Y%m%d-%H%M-).$RANDOM.$RANDOM.$RANDOM.$$
ERROR_LOG="$tmp/failures.log"
touch $ERROR_LOG
+ERROR_RETURN=255
for m in $CORE $MODULES; do
if test -d $m; then
@@ -70,7 +71,7 @@ build()
then
echo "$1: autoregen.sh [$tmp/$1-regen.log]" >> $ERROR_LOG
cd ..
- return -1
+ return $ERROR_RETURN
fi
echo "+ $1: autoregen.sh done"
fi
@@ -81,7 +82,7 @@ build()
then
echo "$1: make [$tmp/$1-make.log]" >> $ERROR_LOG
cd ..
- return -1
+ return $ERROR_RETURN
fi
echo "+ $1: make done"
@@ -109,13 +110,14 @@ if test -e $ERROR_LOG; then
else
rm -rf "$tmp"
fi
+exit
}
# build core and base plugins sequentially
# exit if build fails (excluding checks)
for m in $CORE; do
build $m
- if [ $? == -1 ]; then
+ if [ $? -eq $ERROR_RETURN ]; then
beach
fi
done