*) startYACY.sh is compatible with OpenSolaris now (see http://forum.yacy-websuche.de/viewtopic.php?t=203 for details)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4007 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
low012 2007-07-27 21:56:49 +00:00
parent 8d6aa7a66d
commit d36786bf37
2 changed files with 89 additions and 10 deletions

67
source/truncate.java Normal file
View File

@ -0,0 +1,67 @@
// truncate.java
// -----------------------
// part of YaCy
// (C) by Michael Peter Christen; mc@anomic.de
// first published on http://www.anomic.de
// Frankfurt, Germany, 2004
//
// This File is contributed by Marc Nause
//
// $LastChangedDate: 2007-07-27 $
// $LastChangedRevision: 4007 $
// $LastChangedBy: low012 $
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// Using this software in any meaning (reading, learning, copying, compiling,
// running) means that you agree that the Author(s) is (are) not responsible
// for cost, loss of data or any harm that may be caused directly or indirectly
// by usage of this softare or this documentation. The usage of this software
// is on your own risk. The installation and usage (starting/running) of this
// software may allow other people or application to access your computer and
// any attached devices and is highly dependent on the configuration of the
// software which must be done by the user of the software; the author(s) is
// (are) also not responsible for proper configuration and usage of the
// software, even if provoked by documentation provided together with
// the software.
//
// Any changes to this file according to the GPL as documented in the file
// gpl.txt aside this file in the shipment you received can be done to the
// lines that follows this copyright notice here, but changes must not be
// done inside the copyright notive above. A re-distribution must contain
// the intact and unchanged copyright notice.
// Contributions and changes to the program code must be marked as such.
/* This program is a replacement of the ${variable#pattern} shell command of
bash. This program does _not_ understand regular expressions!
It is needed for operating systems which standard shell does not understand
the command. Take a look at startYACY.sh if you want to know where it is used.
*/
public final class truncate {
public static void main (String[] args) {
if (args.length == 2) {
if(args[0].startsWith(args[1])) {
System.out.println(args[0].substring(args[1].length()));
}
}
}
}

View File

@ -1,9 +1,10 @@
#!/bin/sh
JAVA="`which java`"
LOGFILE="yacy.log"
OS="`uname`"
#check if OS is Sun Solaris or one of the OpenSolaris distributions and use different version of id if necessary
if [ "`uname`" = "SunOS" ]
if [ $OS = "SunOS" ]
then
# only this version of id supports the parameter -u
ID="/usr/xpg4/bin/id"
@ -74,6 +75,12 @@ done
#echo $options;exit 0 #DEBUG for getopts
# 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
CLASSPATH="classes:.:htroot:$CLASSPATH"
#get javastart args
java_args=""
if [ -f DATA/SETTINGS/httpProxy.conf ]
@ -81,13 +88,25 @@ then
# startup memory
for i in Xmx Xms; do
j=`grep javastart_$i DATA/SETTINGS/httpProxy.conf`;
j="${j#javastart_$i=}";
if [ $OS = "SunOS" ]
then
j=`$JAVA -classpath $CLASSPATH truncate "$j" "javastart_$i="`;
else
j="${j#javastart_$i=}";
fi
if [ -n $j ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi;
done
# Priority
j=`grep javastart_priority DATA/SETTINGS/httpProxy.conf`;
j="${j#javastart_priority=}"
if [ $OS = "SunOS" ]
then
j=`$JAVA -classpath $CLASSPATH truncate "$j" "javastart_priority="`;
else
j="${j#javastart_priority=}"
fi
if [ ! -z "$j" ];then
if [ -n $j ]; then JAVA="nice -n $j $JAVA"; fi;
fi
@ -100,13 +119,6 @@ fi
#echo "JAVA_ARGS: $JAVA_ARGS"
#echo "JAVA: $JAVA"
# 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
CLASSPATH="classes:.:htroot:$CLASSPATH"
cmdline="";
if [ $DEBUG -eq 1 ] #debug
then