X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=70b8c26609f7e8aeafe3e2cc76f00796ea238de7;hb=d3ba4d04f6c5d22ba97ea81cdca2e2acd04dfec1;hp=f0f8dcaf91535608b281b69b8a5f398e52326899;hpb=0e60b30b93bfb259c0fb1b279619252aa64d37be;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index f0f8dcaf..70b8c266 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -2,12 +2,12 @@ DEFAULT_VERSION="5.5.2.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"