X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=d7c6a7655e28fd5e311a08a2911ddd4ddb1a773a;hb=42ca41a0798e3a2b742f7da3bacc03fbaf6175fa;hp=e0ad124e237e063416099a588ada8fc4158e7d44;hpb=c21ce3b44f63d706b8b200a88047db74f1a51392;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index e0ad124e..d7c6a765 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -2,12 +2,12 @@ DEFAULT_VERSION="5.5.1.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"