From b5192e03d789a6a334f40993093451ff18b25bbc Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 25 Sep 2012 23:20:09 +0200 Subject: [PATCH] fixed bad output in stopYACY.sh --- stopYACY.sh | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/stopYACY.sh b/stopYACY.sh index 2385ad0d0..7473a1ee5 100755 --- a/stopYACY.sh +++ b/stopYACY.sh @@ -1,38 +1,11 @@ #!/bin/sh cd `dirname $0` -if [ -x `which wget` ] -then - bin/apicall.sh "Steering.html?shutdown=true" +bin/apicall.sh "Steering.html?shutdown=true" > /dev/null echo "Please wait until the YaCy daemon process terminates [wget]" echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'" -elif [ -x `which curl` ] -then - bin/apicall.sh "Steering.html?shutdown=true" - -echo "Please wait until the YaCy daemon process terminates [curl]" -echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'" - -elif [ -x `which java` ] -then - # generating the proper classpath - CLASSPATH="" - for N in lib/*.jar; do CLASSPATH="$CLASSPATH$N:"; done - for N in libx/*.jar; do CLASSPATH="$CLASSPATH$N:"; done - - java -classpath classes:htroot:$CLASSPATH net.yacy.yacy -shutdown - - echo "Please wait until the YaCy daemon process terminates [java]" - echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'" - -else - port=`cat DATA/SETTINGS/yacy.conf |grep "^port="|sed "s/.*=//"` - echo "Neither wget nor java could be found or are not executable." - echo "Visit http://localhost:$port/Steering.html?shutdown=true to stop YaCy or (in emergency case) use ./killYACY.sh" -fi - # wait until the yacy.running file disappears which means that YaCy has terminated # If you don't want to wait, just run this concurrently while [ -f "DATA/yacy.running" ]