diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-03 20:49:11 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-03 20:49:11 +1100 |
| commit | 160c262b6e7ddedce19d12223e2560eefab687d0 (patch) | |
| tree | 33729ea5b4d06fa1e6019ca3f644a5a7f1de6e7a /scripts | |
| parent | e16f9cb291820af5e831d3f1d125efdd57d0168a (diff) | |
| download | qtlocation-mapboxgl-160c262b6e7ddedce19d12223e2560eefab687d0.tar.gz | |
Fix set -e
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis_before_install.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 3618e0480e..bead3fc2b4 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 |