Fix packaging/check-files for sed version of macOS
Simon Nagl committed
Feb 7, 2017 at 15:55 UTC
e92ee6b1f637f44d8dad8bc748bf0ce8bb077c33
2 files changed
+6
-4
.travis.yml
+2
-2
@@ -28,8 +28,8 @@ before_install:
28
# Run
29
before_script:
30
- gpg --import packaging/gpg.keys
31
- # Run the commit hooks in case the developer didn't (Does not work for osx)
32
- - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | ./packaging/check-files -; fi
31
+ # Run the commit hooks in case the developer didn't
32
+ - git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | ./packaging/check-files -
33
script:
34
# make release packages
35
- fakeroot ./packaging/git-build
packaging/packaging.functions
+4
-2
@@ -102,8 +102,10 @@ get_changelog_version() {
102
get_configure_ac_version() {
103
get_staged_file configure.ac
104
local v=`sed -n \
105
- -e '/define(\[VERSION_\(MINOR\|FIX\)/s/.*\[\([^[]*\)\].*/.\1/p' \
106
- -e '/define(\[VERSION_\(MAJOR\|SUFFIX\)/s/.*\[\([^[]*\)\].*/\1/p' \
105
+ -e '/define(\[VERSION_MAJOR/s/.*\[\([^[]*\)\].*/\1/p' \
106
+ -e '/define(\[VERSION_MINOR/s/.*\[\([^[]*\)\].*/.\1/p' \
107
+ -e '/define(\[VERSION_FIX/s/.*\[\([^[]*\)\].*/.\1/p' \
108
+ -e '/define(\[VERSION_SUFFIX/s/.*\[\([^[]*\)\].*/\1/p' \
109
$MYTMP/files/configure.ac | tr -d '\n'`
110
if [ ! "$v" ]; then v="No version in configure.ac!"; fi
111
echo "$v"