diff --git a/.travis.yml b/.travis.yml index f2860cdb3..3c4d76652 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_install: - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh -- ./scripts/travis_before_install.sh +- source ./scripts/travis_before_install.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 1d21c1edf..5aaed855c 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -5,12 +5,12 @@ set -o pipefail if [[ "${MASON_PLATFORM}" == "android" ]]; then MASON_PLATFORM= ./.mason/mason install 7z 9.20 - 7Z_PATH=$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za + SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za" mapbox_time "fetching NDK" \ wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin chmod a+x ./android-ndk-r10c-linux-x86_64.bin mapbox_time "unpacking NDK" \ - 7Z_PATH x ./android-ndk-r10c-linux-x86_64.bin > /dev/null; + SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > /dev/null; export ANDROID_NDK_PATH=$(pwd)/android-ndk-r10c; fi