Configuration cleanup for Solr 5 - mostly cleaning up solrconfig.xml

[lui-solr.git] / scripts / zookeeper.sh

diff --git a/scripts/zookeeper.sh b/scripts/zookeeper.sh
index 49ba073..50491e4 100755 (executable)
--- a/scripts/zookeeper.sh
+++ b/scripts/zookeeper.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 NAME="indexdata-lui-solr-zookeeper"
 HOST=localhost
@@ -34,19 +34,28 @@ 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?"
-       exit 1
+    else
+       java $OPTIONS  -jar start.jar > $LOG_FILE & 
+       echo $! > ${PID_FILE}
     fi
-    java $OPTIONS  -jar start.jar > $LOG_FILE & 
-    echo $! > ${PID_FILE}
 elif [ "$1" == "stop" ]; then 
     if [ -f "${PID_FILE}" ] ; then 
-       kill `cat ${PID_FILE}`
-       rm ${PID_FILE}
+       PID="`/bin/cat ${PID_FILE}`"
+       if [ "$PID" != "" ] ; then
+           kill $PID
+           /bin/rm ${PID_FILE}
+       else
+           echo "Unable to extract PID from ${PID_FILE}" 
+       fi
     else
        echo "No pid file ($PID_FILE) found"
     fi