Merge pull request #319 from edmorley/library-vendoring-cleanup

Fixes to the library vendoring's 'already exists' checks

bin/steps/cryptography

@@ -22,16 +22,14 @@ bpwatch start libffi_install
 # If a package using cffi exists within requirements, use vendored libffi.
 if (pip-grep -s requirements.txt bcrypt cffi cryptography django[bcrypt] Django[bcrypt] PyNaCl pyOpenSSL PyOpenSSL requests[security] misaka &> /dev/null) then
 
-  if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
-    export LIBFFI=$(pwd)/vendor
-  else
+  if [ ! -d ".heroku/vendor/lib/libffi-3.1" ]; then
     echo "-----> Noticed cffi. Bootstrapping libffi."
     mkdir -p .heroku/vendor
     # Download and extract libffi into target vendor directory.
     curl $VENDORED_LIBFFI -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export LIBFFI=$(pwd)/vendor
   fi
+
+  export LIBFFI=$(pwd)/vendor
 fi
 
 bpwatch stop libffi_install

bin/steps/gdal

@@ -22,16 +22,14 @@ bpwatch start gdal_install
 # If GDAL exists within requirements, use vendored gdal.
 if (pip-grep -s requirements.txt GDAL gdal pygdal &> /dev/null) then
 
-  if [ -f ".heroku/vendor/bin/gdalserver" ]; then
-    export GDAL=$(pwd)/vendor
-  else
+  if [ ! -f ".heroku/vendor/bin/gdalserver" ]; then
     echo "-----> Noticed GDAL. Bootstrapping gdal."
     mkdir -p .heroku/vendor
     # Download and extract cryptography into target vendor directory.
     curl $VENDORED_GDAL -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export GDAL=$(pwd)/vendor
   fi
+
+  export GDAL=$(pwd)/vendor
 fi
 
 bpwatch stop gdal_install

bin/steps/geo-libs

@@ -24,18 +24,16 @@ bpwatch start geo_libs_install
 # If GDAL exists within requirements, use vendored gdal.
 if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
 
-  if [ -f ".heroku/vendor/bin/gdalserver" ]; then
-    export GDAL=$(pwd)/vendor
-  else
+  if [ ! -f ".heroku/vendor/bin/proj" ]; then
     echo "-----> Bootstrapping gdal, geos, proj."
     mkdir -p .heroku/vendor
     # Download and extract cryptography into target vendor directory.
     curl $VENDORED_GDAL -s | tar zxv -C .heroku/vendor &> /dev/null
     curl $VENDORED_GEOS -s | tar zxv -C .heroku/vendor &> /dev/null
     curl $VENDORED_PROJ -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export GDAL=$(pwd)/vendor
   fi
+
+  export GDAL=$(pwd)/vendor
 fi
 
 bpwatch stop geo_libs_install

bin/steps/mercurial

@@ -3,4 +3,4 @@ if (grep -Fiq "hg+" requirements.txt) then
   bpwatch start mercurial_install
     /app/.heroku/python/bin/pip install  mercurial | cleanup | indent
   bpwatch stop mercurial_install
-fi
+fi

bin/steps/pip-uninstall

@@ -15,4 +15,4 @@ if [[ -f .heroku/python/requirements-declared.txt ]]; then
   fi
 fi
 bpwatch stop pip_uninstall
-set -e
+set -e

bin/steps/pylibmc

@@ -21,16 +21,14 @@ bpwatch start pylibmc_install
 # If pylibmc exists within requirements, use vendored libmemcached.
 if (pip-grep -s requirements.txt pylibmc &> /dev/null) then
 
-  if [ -d ".heroku/vendor/lib/sasl2" ]; then
-    export LIBMEMCACHED=$(pwd)/vendor
-  else
+  if [ ! -d ".heroku/vendor/lib/sasl2" ]; then
     echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
     mkdir -p .heroku/vendor
     # Download and extract libmemcached into target vendor directory.
     curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export LIBMEMCACHED=$(pwd)/vendor
   fi
+
+  export LIBMEMCACHED=$(pwd)/vendor
 fi
 
 bpwatch stop pylibmc_install