[GRASS-SVN] r37207 - grass/branches/releasebranch_6_4/scripts/m.proj

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-13 06:36:39 -0400 (Wed, 13 May 2009)
New Revision: 37207

Modified:
   grass/branches/releasebranch_6_4/scripts/m.proj/m.proj
Log:
obey GRASS_VERBOSE (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/scripts/m.proj/m.proj
===================================================================
--- grass/branches/releasebranch_6_4/scripts/m.proj/m.proj	2009-05-13 10:32:35 UTC (rev 37206)
+++ grass/branches/releasebranch_6_4/scripts/m.proj/m.proj	2009-05-13 10:36:39 UTC (rev 37207)
@@ -91,6 +91,13 @@
 LC_NUMERIC=C
 export LC_NUMERIC
 
+# turn verbose mode on if requested either way
+if [ "$GIS_FLAG_V" -eq 1 ] ; then
+   g.message -w "The verbosity option is superseded. Use --verbose instead"
+   GRASS_VERBOSE=3
+   export GRASS_VERBOSE
+fi
+
 #### check for cs2cs
 if [ ! -x "`which cs2cs`" ] ; then
    g.message -e "cs2cs program not found, install PROJ.4 first"
@@ -133,9 +140,7 @@
 unset IN_PROJ
 if [ $GIS_FLAG_I -eq 1 ] ; then
    IN_PROJ="+proj=longlat +datum=WGS84"
-   if [ $GIS_FLAG_V -eq 1 ] ; then
-     g.message "Assuming LL WGS84 as input, current projection as output."
-   fi
+   g.message -v "Assuming LL WGS84 as input, current projection as output."
 fi
 if [ $GIS_FLAG_O -eq 1 ] ; then
    IN_PROJ="`g.proj -jf`"
@@ -152,9 +157,7 @@
 unset OUT_PROJ
 if [ $GIS_FLAG_O -eq 1 ] ; then
    OUT_PROJ="+proj=longlat +datum=WGS84"
-   if [ $GIS_FLAG_V -eq 1 ] ; then
-     g.message "Assuming current projection as input, LL WGS84 as output."
-   fi
+   g.message -v "Assuming current projection as input, LL WGS84 as output."
 fi
 if [ $GIS_FLAG_I -eq 1 ] ; then
    OUT_PROJ="`g.proj -jf`"
@@ -209,10 +212,10 @@
 outfile="$GIS_OPT_OUTPUT"
 
 if [ -n "$infile" ] ; then
-    g.message message="input file=[$infile]"
+    g.message -v message="input file=[$infile]"
 fi
 if [ -n "$outfile" ] ; then
-    g.message message="output file=[$outfile]" 
+    g.message -v message="output file=[$outfile]" 
 fi
 
 #### setup output style