From 2d809127b7de072864afce0f502821b0453b2aae Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 2 Nov 2014 15:43:57 -0500 Subject: [PATCH] bash subshell to try to get mapbox-time working with custom commands --- scripts/travis_before_install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 5aaed855c..65be1c29d 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -4,13 +4,14 @@ set -e set -o pipefail if [[ "${MASON_PLATFORM}" == "android" ]]; then - MASON_PLATFORM= ./.mason/mason install 7z 9.20 + mapbox_time "unpacking NDK" \ + $(MASON_PLATFORM= ./.mason/mason install 7z 9.20) 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" \ - SEVEN_ZIP_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