Fix set -e

This commit is contained in:
Leith Bade
2014-12-03 20:49:11 +11:00
parent e16f9cb291
commit 160c262b6e

View File

@@ -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