git://scientific.zcu.cz
/
rOCCI-packaging.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
caaa52c
)
Fix versioning, tag feature.
author
František Dvořák
<valtri@civ.zcu.cz>
Mon, 10 Mar 2014 09:48:31 +0000
(10:48 +0100)
committer
František Dvořák
<valtri@civ.zcu.cz>
Mon, 10 Mar 2014 09:48:31 +0000
(10:48 +0100)
rocci-server/gen-rocci-server.sh
patch
|
blob
|
blame
|
history
diff --git
a/rocci-server/gen-rocci-server.sh
b/rocci-server/gen-rocci-server.sh
index
d2ce213
..
3d5c557
100755
(executable)
--- 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>"