[csw-devel] SF.net SVN: gar:[7098] csw/mgar/gar/v2/bin/checkpkg

[dmichelsen at users.sourceforge.net]

Revision: 7098
          http://gar.svn.sourceforge.net/gar/?rev=7098&view=rev
Author:   dmichelsen
Date:     2009-11-04 09:45:49 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
mGAR v2: Replace xpg4/grep with bin/grep in checkpkg

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2009-11-03 20:19:16 UTC (rev 7097)
+++ csw/mgar/gar/v2/bin/checkpkg	2009-11-04 09:45:49 UTC (rev 7098)
@@ -451,7 +451,7 @@
     if [[ $? -ne 0 ]]; then
 	#if we've already looked at the package named $dep,
 	#it'll be in the file.
- 	awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/xpg4/bin/grep -q $dep
+ 	awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null
  	if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set
 	    echo "Can't validate dependence on $dep.  Storing for delayed validation."
 	    #store for validation at the end.
@@ -530,7 +530,7 @@
     while read mdep; do
 	dep=`echo $mdep | nawk '{print $1}'`
 	pkg=`echo $mdep | nawk '{print $2}'`
-	/usr/xpg4/bin/grep -q $dep $SETDEPS
+	/usr/bin/grep $dep $SETDEPS >/dev/null
 	if [ $? -ne 0 ]; then
 	    errmsg "Couldn't validate $dep as a dependency in package $pkg"
 	else
@@ -545,7 +545,7 @@
 	lib=`echo $ldep | nawk '{print $1}'`
         [ "$lib" = "libm.so.2" ] && continue
 	pkg=`echo $ldep | nawk '{print $2}'`
-	/usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS
+	/usr/bin/grep -q "[/=]$lib[ =]" $SETLIBS >/dev/null
 	if [ $? -ne 0 ]; then
 	    errmsg "Couldn't find a package providing $lib"
 	else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.