From e538aa227ba307f65ee45868d230bffb71c02ec7 Mon Sep 17 00:00:00 2001 From: Nishant Bangarwa Date: Thu, 21 Dec 2017 09:08:09 +0530 Subject: [PATCH] use java pointed by JAVA_HOME if JAVA_HOME is explicitly set (#5186) --- examples/bin/node.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/bin/node.sh b/examples/bin/node.sh index 86a51dc0f74..32676bc9452 100644 --- a/examples/bin/node.sh +++ b/examples/bin/node.sh @@ -40,7 +40,13 @@ case $command in fi if [ ! -d "$PID_DIR" ]; then mkdir -p $PID_DIR; fi if [ ! -d "$LOG_DIR" ]; then mkdir -p $LOG_DIR; fi - nohup java `cat $CONF_DIR/$nodeType/jvm.config | xargs` -cp $CONF_DIR/_common:$CONF_DIR/$nodeType:$LIB_DIR/*:$HADOOP_CONF_DIR io.druid.cli.Main server $nodeType >> $LOG_DIR/$nodeType.log & + + JAVA=java + if [ "$JAVA_HOME" != "" ]; then + JAVA=$JAVA_HOME/bin/java + fi + + nohup $JAVA `cat $CONF_DIR/$nodeType/jvm.config | xargs` -cp $CONF_DIR/_common:$CONF_DIR/$nodeType:$LIB_DIR/*:$HADOOP_CONF_DIR io.druid.cli.Main server $nodeType >> $LOG_DIR/$nodeType.log 2>&1 & nodeType_PID=$! echo $nodeType_PID > $pid echo "Started $nodeType node ($nodeType_PID)"