Merge branch 'collectd-5.4'

[collectd.git] / version-gen.sh

diff --git a/version-gen.sh b/version-gen.sh
index 0b75fc2..e251950 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-DEFAULT_VERSION="4.10.9.git"
+DEFAULT_VERSION="5.4.2.git"
 
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
 
 if test -z "$VERSION"; then
        VERSION="$DEFAULT_VERSION"
@@ -10,8 +10,4 @@ fi
 
 VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
 
-if test "x`uname -s`" = "xAIX" || test "x`uname -s`" = "xSunOS" ; then
-       echo "$VERSION\c"
-else 
-       echo -n "$VERSION"
-fi
+echo -n "$VERSION"