SOURCES: portsentry.init - use sane shell syntax - create global s...

[glen]

Author: glen                         Date: Sun Mar 12 20:15:40 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use sane shell syntax
- create global service lock

---- Files affected:
SOURCES:
   portsentry.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/portsentry.init
diff -u SOURCES/portsentry.init:1.7 SOURCES/portsentry.init:1.8
--- SOURCES/portsentry.init:1.7	Thu Dec  8 02:02:49 2005
+++ SOURCES/portsentry.init	Sun Mar 12 21:15:34 2006
@@ -30,53 +30,62 @@
 	exit 0
 fi
 
-[ -f /usr/bin/portsentry ] || exit 0
-
 # Check the modes we're running in...
-unset allmodes;
-is_yes "$PORTSENTRY_ATCP"; [ "$?" = 1 ] || {
-	PORTSENTRY_TCP="0";
-	PORTSENTRY_STCP="0";
-	allmodes=" -atcp";
-}
-is_yes "$PORTSENTRY_AUDP"; [ "$?" = 1 ] || {
-	PORTSENTRY_UDP="0";
-	PORTSENTRY_SUDP="0";
-	allmodes="$allmodes -audp";
-}
-is_yes $PORTSENTRY_TCP; [ "$?" = 1 ] || allmodes="$allmodes -tcp";
-is_yes $PORTSENTRY_UDP; [ "$?" = 1 ] || allmodes="$allmodes -udp";
-is_yes $PORTSENTRY_STCP; [ "$?" = 1 ] || allmodes="$allmodes -stcp";
-is_yes $PORTSENTRY_SUDP; [ "$?" = 1 ] || allmodes="$allmodes -sudp";
+allmodes=""
+if is_yes "$PORTSENTRY_ATCP"; then
+	PORTSENTRY_TCP="0"
+	PORTSENTRY_STCP="0"
+	allmodes="$allmodes atcp"
+fi
+
+if is_yes "$PORTSENTRY_AUDP"; then
+	PORTSENTRY_UDP="0"
+	PORTSENTRY_SUDP="0"
+	allmodes="$allmodes audp"
+fi
+if is_yes $PORTSENTRY_TCP; then
+	allmodes="$allmodes tcp"
+fi
+if is_yes $PORTSENTRY_UDP; then
+	allmodes="$allmodes udp"
+fi
+if is_yes $PORTSENTRY_STCP; then
+	allmodes="$allmodes stcp"
+fi
+if is_yes $PORTSENTRY_SUDP; then
+	allmodes="$allmodes sudp"
+fi
 
 RETVAL=0
 case "$1" in
   start)
 	# Check if the service is already running?
-	for mode in $allmodes; do
-		if [ ! -f /var/lock/subsys/portsentry$mode ]; then
-			msg_starting "portsentry$mode"
-			daemon "portsentry $mode"
-			RET=$?
-			[ $RETVAL -eq 0 ] && RETVAL=$RET
-			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/portsentry$mode
-		else
-			msg_already_running portsentry
-		fi
-	done
+	if [ ! -f /var/lock/subsys/portsentry ]; then
+		for mode in $allmodes; do
+			if [ ! -f /var/lock/subsys/portsentry-$mode ]; then
+				msg_starting "portsentry ($mode)"
+				daemon "portsentry -$mode"
+				RET=$?
+				[ $RET = 0 ] && touch /var/lock/subsys/portsentry-$mode
+				[ $RETVAL -gt 0 ] && RETVAL=$RET
+			else
+				msg_already_running "portsentry ($mode)"
+			fi
+		done
+		touch /var/lock/subsys/portsentry
+	else
+		msg_already_running portsentry
+	fi
 	;;
   stop)
-	# Stop daemons.
-	cd /var/lock/subsys/;
-	ls --color=none /var/lock/subsys/portsentry* >/dev/null 2>&1
-	[ $? -eq "0" ] || {
+	if [ -f /var/lock/subsys/portsentry ]; then
+		# Stop daemons.
+		msg_stopping portsentry
+		killproc portsentry
+		rm -f /var/lock/subsys/portsentry*
+	else
 		msg_not_running portsentry
-		exit 0
-	}
-	msg_stopping portsentry
-	killproc portsentry
-	rm -f /var/lock/subsys/portsentry* >/dev/null 2>&1
-	rm -f /var/run/portsentry.pid /var/run/portsentry.loc* >/dev/null 2>&1
+	fi
 	;;
   status)
 	status portsentry
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/portsentry.init?r1=1.7&r2=1.8&f=u