[GRASS-SVN] r55214 - grass/branches/develbranch_6/scripts/r.in.wms

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-02-25 14:59:29 -0800 (Mon, 25 Feb 2013)
New Revision: 55214

Modified:
   grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms
Log:
better handle spaces in GISDBASE (#1683), bugfix on WinGrass, so candidate for backporting after testing.

Modified: grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms
===================================================================
--- grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms	2013-02-25 22:55:14 UTC (rev 55213)
+++ grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms	2013-02-25 22:59:29 UTC (rev 55214)
@@ -467,14 +467,14 @@
 DOWNLOAD=""
 GDALWARP=""
 
-eval `g.gisenv`
-
 #Job number one: pick a folder
-if [ -z "${GIS_OPT_FOLDER}" ] ; then
-	GIS_OPT_FOLDER="${GISDBASE}/wms_download"
+if [ -z "$GIS_OPT_FOLDER" ] ; then
+    GISDBASE=`g.gisenv get=GISDBASE`
+    GIS_OPT_FOLDER="$GISDBASE/wms_download"
 fi
 
-PREFIX="${GIS_OPT_OUTPUT}"
+
+PREFIX="$GIS_OPT_OUTPUT"
 if [ -x "`which wget`" ] ; then
     REQUESTFILE="${GIS_OPT_FOLDER}/${PREFIX}_${GIS_OPT_REGION}.wget"
 else