]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge pull request #2635 from wrp/grep
authorDagobert Michelsen <dam@opencsw.org>
Thu, 27 Feb 2020 21:05:50 +0000 (22:05 +0100)
committerGitHub <noreply@github.com>
Thu, 27 Feb 2020 21:05:50 +0000 (22:05 +0100)
Cleanup version-gen.sh

1  2 
version-gen.sh

diff --cc version-gen.sh
index 76bd065a10785e46e6f70a020f264ebf8d47daae,710795f4879fe4c24d32111d8541a4d02897f327..962eddc866043fe78a2afc25e3f4a47e91e02eef
@@@ -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