[GRASS-SVN] r57577 - in grass/branches/releasebranch_6_4/scripts: v.rast.stats v.report

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-09-01 00:05:45 -0700 (Sun, 01 Sep 2013)
New Revision: 57577

Modified:
   grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats
   grass/branches/releasebranch_6_4/scripts/v.report/v.report
Log:
better handle spaces in GISDBASE (#1683), rm some unused vars (merge r55212,r55208 from devbr6)

Modified: grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats
===================================================================
--- grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats	2013-09-01 07:00:25 UTC (rev 57576)
+++ grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats	2013-09-01 07:05:45 UTC (rev 57577)
@@ -74,8 +74,6 @@
     exec g.parser "$0" "$@"
 fi
 
-PROG=`basename "$0"`
-
 #### check if we have awk
 if [ ! -x "`which awk`" ] ; then
     g.message "awk required, please install awk or gawk first" 
@@ -130,8 +128,7 @@
 COLPREFIX="$GIS_OPT_COLPREFIX"
 
 ### setup enviro vars ###
-eval `g.gisenv`
-: ${GISBASE?} ${GISDBASE?} ${LOCATION_NAME?} ${MAPSET?}
+MAPSET=`g.gisenv get=MAPSET`
 
 # does map exist in CURRENT mapset?
 eval `g.findfile element=vector file="$GIS_OPT_VECTOR" mapset="$MAPSET"`

Modified: grass/branches/releasebranch_6_4/scripts/v.report/v.report
===================================================================
--- grass/branches/releasebranch_6_4/scripts/v.report/v.report	2013-09-01 07:00:25 UTC (rev 57576)
+++ grass/branches/releasebranch_6_4/scripts/v.report/v.report	2013-09-01 07:05:45 UTC (rev 57577)
@@ -69,10 +69,6 @@
     exit 1
 fi
 
-### setup enviro vars ###
-eval `g.gisenv`
-: ${GISBASE?} ${GISDBASE?} ${LOCATION_NAME?} ${MAPSET?}
-LOCATION="$GISDBASE/$LOCATION_NAME/$MAPSET"
 
 ### trap <ctrl>-<c> so that we can clean up tmp and exit
 trap 'rm -f "$TMP1" "$TMP2" "$TMP3" "$TMP4"; exit 1' 2 3 15