[GRASS-SVN] r42939 - grass/branches/develbranch_6/scripts/r.in.wms

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-07-29 11:53:44 +0000 (Thu, 29 Jul 2010)
New Revision: 42939

Modified:
   grass/branches/develbranch_6/scripts/r.in.wms/wms.request
Log:
sed and grep are std

Modified: grass/branches/develbranch_6/scripts/r.in.wms/wms.request
===================================================================
--- grass/branches/develbranch_6/scripts/r.in.wms/wms.request	2010-07-29 10:41:06 UTC (rev 42938)
+++ grass/branches/develbranch_6/scripts/r.in.wms/wms.request	2010-07-29 11:53:44 UTC (rev 42939)
@@ -132,20 +132,7 @@
 
 g.message -d "[wms.request]"
 
-SED="sed"
-GREP="grep"
-# check if we have sed
-if [ ! -x "`which $SED`" ] ; then
-    g.message "$SED is required, please install it first"
-    exit 1
-fi
 
-# check if we have grep
-if [ ! -x "`which $GREP`" ] ; then
-    g.message "$GREP is required, please install it first"
-    exit 1
-fi
-
 # Remember the intial field seperator
 defaultIFS="$IFS"
 
@@ -276,7 +263,7 @@
 # use this projection as the source to get a trivial tiling from r.tileset
 if [ $GIS_FLAG_P -eq 1 ] ; then
 	PROJ4_SRS=`g.proj -j`
-	eval `g.proj -p | $GREP meters | $SED "s/\\s*:\\s*/=/"`
+	eval `g.proj -p | grep meters | sed "s/\\s*:\\s*/=/"`
 	SRS_SCALE=$meters;
 else
 	PROJ4_SRS="+init=$SRS_lower"