From c3f71a6099135f56df667cd08978a09cc245e899 Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Fri, 29 Nov 2013 16:04:00 +0100 Subject: [PATCH] Add SOLR_HOME option --- scripts/zookeeper.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/zookeeper.sh b/scripts/zookeeper.sh index 49ba073..329f175 100755 --- a/scripts/zookeeper.sh +++ b/scripts/zookeeper.sh @@ -34,8 +34,12 @@ if [ "$SHARDS" == "" ] ; then fi if [ "$ZOOKEEPER" == "yes" ] ; then ZKRUN="-DzkRun -DnumShards=${SHARDS}" -fi -OPTIONS=" -Djetty.port=$PORT ${BOOTSTRAP_OPT} -Dcollection.configName=$NAME ${ZKRUN} -DzkHost=${ZKHOSTS} " +fi +if [ "${SOLR_HOME}" != "" ] ; then + SOLR_HOME_OPT="-Dsolr.solr.home=${SOLR_HOME}" +fi + +OPTIONS=" $SOLR_HOME_OPT -Djetty.port=$PORT ${BOOTSTRAP_OPT} -Dcollection.configName=$NAME ${ZKRUN} -DzkHost=${ZKHOSTS} " if [ "$1" == "start" ]; then if [ -f "${PID_FILE}" ] ; then echo "pid file ${PID_FILE} exists. Already running?" -- 1.7.10.4