[csw-devel] SF.net SVN: gar:[9820] csw/mgar/pkg/cswclassutils/trunk

[bdwalton at users.sourceforge.net]

Revision: 9820
          http://gar.svn.sourceforge.net/gar/?rev=9820&view=rev
Author:   bdwalton
Date:     2010-05-06 01:43:40 +0000 (Thu, 06 May 2010)

Log Message:
-----------
cswclassutils: update cswinetd -> no grep; cswetcservices -> no grep, ignore # CSWfoo comments

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/checksums
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2010-05-05 13:17:44 UTC (rev 9819)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2010-05-06 01:43:40 UTC (rev 9820)
@@ -1,15 +1,15 @@
 48a97af56d55bc90ce90303228ed8cc3  COPYING
 9846081f8109dc9149dc026b89fbf137  CSWcswclassutils.i.cswcpsampleconf
 9a6f5ad4919b78e4083491edcd86db0c  CSWcswclassutils.i.cswcrontab
-56900bb1fc9f40f7c227877eca32b1f8  CSWcswclassutils.i.cswetcservices
-4f2e9de463cb4b17ba6e1b3dfdf18913  CSWcswclassutils.i.cswinetd
+5e2ae2c6bd828061f86d84f09087b06a  CSWcswclassutils.i.cswetcservices
+4a0971d15bc02e7496f876336c68ddf4  CSWcswclassutils.i.cswinetd
 6abb13158fee906870d1d68dc0fae6f3  CSWcswclassutils.i.cswinitsmf
 a667515489aafc81d41159765faf698f  CSWcswclassutils.i.cswmigrateconf
 8ab721535d43dcef702538d394e7a2ce  CSWcswclassutils.i.cswpostmsg
 0fc6128391af4c9aebf72b84755532cb  CSWcswclassutils.i.cswpreserveconf
 9018419febe06c12e89d66cc76e7261f  CSWcswclassutils.i.cswpycompile
 4f816acb06e8f95add6faf8607859da2  CSWcswclassutils.i.cswtexinfo
-7f04b24b421f3afbf3c61845941ef5dd  CSWcswclassutils.i.cswusergroup
+5071bfb677bcdeda35ccdb9cd6f56f34  CSWcswclassutils.i.cswusergroup
 d278a28a6f901c4ff5f07c583b4cff3d  CSWcswclassutils.r.cswcpsampleconf
 a204ca80139dd1d79e1a3af3e8bad7cb  CSWcswclassutils.r.cswcrontab
 d60261ddc46e2cc83ecbbfc586a7e686  CSWcswclassutils.r.cswetcservices

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices	2010-05-05 13:17:44 UTC (rev 9819)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices	2010-05-06 01:43:40 UTC (rev 9820)
@@ -28,8 +28,9 @@
 	  echo "svcname: $svcname; port/proto: $port_proto"
       fi
 
-      /usr/xpg4/bin/grep -q "^$svcname[[:space:]].*$port_proto.*$PKGINST" $svcfile
-      if [ $? -ne 0 ]; then
+      exists=`awk "\\\$1 == \"$svcname\" && \\\$2 == \"$port_proto\" { print \"found\" }" $svcfile`
+
+      if [ "$exists" != "found" ]; then
 	  echo "$svcname		$port_proto	# $PKGINST" >> $svcfile
       fi
   done

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd	2010-05-05 13:17:44 UTC (rev 9819)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd	2010-05-06 01:43:40 UTC (rev 9820)
@@ -58,8 +58,8 @@
 
   # we won't register with inetd if the service name isn't registered
   # in the global services file.
-  /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/services
-  if [ $? -eq 0 ]; then
+  exists=`awk "\\\$1 == \"$svcname\" {print \"found\" }" /etc/services`
+  if [ "$exists" == "found" ]; then
       if [ -n "$DEBUG" ]; then
 	  echo "Installing inetd service:"
 	  echo "$inetdsvc"


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