Merge branch 'master' of gitorious.org:social/mainline into social-master

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

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index b4a3725d8dcfba215f1785c87e001b0b82879309..274f0903e25a75ad1c5ff5347333b06818625885 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -20,20 +20,28 @@
 # This program tries to stop the daemons for GNU social that were
 # previously started by startdaemons.sh
 
+ARGSG=
 SITENAME=
 SITE=
 ID="*"
 
+# stopdaemons.sh [server [path]]
+
 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=`$SDIR/getpiddir.php $SITE`
 
-DAEMONS=`$SDIR/getvaliddaemons.php`
+DAEMONS=`$SDIR/getvaliddaemons.php $ARGSG`
 
 for f in $DAEMONS; do
     f=$(basename $f .php)