From aef7b65b9543a4fb5b742f21af40a4a030c59ae0 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 1 Aug 2016 12:45:05 +0100
Subject: [PATCH] Don't skip the geo-libs vendoring step if only gdalserver
 present

Since if someone previously had `GDAL` in their requirements file, they
would already have the gdalserver binary present from `bin/steps/gdal`
but be missing the proj and geos vendor files. By checking for `proj`
instead, we ensure that the vendoring isn't incorrectly skipped in this
case.
---
 bin/steps/geo-libs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/steps/geo-libs b/bin/steps/geo-libs
index 7c5fc3fc..f458861e 100755
--- a/bin/steps/geo-libs
+++ b/bin/steps/geo-libs
@@ -24,7 +24,7 @@ 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
+  if [ ! -f ".heroku/vendor/bin/proj" ]; then
     echo "-----> Bootstrapping gdal, geos, proj."
     mkdir -p .heroku/vendor
     # Download and extract cryptography into target vendor directory.
-- 
GitLab