Fix packaging/check-files for sed version of macOS

diff --git a/.travis.yml b/.travis.yml
index b652f4dbf87638990a2060f89eed364a8f31a550..8f8a3586bf7666baf9bc9344657dd16f89ea50c6 100644 (file)
--- 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 4694772b278da680d82fc276b5b707aec428b362..d74fbfeac2597ae3908655c1e36990157028c1fb 100644 (file)
--- 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"