X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=493a6ebfb26c71580c87c2d62a631c6af4228ea4;hb=8376bd27d4e094f62f54f046314b27a76d5af23d;hp=b09be8e78227f350edbe8fc6bf96634f67a0a057;hpb=0003c4d3c184f0f437499d6073cd023dc7b659c2;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index b09be8e7..493a6ebf 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -2,12 +2,12 @@ DEFAULT_VERSION="5.5.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"