$NetBSD: patch-solr-bin,v 1.2 2021/12/18 15:34:20 jym Exp $ --- bin/solr.orig 2021-12-08 01:01:00.000000000 +0000 +++ bin/solr @@ -85,6 +85,7 @@ if [ -z "$SOLR_INCLUDE" ]; then /usr/share/solr/solr.in.sh \ /usr/local/share/solr/solr.in.sh \ /etc/default/solr.in.sh \ + @PKG_SYSCONFDIR@/solr.in.sh \ /opt/solr/solr.in.sh; do if [ -r "$include" ]; then SOLR_INCLUDE="$include" @@ -2289,13 +2290,13 @@ function start_solr() { echo "" fi # no lsof on cygwin though - if lsof -v 2>&1 | grep -q revision; then + if @PREFIX@/sbin/lsof -v 2>&1 | grep -q revision; then echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT" # Launch in a subshell to show the spinner (loops=0 while true do - running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN) + running=$(@PREFIX@/sbin/lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN) if [ -z "$running" ]; then slept=$((loops * 2)) if [ $slept -lt $SOLR_START_WAIT ]; then