Fix error in bash preventing building

git-svn-id: http://svn.osgeo.org/postgis/trunk@17535 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index b655f851e4813b3fe69964102bedccd100aaa924..10652ab0a5d3d7274bafa03b4b6564b9b96aab5e 100644 (file)
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-if  [[ "${OVERRIDE}" == '' ]] ;
+if  [[ "${OVERRIDE}" == '' ]] ; then
   export SFCGAL_VER=1.3.2
   export GEOS_VER=3.7.1
   export GDAL_VER=2.2.4

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index ccc982a4b8cd14fc24720417e90cc66276d3dbdd..cccbdcda4a5064b26437265dd540ed0adaa72423 100644 (file)
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -14,7 +14,7 @@
 #export GCC_TYPE=
 #if no override is set - use these values
 #otherwise use the ones jenkins passes thru
-if  [[ "${OVERRIDE}" == '' ]] ;
+if  [[ "${OVERRIDE}" == '' ]] ; then
        export GEOS_VER=3.8
        export GDAL_VER=2.2.4
        export PROJ_VER=4.9.3
@@ -27,16 +27,11 @@ fi;
 
 export PCRE_VER=8.33
 
-if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
-       export PROJECTS=/projects
-       export MINGPROJECTS=/projects
-       export PATHOLD=$PATH
-else
-       export PROJECTS=/projects
-       export MINGPROJECTS=/projects
-       export PATHOLD=$PATH
-       #export JSON_VER=0.9
-fi;
+
+export PROJECTS=/projects
+export MINGPROJECTS=/projects
+export PATHOLD=$PATH
+
 
 export PGHOST=localhost
 
@@ -103,7 +98,7 @@ mkdir $outdir/bin/postgisgui
 mkdir $outdir/bin/postgisgui/share
 mkdir $outdir/bin/postgisgui/lib
 mkdir $outdir/utils
-cp ${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll  $outdir/bin/postgisgui
+cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll  $outdir/bin/postgisgui
 # it seems 9.2 and 9.3 doesn't come with its own libiconv good grief
 # and trying to use their libiconv2.dll makes shp2pgsql crash
 if [[ "$PG_VER" == *9.2* || "$PG_VER" == *9.3* ]]; then