X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=d7c6a7655e28fd5e311a08a2911ddd4ddb1a773a;hb=edd9af8a874ebc9f2a7f02846807229a648917db;hp=40c11441abb2e5d702f2abd8f1911e84274d5385;hpb=a2c0ff89b4792142dff02ee46bc5a578a5e6063e;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index 40c11441..d7c6a765 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.3.1.git" +DEFAULT_VERSION="5.5.1.git" -VERSION="`git describe 2> /dev/null | 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"