diff options
Diffstat (limited to 'addon')
| -rw-r--r-- | addon/yacy-svn-4.spec | 3 | ||||
| -rw-r--r-- | addon/yacyInit.m4 | 2 | ||||
| -rwxr-xr-x | addon/yacyInit.sh | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/addon/yacy-svn-4.spec b/addon/yacy-svn-4.spec index ef633707c..717e32045 100644 --- a/addon/yacy-svn-4.spec +++ b/addon/yacy-svn-4.spec @@ -174,8 +174,6 @@ fi if [ -f \$DATA_HOME/SETTINGS/yacy.conf ]; then i=\`grep javastart_Xmx \$DATA_HOME/SETTINGS/yacy.conf\`; JAVA_MAX="-\${i#javastart_Xmx=}"; - i=\`grep javastart_Xms \$DATA_HOME/SETTINGS/yacy.conf\`; - JAVA_MIN="-\${i#javastart_Xms=}"; fi CLASSPATH="\$YACY_HOME/classes:." @@ -194,7 +192,6 @@ fi WTF=\$1; shift if [ "\$1" == "--max" ]; then JAVA_MAX="-Xmx\$2"; shift; shift; fi -if [ "\$1" == "--min" ]; then JAVA_MIN="-Xms\$2"; shift; shift; fi if [ "\$1" == "--nice" ]; then NICE="nice -n \$2"; shift; shift; fi if [ "\$1" == "--debug" ]; then DEBUG="-d"; shift; fi shift diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4 index b165f36ea..5a114ea97 100644 --- a/addon/yacyInit.m4 +++ b/addon/yacyInit.m4 @@ -110,7 +110,7 @@ then fi else - JAVA_ARGS="-Xmx120m -Xms120m $JAVA_ARGS" + JAVA_ARGS="-Xmx120m $JAVA_ARGS" fi # generating the proper classpath diff --git a/addon/yacyInit.sh b/addon/yacyInit.sh index 2ec6fb548..18100bc32 100755 --- a/addon/yacyInit.sh +++ b/addon/yacyInit.sh @@ -39,10 +39,8 @@ JAVA_ARGS="-Djava.awt.headless=true" if [ -f DATA/SETTINGS/yacy.conf ] then # startup memory - for i in Xmx Xms; do - j="`grep javastart_$i DATA/SETTINGS/yacy.conf | sed 's/^[^=]*=//'`"; - if [ -n $j ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi; - done + j="`grep javastart_Xmx DATA/SETTINGS/yacy.conf | sed 's/^[^=]*=//'`"; + if [ -n $j ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi; # Priority j="`grep javastart_priority DATA/SETTINGS/yacy.conf | sed 's/^[^=]*=//'`"; |