test: fix shadowed test method

[user/henk/code/ruby/rbot.git] / tag-release

diff --git a/tag-release b/tag-release
index 497ce73cf5ae2eda117b69adcd8e57d3de71722c..a1e916ff875d7928b20c1c3038fe097b2dbfd95b 100755 (executable)
--- a/tag-release
+++ b/tag-release
@@ -5,6 +5,11 @@ if [ -z $1 ]; then
        exit
 fi
 
+abort() {
+       echo $1
+       exit 1
+}
+
 FULLVERSION=$1
 VERSION=${FULLVERSION/-*/}
 
@@ -13,14 +18,15 @@ echo "Version: $VERSION"
 
 sed -i -e "/^\$version =/ c \$version = '$FULLVERSION'" launch_here.rb
 sed -i -e "/^\$version ||=/ c \$version ||= '$FULLVERSION'" bin/rbot
-sed -i -e "/^  s.version =/ c \  s.version = '$VERSION'" Rakefile
+sed -i -e "/^  s.version =/ c \  s.version = '$VERSION'" rbot.gemspec
+sed -i -e "/^  <!ENTITY dhpackageversion / c \  <!ENTITY dhpackageversion \"$VERSION\">" man/*.xml
 
 NOGIT=${FULLVERSION/-git/}
 if [ $NOGIT == $FULLVERSION ]; then
        # Not a git version
-       git commit -m "Version $FULLVERSION" -a
-       git tag -a -m "rbot $FULLVERSION" rbot-$FULLVERSION
-       rake package
+       rake package || abort "Failed to build package!"
+       git commit -m "Version $FULLVERSION" -a || abort "Failed to commit release!"
+       git tag -a -m "rbot $FULLVERSION" rbot-$FULLVERSION || abort "Failed to tag release!"
        if [ $VERSION != $FULLVERSION ]; then
                pushd pkg
                mv rbot-$VERSION.gem rbot-$FULLVERSION.gem