- drop requirement of find(1)

Changed files:
    daemontools.init -> 1.20

diff --git a/daemontools.init b/daemontools.init
index 573078a216912435cf460032dc932c2d0e946306..01f7bf9dc835fade59e6ab246e68fa966836f3bf 100644 (file)
--- 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
 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
                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
                        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
                        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
        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
                fi
                rm -f /var/run/svscan.pid /var/lock/subsys/svscan >/dev/null 2>&1
        else