Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / startdaemons.sh

diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 7609abec47044a62981dc121d9ba20e9a6e0df08..0fa72cea118cf0df81d69e9a83cf1806359abdc5 100755 (executable)
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Laconica - a distributed open-source microblogging tool
+# StatusNet - a distributed open-source microblogging tool
 
-# Copyright (C) 2008, 2009, Control Yourself, Inc.
+# Copyright (C) 2008, 2009, StatusNet, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,25 +17,32 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# This program tries to start the daemons for Laconica.
+# This program tries to start the daemons for StatusNet.
 # Note that the 'maildaemon' needs to run as a mail filter.
 
-ARGS=
+ARGSG=
+ARGSD=
 
 if [ $# -gt 0 ]; then
-    ARGS="$ARGS -s$1"
+    ARGSG="$ARGSG -s$1"
+    ID=`echo $1 | sed s/\\\\./_/g`
+    ARGSD="$ARGSD -s$1 -i$ID"
 fi
 
 if [ $# -gt 1 ]; then
-    ARGS="$ARGS -p$2"
+    ARGSD="$ARGSD -p$2"
+    ARGSG="$ARGSG -p$2"
 fi
 
 DIR=`dirname $0`
-DAEMONS=`php $DIR/getvaliddaemons.php $ARGS`
+DAEMONS=`$DIR/getvaliddaemons.php $ARGSG 2>/dev/null | grep -v "FUSE_EDEADLK"`
+
+echo "DAEMONS='${DAEMONS}'"
 
 for f in $DAEMONS; do
 
-         echo -n "Starting $f...";
-        php $DIR/$f $ARGS
-        echo "DONE."
+    echo "Starting '$f' ..."
+    php $f $ARGSD 2>/dev/null | grep -v "FUSE_EDEADLK"
+    echo "DONE."
+
 done