X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=version-gen.sh;h=620f46eaa80f45127a3aa1762a608ece9876d6e3;hp=f0f8dcaf91535608b281b69b8a5f398e52326899;hb=a4f7a5d80431df5aad83aa718d4e0583379d8681;hpb=3d7453f6c3a13dc49e9ed6dd6d7a19202a3b087e diff --git a/version-gen.sh b/version-gen.sh index f0f8dcaf..620f46ea 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.2.git" +DEFAULT_VERSION="5.8.0-RC0.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"