Merge branch '0.7.x' into 0.8.x

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

diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 6cb0108000bac3fbb9179f45f307af85cb9e0922..c3729761d06a65f63455b76fc6df1d12e702d58a 100755 (executable)
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -20,11 +20,13 @@
 # This program tries to start the daemons for Laconica.
 # Note that the 'maildaemon' needs to run as a mail filter.
 
-export INSTALLDIR=$1
+DIR=`dirname $0`
 
-for f in xmppdaemon.php xmppqueuehandler.php publicqueuehandler.php \
-         xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php; do
-        
-        php $INSTALLDIR/scripts/$f;
+for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
+         xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
+         twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php; do
 
+         echo -n "Starting $f...";
+        php $DIR/$f
+        echo "DONE."
 done