mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 08:11:50 -04:00
2b1e7456fb
Version 9 has breaking changes which makes it impossible to do a simple
upgrade.
Using an extra ports makes sure to not break installation with
solr version 8.
Copied from b224cb40ad.
31 lines
1.1 KiB
Text
31 lines
1.1 KiB
Text
--- bin/solr.orig 2022-04-25 20:37:26 UTC
|
|
+++ bin/solr
|
|
@@ -2269,13 +2269,12 @@ function start_solr() {
|
|
echo ""
|
|
fi
|
|
# no lsof on cygwin though
|
|
- if 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=$(sockstat -ls -P tcp -p $SOLR_PORT | grep LISTEN)
|
|
if [ -z "${running:-}" ]; then
|
|
slept=$((loops * 2))
|
|
if [ $slept -lt $SOLR_START_WAIT ]; then
|
|
@@ -2293,13 +2292,6 @@ function start_solr() {
|
|
fi
|
|
done) &
|
|
spinner $!
|
|
- else
|
|
- echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT."
|
|
- sleep 10
|
|
- SOLR_PID=`ps auxww | grep start\.jar | awk "/\-Djetty\.port=$SOLR_PORT/"' {print $2}' | sort -r`
|
|
- echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
|
|
- return;
|
|
- fi
|
|
fi
|
|
}
|
|
|