check for running zebra before starting zebrasrv

[irspy-moved-to-github.git] / zebra / Makefile

diff --git a/zebra/Makefile b/zebra/Makefile
index dab1639..35a4a25 100644 (file)
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -53,19 +53,31 @@ dump:
 clean:
        rm -f terse.properties
 
-start-zebra:
-       zebrasrv-2.0 -f yazserver.xml > ${ZEBRA_LOGFILE} 2>&1 &
+check-running-zebrasrv:
+       @if zoomsh  -e "open localhost:8018"  "quit" >/dev/null; then \
+          echo ""; \
+          echo "There is already a running zebrasrv on localhost:8018"; \
+          echo "You may need to run: killall zebrasrv-2.0"; \
+          false; \
+       else \
+          true; \
+       fi
+
+start-zebra: check-running-zebrasrv
+       zebrasrv-2.0 -f $$(pwd)/yazserver.xml > ${ZEBRA_LOGFILE} 2>&1 &
 
 stop-zebra:
        kill `cat ${ZEBRA_PID_FILE}`
        sleep 0.5
        -kill -9 `cat ${ZEBRA_PID_FILE}`
 
+check: newdb start-zebra dump stop-zebra distclean
+       
 distclean: clean
        rm -rf ${IRSPY_ARCHIVE} ${ZEBRA_DIR} ${ZEBRA_DIR} ${ZEBRA_TEST_DIR} ${ZEBRA_LOGFILE}
 
 help:
-       @echo "make [ dump | test | newdb | newdb-test ]"
+       @echo "make [ newdb | newdb-test | dump | check ]"
        @echo "     [ start-zebra | stop-zebra ]"
        @echo "     [ clean | distclean ]"