diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 12:49:27 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 12:49:27 -0400 |
| commit | 8db6325b8aa1e8a0bf21e25c637de3490674ccd6 (patch) | |
| tree | 885dd065f70efbe12af4e7ff3e75d052e1fc7c3e | |
| parent | f390dab0ea7d449bdd89855c84e47f4a07606fe4 (diff) | |
| download | qtlocation-mapboxgl-8db6325b8aa1e8a0bf21e25c637de3490674ccd6.tar.gz | |
fix TRAVIS unbound var error
| -rwxr-xr-x | setup-libraries.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setup-libraries.sh b/setup-libraries.sh index e752d055c1..60d42969c4 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -67,7 +67,7 @@ export CXX11=true if [ ${UNAME} = 'Darwin' ]; then -if [[ $TRAVIS ]]; then +if [[ -n ${TRAVIS:-} ]]; then if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libcpp-osx_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libcpp-ios_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then rm -rf out/build-cpp11-libcpp-x86_64-macosx @@ -130,7 +130,7 @@ source MacOSX.sh patch -p0 --forward < patches/curl-ios.diff || true echo "NOTE: One patch FAILURE is expected. The other should have been applied or ignored." -if [[ $TRAVIS && $AWS_ACCESS_KEY_ID && $AWS_SECRET_ACCESS_KEY ]] ; then +if [[ -n ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID} && ${AWS_SECRET_ACCESS_KEY} ]] ; then tar -zcf out/build-cpp11-libcpp-ios_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libcpp-universal aws s3 cp --acl public-read out/build-cpp11-libcpp-ios_${MP_HASH}_${DIR_HASH}.tar.gz s3://mapbox-gl-testing/dependencies/ tar -zcf out/build-cpp11-libcpp-osx_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libcpp-x86_64-macosx @@ -146,7 +146,7 @@ cd ../../ elif [ ${UNAME} = 'Linux' ]; then -if [[ $TRAVIS ]]; then +if [[ -n ${TRAVIS:-} ]]; then if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ./out/ ; then rm -rf out/build-cpp11-libstdcpp-gcc-x86_64-linux tar -xzf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz @@ -162,7 +162,7 @@ source Linux.sh if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64-linux/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64-linux/lib/libboost_regex.a ] ; then ./scripts/build_boost.sh --with-regex ; fi -if [[ $TRAVIS && $AWS_ACCESS_KEY_ID && $AWS_SECRET_ACCESS_KEY ]] ; then +if [[ -n ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID} && ${AWS_SECRET_ACCESS_KEY} ]] ; then if ! tar --compare -zf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ; then tar -zcf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz out/build-cpp11-libstdcpp-gcc-x86_64-linux aws s3 cp --acl public-read out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz s3://mapbox-gl-testing/dependencies/ |