Merge commit 'refs/merge-requests/25' of https://gitorious.org/social/mainline into...

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 35841b64a85008e8dc509220b3bcbc487fcd271f..ca2f4d1541e17f5680da3ce5056b630cbbfb6236 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -20,6 +20,7 @@
 # This program tries to stop the daemons for GNU social that were
 # previously started by startdaemons.sh
 
+ARGSG=
 SITENAME=
 SITE=
 ID="*"
@@ -28,12 +29,17 @@ if [ $# -gt 0 ] ; then
        SITENAME="$1"
        SITE="-s$SITENAME"
        ID=`echo $SITENAME | sed s/\\\\./_/g`
+       ARGSG="$ARGSG -s$1"
+fi
+
+if [ $# -gt 1 ]; then
+       ARGSG="$ARGSG -p$2"
 fi
 
 SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php $SITE`
 
-DAEMONS=`php $SDIR/getvaliddaemons.php`
+DAEMONS=`php $SDIR/getvaliddaemons.php $ARGSG`
 
 for f in $DAEMONS; do
     f=$(basename $f .php)