From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 5 May 2008 19:53:21 +0000 (+0000)
Subject: - drop requirement of find(1)
X-Git-Tag: auto/ac/daemontools-0_76-8~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdaemontools.git;a=commitdiff_plain;h=44b049f592665b06405d0b7fcc1264107b095d1f

- drop requirement of find(1)

Changed files:
    daemontools.init -> 1.20
---

diff --git a/daemontools.init b/daemontools.init
index 573078a..01f7bf9 100644
--- a/daemontools.init
+++ b/daemontools.init
@@ -31,7 +31,7 @@ fi
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/svscan ]; then
-		msg_starting svscan;
+		msg_starting svscan
 		busy
 		# we can't get status report from background job
 		# but we can only do simple file check
@@ -40,8 +40,7 @@ start() {
 			RETVAL=$?
 		else
 			fail
-			echo $(nls "Missing service directory")'!'
-			nls "Create %s first." "$SVSCAN_DIR"
+			nls "Missing service directory. Create %s first." "$SVSCAN_DIR"
 			RETVAL=1
 		fi
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/svscan
@@ -54,10 +53,13 @@ stop() {
 	if [ -f /var/lock/subsys/svscan ]; then
 		msg_stopping svscan
 		killproc svscan
-		svc=$(echo $SVSCAN_DIR/*)
-		if [ "$svc" != "$SVSCAN_DIR/*" ]; then
-			svc -d -x $SVSCAN_DIR/* \
-				$(find $SVSCAN_DIR/* -maxdepth 0 -follow -perm -1000 | sed -e 's,$,/log,')
+		for s in $SVSCAN_DIR/{,*/}*/run; do
+			if [ -x "$s" ]; then
+				svc="$svc ${s%/run}"
+			fi
+		done
+		if [ "$svc" ]; then
+			svc -d -x $svc
 		fi
 		rm -f /var/run/svscan.pid /var/lock/subsys/svscan >/dev/null 2>&1
 	else