[GRASS-SVN] r30515 - in grass/branches/releasebranch_6_3/scripts: m.proj v.in.garmin v.in.gpsbabel

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Mar 10 04:19:56 EDT 2008


Author: hamish
Date: 2008-03-10 04:19:55 -0400 (Mon, 10 Mar 2008)
New Revision: 30515

Modified:
   grass/branches/releasebranch_6_3/scripts/m.proj/m.proj
   grass/branches/releasebranch_6_3/scripts/v.in.garmin/v.in.garmin
   grass/branches/releasebranch_6_3/scripts/v.in.gpsbabel/v.in.gpsbabel
Log:
fix literal use of * in regex (merge from HEAD)

Modified: grass/branches/releasebranch_6_3/scripts/m.proj/m.proj
===================================================================
--- grass/branches/releasebranch_6_3/scripts/m.proj/m.proj	2008-03-09 23:31:57 UTC (rev 30514)
+++ grass/branches/releasebranch_6_3/scripts/m.proj/m.proj	2008-03-10 08:19:55 UTC (rev 30515)
@@ -234,7 +234,7 @@
    EXITCODE=$?
 
    #### check if transform REALLY worked (e.g. bogus output if grid file not found)
-   if [ -n "`head -n 1 "$outfile" | grep '^*'`" ] ; then
+   if [ -n "`head -n 1 "$outfile" | grep '^\*'`" ] ; then
       EXITCODE=1
    fi
 fi

Modified: grass/branches/releasebranch_6_3/scripts/v.in.garmin/v.in.garmin
===================================================================
--- grass/branches/releasebranch_6_3/scripts/v.in.garmin/v.in.garmin	2008-03-09 23:31:57 UTC (rev 30514)
+++ grass/branches/releasebranch_6_3/scripts/v.in.garmin/v.in.garmin	2008-03-10 08:19:55 UTC (rev 30515)
@@ -451,7 +451,7 @@
 	cs2cs -f %.7f $IN_PROJ +to $OUT_PROJ < "${TMP}.base" > "${TMP}.P_base"
 	EXITCODE=$?
 	# check if transform REALLY worked (e.g. grid file not found)
-	BAD_PTS="`grep -c "^*" "${TMP}.P_base"`"
+	BAD_PTS="`grep -c "^\*" "${TMP}.P_base"`"
 	if [ "$BAD_PTS" -gt 0 ] ; then
 	    g.message message=""
 	    g.message -w "$BAD_PTS point(s) failed reprojection."
@@ -659,7 +659,7 @@
 	cs2cs -tL -f %.7f $IN_PROJ +to $OUT_PROJ < "${TMP}.base" > "${TMP}.P_mid"
 	EXITCODE=$?
 	# check if transform REALLY worked (e.g. grid file not found)
-	BAD_PTS="`grep -c "^*" "${TMP}.P_mid"`"
+	BAD_PTS="`grep -c "^\*" "${TMP}.P_mid"`"
 	if [ "$BAD_PTS" -gt 0 ] ; then
 	    g.message message=""
 	    g.message -w "$BAD_PTS vertices failed reprojection."

Modified: grass/branches/releasebranch_6_3/scripts/v.in.gpsbabel/v.in.gpsbabel
===================================================================
--- grass/branches/releasebranch_6_3/scripts/v.in.gpsbabel/v.in.gpsbabel	2008-03-09 23:31:57 UTC (rev 30514)
+++ grass/branches/releasebranch_6_3/scripts/v.in.gpsbabel/v.in.gpsbabel	2008-03-10 08:19:55 UTC (rev 30515)
@@ -311,7 +311,7 @@
 	cs2cs -f %.7f $IN_PROJ +to $OUT_PROJ < "${TMP}.base" > "${TMP}.P_base"
 	EXITCODE=$?
 	# check if transform REALLY worked (e.g. when the grid file is not found)
-	BAD_PTS="`grep -c "^*" "${TMP}.P_base"`"
+	BAD_PTS="`grep -c "^\*" "${TMP}.P_base"`"
 	if [ "$BAD_PTS" -gt 0 ] ; then
 	    g.message message=""
 	    g.message -w "$BAD_PTS point(s) failed reprojection."
@@ -567,7 +567,7 @@
 	cs2cs -tL -f %.7f $IN_PROJ +to $OUT_PROJ < "${TMP}.base" > "${TMP}.P_mid"
 	EXITCODE=$?
 	 # check if transform REALLY worked (e.g. grid file not found)
-	 BAD_PTS="`grep -c "^*" "${TMP}.P_mid"`"
+	 BAD_PTS="`grep -c "^\*" "${TMP}.P_mid"`"
 	if [ "$BAD_PTS" -gt 0 ] ; then
 	    g.message message=""
 	    g.message -w "$BAD_PTS vertices failed reprojection."



More information about the grass-commit mailing list