Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

* '0.8.x' of git@gitorious.org:laconica/dev:
  add args to daemons fetch
  pass through server and path args to daemons

1 files changed, 12 insertions, 2 deletions

diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 053c4f8ee..7609abec4 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -20,12 +20,22 @@
 # This program tries to start the daemons for Laconica.
 # Note that the 'maildaemon' needs to run as a mail filter.
 
+ARGS=
+
+if [ $# -gt 0 ]; then
+    ARGS="$ARGS -s$1"
+fi
+
+if [ $# -gt 1 ]; then
+    ARGS="$ARGS -p$2"
+fi
+
 DIR=`dirname $0`
-DAEMONS=`php $DIR/getvaliddaemons.php`
+DAEMONS=`php $DIR/getvaliddaemons.php $ARGS`
 
 for f in $DAEMONS; do
 
          echo -n "Starting $f...";
-	 php $DIR/$f
+	 php $DIR/$f $ARGS
 	 echo "DONE."
 done