X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=2ef5279f16931064e169daa8bdccaab10e8c5b07;hb=04f27bdd38966e0b826b283d8790ce31fb467929;hp=b09be8e78227f350edbe8fc6bf96634f67a0a057;hpb=21a4ddcc2d66eea59224fd95746c7533b1b1a46d;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index b09be8e7..2ef5279f 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.0.git" +DEFAULT_VERSION="5.6.0.git" -VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" +if [ -d .git ]; then + VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`" +fi if test -z "$VERSION"; then VERSION="$DEFAULT_VERSION" fi -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" - printf "%s" "$VERSION"