- moved test data from /bin to /test/words

- refactoring of stopYACY.sh by introduction of /bin/apicall which is able to call any api file with attached authorization

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6691 6c8d7289-2bf4-0310-a012-ef5d649a1542

bin/apicall.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+cd "`dirname $0`"
+port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
+pw=$(grep ^adminAccountBase64MD5= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
+
+if which curl &>/dev/null; then
+  curl -s --header "Authorization: realm=$pw" "http://localhost:$port/$1" > /dev/null
+elif which wget &>/dev/null; then
+  wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" "http://localhost:$port/$1" -O /dev/null
+else
+  exit 1
+fi

bin/searchtestmulti.sh

@@ -1,22 +1,22 @@
 #!/bin/sh
 cd "`dirname $0`"
-./searchtest.sh searchtest.words.aa &
+./searchtest.sh ../test/words/searchtest.words.aa &
 sleep 1
-./searchtest.sh searchtest.words.ab &
+./searchtest.sh ../test/words/searchtest.words.ab &
 sleep 1
-./searchtest.sh searchtest.words.ac &
+./searchtest.sh ../test/words/searchtest.words.ac &
 sleep 1
-./searchtest.sh searchtest.words.ad &
+./searchtest.sh ../test/words/searchtest.words.ad &
 sleep 1
-./searchtest.sh searchtest.words.ae &
+./searchtest.sh ../test/words/searchtest.words.ae &
 sleep 1
-./searchtest.sh searchtest.words.af &
+./searchtest.sh ../test/words/searchtest.words.af &
 sleep 1
-./searchtest.sh searchtest.words.ag &
+./searchtest.sh ../test/words/searchtest.words.ag &
 sleep 1
-./searchtest.sh searchtest.words.ah &
+./searchtest.sh ../test/words/searchtest.words.ah &
 sleep 1
-./searchtest.sh searchtest.words.ai &
+./searchtest.sh ../test/words/searchtest.words.ai &
 sleep 1
-./searchtest.sh searchtest.words.aj &
+./searchtest.sh ../test/words/searchtest.words.aj &
 

stopYACY.sh

@@ -3,9 +3,7 @@ cd `dirname $0`
 
 if [ -x `which wget` ]
 then
-	port=`cat DATA/SETTINGS/yacy.conf |grep "^port="|sed "s/.*=//"`
+	bin/apicall.sh "Steering.html?shutdown=true"
-	pw=`cat DATA/SETTINGS/yacy.conf |grep "^adminAccountBase64MD5="|sed "s/.*=//"`
-	wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" http://localhost:$port/Steering.html?shutdown=true -O /dev/null
 
 echo "Please wait until the YaCy daemon process terminates"
 echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'"

updateYACY.sh

@@ -3,9 +3,7 @@ cd `dirname $0`
 
 if [ -x `which wget` ]
 then
-	port=`cat DATA/SETTINGS/yacy.conf |grep "^port="|sed "s/.*=//"`
+	bin/apicall.sh "ConfigUpdate_p.html?autoUpdate="
-	pw=`cat DATA/SETTINGS/yacy.conf |grep "^adminAccountBase64MD5="|sed "s/.*=//"`
-	wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" http://localhost:$port/ConfigUpdate_p.html?autoUpdate= -O /dev/null
 
 elif [ -x `which java` ]
 then