From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 4 May 2012 01:40:43 +0000 (+0000)
Subject: - no deprecated egrep; cosmetics
X-Git-Tag: auto/th/systemd-44-14~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsystemd.git;a=commitdiff_plain;h=28dacbf5e546338f7d00b07cefdf7d1354544332

- no deprecated egrep; cosmetics

Changed files:
    pld-rc-inetd-generator.sh -> 1.2
---

diff --git a/pld-rc-inetd-generator.sh b/pld-rc-inetd-generator.sh
index f6ca669..10859a2 100644
--- a/pld-rc-inetd-generator.sh
+++ b/pld-rc-inetd-generator.sh
@@ -88,7 +88,7 @@ parse_one_service() {
 	echo "WantedBy=sockets.target" >>$SOCKET_FILE
 }
 
-SERVICES=$(ls -d /etc/sysconfig/rc-inetd/* 2>/dev/null | egrep -v '.*(\.rpm(save|new|orig)|~|CVS)')
+SERVICES=$(ls -d /etc/sysconfig/rc-inetd/* 2>/dev/null | grep -Ev '.*(\.rpm(save|new|orig)|~|CVS)')
 for i in $SERVICES; do
 	# unset everything
 	unset SERVICE_NAME SOCK_TYPE PROTOCOL PORT USER
@@ -100,15 +100,18 @@ for i in $SERVICES; do
 	unset BANNER_SUCCESS BANNER_FAILURE PASSENV
 	unset SERVICE_TYPE ACCESS_TIMES LOG_TYPE
 	unset LOG_SUCCESS LOG_FAILURE REDIRECT MAX_LOAD
+
 	# Read defaults...
 	. /etc/sysconfig/rc-inetd.conf
+
 	# ...and then config of *this* service.
 	. $i
-	CURRENT_SERVICE=`basename $i`
+
+	CURRENT_SERVICE=$(basename $i)
 	DONT_PARSE=0
 	# check if service is in deny list ?
-	for i in $DENY_SERVICES ; do
-		if [ $i = $CURRENT_SERVICE ] ; then
+	for i in $DENY_SERVICES; do
+		if [ $i = $CURRENT_SERVICE ]; then
 			DONT_PARSE=1
 		fi
 	done