NOW: update source generator script

diff --git a/NOW/gen.sh b/NOW/gen.sh
index 919edd9..cd431f7 100755 (executable)
--- a/NOW/gen.sh
+++ b/NOW/gen.sh
@@ -1,4 +1,6 @@
-#! /bin/sh -xe
+#! /bin/bash -xe
+
+# release=0. ./gen.sh -S -d
 
 if [ -d NOW ]; then
        echo "NOW directory already exists"
@@ -6,16 +8,21 @@ else
        git clone https://github.com/CESNET/NOW/
 fi
 
-tag=`cd NOW; git rev-parse HEAD`
-short=`echo ${tag} | cut -c 1-7`
-v=`cd NOW; ruby -r./version.rb -e 'print Now::VERSION'`
-rel=1~`cd NOW; git show --format='format:%ai' HEAD | head -n 1 | cut -f1 -d' ' | sed 's/-//g'`
+commit=`cd NOW; git rev-parse HEAD`
+datecommit=`cd NOW; git log -n1 --format='%ai' HEAD`
+short=`echo ${commit} | cut -c 1-7`
+version=`cd NOW; ruby -r./version.rb -e 'print Now::VERSION'`
+release=${release:-'0.'}
+if echo "${release}" | grep -q '\.$'; then
+       release=${release}~`date --utc --date="${datecommit}" '+%Y%m%d'`git${short}
+fi
 
 rm -rf NOW/debian/
-tar --exclude .git -cf - NOW/ | pbzip2 > now_${v}.orig.tar.bz2
+tar --exclude .git -cf - NOW/ | pbzip2 > now_${version}.orig.tar.bz2
 cp -a debian/ NOW/
 
 cd NOW/
-sed -e "1s/(.*)/(${v}-${rel})/" debian/changelog
+dch "${comment}" -v "${version}-${release}"
+dch '' -r --urgency 'low'
 
 dpkg-buildpackage "$@"