[GRASS-SVN] r43356 - grass/branches/develbranch_6/scripts/m.proj

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-08-31 04:24:02 +0000 (Tue, 31 Aug 2010)
New Revision: 43356

Modified:
   grass/branches/develbranch_6/scripts/m.proj/m.proj
Log:
survive cs2cs + spaces in NTv2 grid file pathnames

Modified: grass/branches/develbranch_6/scripts/m.proj/m.proj
===================================================================
--- grass/branches/develbranch_6/scripts/m.proj/m.proj	2010-08-30 12:24:30 UTC (rev 43355)
+++ grass/branches/develbranch_6/scripts/m.proj/m.proj	2010-08-31 04:24:02 UTC (rev 43356)
@@ -273,10 +273,14 @@
 # reformat strange cs2cs output to pretty CSV format
 if [ "$GIS_FLAG_G" -eq 1 ] ; then
    if [ -z "$outfile" ] ; then
-      cat "$infile" | tr "$fs" ' ' | cs2cs $COPYINP $OUTFMT $IN_PROJ +to $OUT_PROJ | tr -s "\t" "$GIS_OPT_FS" | tr -s " " "$GIS_OPT_FS"
+      cat "$infile" | tr "$fs" ' ' | \
+	 eval cs2cs $COPYINP $OUTFMT `echo $IN_PROJ` +to `echo $OUT_PROJ` | \
+	 tr -s "\t" "$GIS_OPT_FS" | tr -s " " "$GIS_OPT_FS"
       EXITCODE=$?
    else
-      cat "$infile" | tr "$fs" ' ' | cs2cs $COPYINP $OUTFMT $IN_PROJ +to $OUT_PROJ | tr -s "\t" "$GIS_OPT_FS" | tr -s " " "$GIS_OPT_FS" \
+      cat "$infile" | tr "$fs" ' ' | \
+	 eval cs2cs $COPYINP $OUTFMT `echo $IN_PROJ` +to `echo $OUT_PROJ` | \
+	 tr -s "\t" "$GIS_OPT_FS" | tr -s " " "$GIS_OPT_FS" \
          > "$outfile"
       EXITCODE=$?
 
@@ -288,10 +292,12 @@
 else
    # write cs2cs output as is
    if [ -z "$outfile" ] ; then
-      cat "$infile" | tr "$fs" ' ' | cs2cs $COPYINP $OUTFMT $IN_PROJ +to $OUT_PROJ
+      cat "$infile" | tr "$fs" ' ' | \
+	 eval cs2cs $COPYINP $OUTFMT `echo $IN_PROJ` +to `echo $OUT_PROJ`
       EXITCODE=$?
    else
-      cat "$infile" | tr "$fs" ' ' | cs2cs $COPYINP $OUTFMT $IN_PROJ +to $OUT_PROJ \
+      cat "$infile" | tr "$fs" ' ' | \
+	 eval cs2cs $COPYINP $OUTFMT `echo $IN_PROJ` +to `echo $OUT_PROJ` \
          > "$outfile"
       EXITCODE=$?