From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 10 Mar 2014 09:48:31 +0000 (+0100)
Subject: Fix versioning, tag feature.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=102fe186855b057eefa5e1066a5df53c2c34a156;p=rOCCI-packaging.git

Fix versioning, tag feature.
---

diff --git a/rocci-server/gen-rocci-server.sh b/rocci-server/gen-rocci-server.sh
index d2ce213..3d5c557 100755
--- a/rocci-server/gen-rocci-server.sh
+++ b/rocci-server/gen-rocci-server.sh
@@ -16,9 +16,14 @@ test -n "$NO_DPKG" && exit 0
 
 cd rOCCI-server
 
+tag=${tag:-}
 uver=`grep "\<VERSION =" config/version.rb | sed "s/.*VERSION\s*=\s*[\"']\(.*\)[\"'].*/\1/" | sed "s/.\(alpha\|beta\|rc\)/~\1/"`
-dver=`date "+%y%m%d"`
-ver="$uver~$dver"
+dver=`date "+%Y%m%d"`
+if [ -z "$tag" ]; then
+	ver="$uver+$dver"
+else
+	ver="$uver"
+fi
 age=${age:-"1"}
 maint="František Dvořák <valtri@civ.zcu.cz>"