From 160c262b6e7ddedce19d12223e2560eefab687d0 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Wed, 3 Dec 2014 20:49:11 +1100 Subject: [PATCH] Fix set -e --- scripts/travis_before_install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 3618e0480..bead3fc2b 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -#set -e +set -e set -o pipefail if [[ "${MASON_PLATFORM}" == "android" ]]; then @@ -50,10 +50,10 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then #mapbox_time "installing SDK" \ sudo apt-get -y install lib32stdc++6 lib32z1 jq echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository,extra-google-m2repository - + echo "debug: inserting access token" sed -i "s/access token goes here/${ANDROID_KEY}/g" android/java/app/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java - + elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then echo "debug: installing 7z" @@ -95,10 +95,10 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then echo "debug: installing SDK" #mapbox_time "installing SDK" \ echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository,extra-google-m2repository - + echo "debug: inserting access token" sed -i "s/access token goes here/${ANDROID_KEY}/g" android/java/app/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java - + fi fi