From 62927bd762ee5c7e18acb51f26ebf3cfa35dc82a Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 10 Oct 2014 10:16:23 -0700
Subject: [PATCH] Protect all possibly-unset env vars

---
 setup-libraries.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup-libraries.sh b/setup-libraries.sh
index 60d42969c..3147f2b5a 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -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 [[ -n ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID} && ${AWS_SECRET_ACCESS_KEY} ]] ; then
+if [[ ${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 [[ -n ${TRAVIS:-} ]]; then
+if [[ ${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 [[ -n ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID} && ${AWS_SECRET_ACCESS_KEY} ]] ; then
+if [[ ${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/