From: Dagobert Michelsen <dam@opencsw.org>
Date: Thu, 27 Feb 2020 21:05:50 +0000 (+0100)
Subject: Merge pull request #2635 from wrp/grep
X-Git-Tag: collectd-5.11.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=938e9d743b3f531d6ffcd65f74bce1c76d726526;p=thirdparty%2Fcollectd.git

Merge pull request #2635 from wrp/grep

Cleanup version-gen.sh
---

938e9d743b3f531d6ffcd65f74bce1c76d726526
diff --cc version-gen.sh
index 76bd065a1,710795f48..962eddc86
--- a/version-gen.sh
+++ b/version-gen.sh
@@@ -1,9 -1,9 +1,9 @@@
  #!/bin/sh
  
 -DEFAULT_VERSION="5.8.0.git"
 +DEFAULT_VERSION="5.9.2.git"
  
  if [ -d .git ]; then
- 	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
+ 	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"
  fi
  
  if test -z "$VERSION"; then