X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=bdbb847a7c79d99da4edc82b33fb61f658660255;hb=d3e97e2e0c710c1bbe0cac873bd1c5df004bc740;hp=08c6fef99e41837546bac7533970b2634a8e57dc;hpb=bcce965ce14211d3dc66b12e0e61a6c8e566fc52;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index 08c6fef9..bdbb847a 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.0.git" +DEFAULT_VERSION="5.7.1.git" -VERSION="`git describe --dirty=+ 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"