Add SOLR_HOME option

diff --git a/scripts/zookeeper.sh b/scripts/zookeeper.sh
index 49ba073..329f175 100755 (executable)
--- 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
 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?"
 if [ "$1" == "start" ]; then 
     if [ -f "${PID_FILE}" ] ; then 
        echo "pid file ${PID_FILE} exists. Already running?"