further cleanup

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2696 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
allo 2006-10-02 15:52:20 +00:00
parent f0ed7f43c4
commit fda7031991

View File

@ -1,36 +1,26 @@
#!/bin/sh #!/bin/sh
if [ `id -u` -eq 0 ] JAVA="`which java`"
LOGFILE="yacy.log"
if [ "`id -u`" -eq 0 ]
then then
echo echo
echo "For security reasons you should not run this script as root!" echo "For security reasons you should not run this script as root!"
echo echo
exit 1 exit 1
elif [ ! -x "`which java`" ] elif [ ! -x "$JAVA" ]
then then
echo "The java command is not executable." echo "The java command is not executable."
echo "Either you have not installed java or it is not in your PATH" echo "Either you have not installed java or it is not in your PATH"
#echo "Has this script been invoked by CRON? Then use the -c option." #Cron supports setting the path in
#echo "Has this script been invoked by CRON?"
#echo "if so, please set PATH in the crontab, or set the correct path in the variable in this script."
exit 1 exit 1
fi fi
#-c to be imlemented.
#Possible locations for setting of PATH
#sh, ksh, bash, zsh
#. ~/.profile
#bash
#. ~/.bash_profile
#csh, tcsh
#. ~/.login
#sh, ksh, bash, zsh
#. /etc/profile
#csh, tcsh
#. /etc/csh.login
#startup YaCy #startup YaCy
cd `dirname $0` cd "`dirname $0`"
options=$(getopt -n YaCy -o d,l,p -- $@) options="`getopt -n YaCy -o d,l,p -- $@`"
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
exit 1; exit 1;
fi fi
@ -43,7 +33,7 @@ DEBUG=0
PRINTONLY=0 PRINTONLY=0
for option in $options;do for option in $options;do
if [ $isparameter -ne 1 ];then #option if [ $isparameter -ne 1 ];then #option
if [ x$option = "x-l" ];then if [ "$option" = "-l" ];then
LOGGING=1 LOGGING=1
if [ $DEBUG -eq 1 ];then if [ $DEBUG -eq 1 ];then
echo "can not combine -l and -d" echo "can not combine -l and -d"
@ -68,13 +58,13 @@ for option in $options;do
fi #parameter or option? fi #parameter or option?
done done
#echo $options;exit 0 #debug for getopts #echo $options;exit 0 #DEBUG for getopts
#get javastart args #get javastart args
java_args="" java_args=""
if [ -f DATA/SETTINGS/httpProxy.conf ] if [ -f DATA/SETTINGS/httpProxy.conf ]
then then
for i in $(grep javastart DATA/SETTINGS/httpProxy.conf);do for i in `grep javastart DATA/SETTINGS/httpProxy.conf`;do
i="${i#javastart_*=}"; i="${i#javastart_*=}";
JAVA_ARGS="-$i $JAVA_ARGS"; JAVA_ARGS="-$i $JAVA_ARGS";
done done
@ -82,12 +72,6 @@ fi
# generating the proper classpath # generating the proper classpath
CLASSPATH="" CLASSPATH=""
#prefix=$(dirname $0);
#if [ x$prefix = "x." ];then
# prefix="";
#else
# prefix="$prefix/"
#fi
for N in lib/*.jar; do CLASSPATH="$CLASSPATH$N:"; done for N in lib/*.jar; do CLASSPATH="$CLASSPATH$N:"; done
for N in libx/*.jar; do CLASSPATH="$CLASSPATH$N:"; done for N in libx/*.jar; do CLASSPATH="$CLASSPATH$N:"; done
CLASSPATH="classes:.:$CLASSPATH" CLASSPATH="classes:.:$CLASSPATH"
@ -96,30 +80,22 @@ CLASSPATH="classes:.:$CLASSPATH"
cmdline=""; cmdline="";
if [ $DEBUG -eq 1 ] #debug if [ $DEBUG -eq 1 ] #debug
then then
if [ $PRINTONLY -eq 1 ];then cmdline="$JAVA $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy"
echo java $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy
else
java $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy
fi
elif [ $LOGGING -eq 1 ];then #logging elif [ $LOGGING -eq 1 ];then #logging
if [ $PRINTONLY -eq 1 ];then cmdline="$JAVA $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy >> yacy.log &"
echo "java $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy >> yacy.log"
else
nohup java $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy >> yacy.log &
fi
else else
if [ $PRINTONLY -eq 1 ];then cmdline="$JAVA $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy > /dev/null &"
echo "java $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy > /dev/null" fi
else if [ $PRINTONLY -eq 1 ];then
nohup java $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy > /dev/null & echo $cmdline
#nohup java -Xms160m -Xmx160m -classpath $CLASSPATH yacy > /dev/null & else
echo "****************** YaCy Web Crawler/Indexer & Search Engine *******************" echo "****************** YaCy Web Crawler/Indexer & Search Engine *******************"
echo "**** (C) by Michael Peter Christen, usage granted under the GPL Version 2 ****" echo "**** (C) by Michael Peter Christen, usage granted under the GPL Version 2 ****"
echo "**** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/yacy ****" echo "**** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/yacy ****"
echo "** LOG of YaCy: DATA/LOG/yacy00.log (and yacy<xx>.log) **" echo "** LOG of YaCy: DATA/LOG/yacy00.log (and yacy<xx>.log) **"
echo "** STOP YaCy: execute stopYACY.sh and wait some seconds **" echo "** STOP YaCy: execute stopYACY.sh and wait some seconds **"
echo "** GET HELP for YaCy: see www.yacy-websearch.net/wiki and www.yacy-forum.de **" echo "** GET HELP for YaCy: see www.yacy-websearch.net/wiki and www.yacy-forum.de **"
echo "*******************************************************************************" echo "*******************************************************************************"
echo " >> YaCy started as daemon process. Administration at http://localhost:8080 <<" echo " >> YaCy started as daemon process. Administration at http://localhost:8080 << "
fi eval $cmdline
fi fi