Merge pull request #1219 from rubenk/version-gen

Some more version-gen.sh tweaks

diff --git a/version-gen.sh b/version-gen.sh
index b09be8e..a80e979 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -2,12 +2,10 @@
 
 DEFAULT_VERSION="5.5.0.git"
 
-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
+VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
 
 if test -z "$VERSION"; then
        VERSION="$DEFAULT_VERSION"
 fi
 
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
-
 printf "%s" "$VERSION"