X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=bdbb847a7c79d99da4edc82b33fb61f658660255;hb=f70935ddfb05b03de6e6dff95d842cb7c553e8b9;hp=f0f8dcaf91535608b281b69b8a5f398e52326899;hpb=9d3906a53e086d520b5ed71ca57118e8f589574b;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index f0f8dcaf..bdbb847a 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.2.git" +DEFAULT_VERSION="5.7.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"