github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix setup_java so $JAVA_HOME can be used.

Browse source
This commit is contained in:
Marc Chadwick 2014-03-20 12:37:00 -04:00
parent f0fb74877d
commit 5187857b4f
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/logstash.lib.sh
View file

@ -16,10 +16,10 @@ setup_ruby() {
setup_java() {
if [ -z "$JAVACMD" ] ; then
if [ -z "$JAVA_HOME/bin/java" ] ; then
if [ -n "$JAVA_HOME" ] ; then
JAVACMD="$JAVA_HOME/bin/java"
else
JAVACMD="java"
JAVACMD="$(which java 2> /dev/null)"
fi
elif [ "$(basename $JAVACMD)" = "drip" ] ; then
export DRIP_INIT_CLASS="org.jruby.main.DripMain"
@ -27,11 +27,8 @@ setup_java() {
fi
if [ ! -x "$JAVACMD" ] ; then
JAVACMD="$(which $JAVACMD 2> /dev/null)"
if [ ! -x "$JAVACMD" ] ; then
echo "Could not find any executable java binary (tried '$JAVACMD'). Please install java in your PATH or set JAVA_HOME."
exit 1
fi
echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME."
exit 1
fi
JAVA_OPTS="$JAVA_OPTS -Xmx${LS_HEAP_SIZE}"