[GRASS-SVN] r59427 - grass/branches/develbranch_6/raster/r.li/r.li.setup

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2014-03-27 07:59:56 -0700 (Thu, 27 Mar 2014)
New Revision: 59427

Modified:
   grass/branches/develbranch_6/raster/r.li/r.li.setup/masked_area_selection.sh
Log:
r.li.setup: backported by 6.4

Modified: grass/branches/develbranch_6/raster/r.li/r.li.setup/masked_area_selection.sh
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.setup/masked_area_selection.sh	2014-03-27 14:55:08 UTC (rev 59426)
+++ grass/branches/develbranch_6/raster/r.li/r.li.setup/masked_area_selection.sh	2014-03-27 14:59:56 UTC (rev 59427)
@@ -163,6 +163,10 @@
 # show the selected area
 d.rast -o map="tmp_rli_mask.$$" --quiet
 
+input_vector=tmp_rli_mask.$$
+CAT=$$
+export input_vector CAT
+
 name="$TMP.val"
 export name
 
@@ -173,7 +177,7 @@
 r_name=`cat "$name" | cut -f2 -d' '`
 
 
-if [ "$ok" -eq 1 ] ; then
+if [ -n "$ok" ] ; then
     mask_name="rli_samp_${STYLE}_${r_name}"
     # r.mask + 'g.region zoom= align=' + 'r.mapcalc cropmap=map' would be cleaner?
     r.to.vect input="tmp_rli_mask.$$" output="tmp_rli_mask_v$$" feature=area --quiet