X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tag-release;h=a1e916ff875d7928b20c1c3038fe097b2dbfd95b;hb=7b792bea7a644309623d67b5d49528ae13da3e7b;hp=6038e5a8d60df89a9f329c14497145ee7c19dda1;hpb=a89b5ad4b9121bbfa033d87852692a3c8a922e58;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/tag-release b/tag-release
index 6038e5a8..a1e916ff 100755
--- a/tag-release
+++ b/tag-release
@@ -5,23 +5,36 @@ if [ -z $1 ]; then
 	exit
 fi
 
+abort() {
+	echo $1
+	exit 1
+}
+
 FULLVERSION=$1
 VERSION=${FULLVERSION/-*/}
 
 echo "Full version: $FULLVERSION"
 echo "Version: $VERSION"
 
-sed -ine "/^\$version =/ c \$version = '$FULLVERSION'" launch_here.rb   
-sed -ine "/^\$version ||=/ c \$version ||= '$FULLVERSION'" bin/rbot
-sed -ine "/^  s.version =/ c \  s.version = '$VERSION'" Rakefile   
+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'" rbot.gemspec
+sed -i -e "/^  <!ENTITY dhpackageversion / c \  <!ENTITY dhpackageversion \"$VERSION\">" man/*.xml
 
-git commit -m "Version $FULLVERSION" -a
-git tag -a -m "rbot $FULLVERSION" rbot-$FULLVERSION
-rake package
-if [ $VERSION != $FULLVERSION ]; then
-	pushd pkg
-	mv rbot-$VERSION.gem rbot-$FULLVERSION.gem
-	mv rbot-$VERSION.tgz rbot-$FULLVERSION.tgz
-	mv rbot-$VERSION.zip rbot-$FULLVERSION.zip
-	popd
+NOGIT=${FULLVERSION/-git/}
+if [ $NOGIT == $FULLVERSION ]; then
+	# Not a git version
+	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
+		mv rbot-$VERSION.tgz rbot-$FULLVERSION.tgz
+		mv rbot-$VERSION.zip rbot-$FULLVERSION.zip
+		popd
+	fi
+else
+	# git version
+	git commit -m "Start working on $NOGIT" -a
 fi