From: Dennis Schafroth <dennis@schafroth.com>
Date: Fri, 29 Nov 2013 15:04:00 +0000 (+0100)
Subject: Add SOLR_HOME option
X-Git-Tag: v0.6.0~6^2~2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=c3f71a6099135f56df667cd08978a09cc245e899;p=lui-solr.git

Add SOLR_HOME option
---

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?"