[GRASS-SVN] r42941 - grass/branches/develbranch_6/scripts/r.tileset

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-07-29 12:35:14 +0000 (Thu, 29 Jul 2010)
New Revision: 42941

Modified:
   grass/branches/develbranch_6/scripts/r.tileset/r.tileset
Log:
sed and grep are std

Modified: grass/branches/develbranch_6/scripts/r.tileset/r.tileset
===================================================================
--- grass/branches/develbranch_6/scripts/r.tileset/r.tileset	2010-07-29 12:04:44 UTC (rev 42940)
+++ grass/branches/develbranch_6/scripts/r.tileset/r.tileset	2010-07-29 12:35:14 UTC (rev 42941)
@@ -129,8 +129,6 @@
 # Program locations:
 BC="bc"
 BCARGS="-l"
-SED="sed"
-GREP="grep"
 CS2CS="cs2cs"
 
 
@@ -140,18 +138,6 @@
     exit 1
 fi
 
-# check if we have sed
-if [ ! -x "`which $SED`" ] ; then
-    g.message -e "$SED is required, please install it first"
-    exit 1
-fi
-
-# check if we have grep
-if [ ! -x "`which $GREP`" ] ; then
-    g.message -e "$GREP is required, please install it first"
-    exit 1
-fi
-
 # check if we have cs2cs
 if [ ! -x "`which $CS2CS`" ] ; then
     g.message -e "$CS2CS is required, please install it first"
@@ -254,7 +240,7 @@
 
 	message 3 "$answer"
 	# do not quote $answer in the following line
-	eval `echo $answer | $SED -e "s/^/p_x2=/"  -e "s/ /;p_y2=/"  -e "s/ /;p_z2=/"`
+	eval `echo $answer | sed -e "s/^/p_x2=/"  -e "s/ /;p_y2=/"  -e "s/ /;p_z2=/"`
 
 	calculate p_x2 "$p_x2 / $p_dest_units"
 	calculate p_y2 "$p_y2 / $p_dest_units"
@@ -408,7 +394,7 @@
 	g.message "Getting projection scale"
 
 if [ -z "$GIS_OPT_DESTSCALE" ] ; then
-	eval `g.proj -p | $GREP '^meters' | $SED -e "s/:/=/" -e "s/ //g"`
+	eval `g.proj -p | grep '^meters' | sed -e "s/:/=/" -e "s/ //g"`
 	DEST_SCALE=$meters;
 else
 	DEST_SCALE=$GIS_OPT_DESTSCALE