From 9419972198cf3fac84b6a252ab8f47a7cc9ebce3 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sat, 1 Oct 2016 18:39:48 +1300 Subject: [PATCH] Don't replace tar with GNU tar --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b4b48ce..d1ed4a85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,13 @@ before_install: - test "$TRAVIS_OS_NAME" != linux || sudo apt-get -qq install libwxgtk3.0-dev libavcodec-dev libavformat-dev libproj-dev libswscale-dev mesa-common-dev libglu1-mesa-dev libx11-dev libxext-dev x11proto-core-dev liblocale-po-perl unifont sgmltools-lite jadetex docbook-utils w3m - test "$TRAVIS_OS_NAME" != osx || brew update - test "$TRAVIS_OS_NAME" != osx || brew install netpbm - - test "$TRAVIS_OS_NAME" != osx || brew install gnu-tar --with-default-names + - test "$TRAVIS_OS_NAME" != osx || brew install gnu-tar - test "$TRAVIS_OS_NAME" != osx || sudo cpan -T -i local::lib < /dev/null - test "$TRAVIS_OS_NAME" != osx || sudo cpan -I -T -i Locale::PO < /dev/null - if test "$TRAVIS_OS_NAME" = osx ; then echo '[ $SHLVL -eq 1 ] && eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"' >> ~/.bashrc ; fi script: - autoreconf -fiv - - if test "$TRAVIS_OS_NAME" = osx ; then V=`sed -e 's/^AC_INIT[^,]*, *\[\([^]]\+\)\].*/\1/p;d' configure.ac` ; curl https://survex.com/software/$V/survex-$V.tar.gz | tar --strip-components=1 --skip-old-files -xf - ; fi + - if test "$TRAVIS_OS_NAME" = osx ; then V=`sed -e 's/^AC_INIT[^,]*, *\[\([^]]\+\)\].*/\1/p;d' configure.ac` ; curl https://survex.com/software/$V/survex-$V.tar.gz | gtar --strip-components=1 --skip-old-files -zxf - ; fi - test "$TRAVIS_OS_NAME" = osx || ./configure - test "$TRAVIS_OS_NAME" = osx || make - test "$TRAVIS_OS_NAME" = osx || make check -- 2.11.4.GIT