From: Simon Nagl <sin6332@thi.de>
Date: Tue, 7 Feb 2017 14:55:04 +0000 (+0100)
Subject: Fix packaging/check-files for sed version of macOS
X-Git-Tag: ab-debian_0.20170213.01-0ab1~1^2~22^2
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netdata.git;a=commitdiff_plain;h=e92ee6b1f637f44d8dad8bc748bf0ce8bb077c33

Fix packaging/check-files for sed version of macOS
---

diff --git a/.travis.yml b/.travis.yml
index b652f4db..8f8a3586 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,8 @@ before_install:
 # Run
 before_script:
  - gpg --import packaging/gpg.keys
- # Run the commit hooks in case the developer didn't (Does not work for osx)
- - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | ./packaging/check-files -; fi
+ # Run the commit hooks in case the developer didn't
+ - git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | ./packaging/check-files -
 script:
    # make release packages
  - fakeroot ./packaging/git-build
diff --git a/packaging/packaging.functions b/packaging/packaging.functions
index 4694772b..d74fbfea 100644
--- a/packaging/packaging.functions
+++ b/packaging/packaging.functions
@@ -102,8 +102,10 @@ get_changelog_version() {
 get_configure_ac_version() {
   get_staged_file configure.ac
   local v=`sed -n \
-         -e '/define(\[VERSION_\(MINOR\|FIX\)/s/.*\[\([^[]*\)\].*/.\1/p' \
-         -e '/define(\[VERSION_\(MAJOR\|SUFFIX\)/s/.*\[\([^[]*\)\].*/\1/p' \
+         -e '/define(\[VERSION_MAJOR/s/.*\[\([^[]*\)\].*/\1/p' \
+         -e '/define(\[VERSION_MINOR/s/.*\[\([^[]*\)\].*/.\1/p' \
+         -e '/define(\[VERSION_FIX/s/.*\[\([^[]*\)\].*/.\1/p' \
+         -e '/define(\[VERSION_SUFFIX/s/.*\[\([^[]*\)\].*/\1/p' \
          $MYTMP/files/configure.ac | tr -d '\n'`
   if [ ! "$v" ]; then v="No version in configure.ac!"; fi
   echo "$v"