From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Tue, 29 Jul 2008 20:12:04 +0000 (+0200)
Subject: Some enhancements to tag-release
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=3e3ae3b4ce4d35d2796d2e73206da31f8bde1655;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

Some enhancements to tag-release
---

diff --git a/tag-release b/tag-release
index 6038e5a8..497ce73c 100755
--- a/tag-release
+++ b/tag-release
@@ -11,17 +11,24 @@ 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'" Rakefile
 
-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
+	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
+	fi
+else
+	# git version
+	git commit -m "Start working on $NOGIT" -a
 fi