X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=scripts%2Fzookeeper.sh;fp=scripts%2Fzookeeper.sh;h=329f175b5f68d197f98ff511cf55e00ca1269a2b;hp=49ba07306a41e370a7e4b8e9bb303ab4dcd14d6d;hb=c3f71a6099135f56df667cd08978a09cc245e899;hpb=cae5457efc013e27f60cc3e928ca64f51febc33b

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