[postgis-tickets] r17535 - Fix error in bash preventing building

[Regina Obe]

Author: robe
Date: 2019-06-14 15:52:39 -0700 (Fri, 14 Jun 2019)
New Revision: 17535

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
Log:
Fix error in bash preventing building

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2019-06-14 17:47:07 UTC (rev 17534)
+++ trunk/ci/winnie/build_postgis.sh	2019-06-14 22:52:39 UTC (rev 17535)
@@ -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

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2019-06-14 17:47:07 UTC (rev 17534)
+++ trunk/ci/winnie/package_postgis.sh	2019-06-14 22:52:39 UTC (rev 17535)
@@ -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,17 +27,12 @@
 
 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
 
 export PGUSER=postgres
@@ -103,7 +98,7 @@
 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