Apache Solr open-source search software
SOLR-16619: Fix `solr` script for IBM i (#1287)
Jesse Gorzinskib191650b4ae9
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 0e2ced23f83..881ab7335b0 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -252,6 +252,8 @@ Bug Fixes* SOLR-16848: Flaky DeleteReplicaTest.raceConditionOnDeleteAndRegisterReplica (Alex Deparvu, Paul McArthur)+* SOLR-16619: Fix solr scripts running on IBM i (Jesse Gorzinski via Eric Pugh)+Dependency Upgrades---------------------* PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)diff --git a/solr/bin/solr b/solr/bin/solrindex fbb4842f06b..3f5df81421b 100644--- a/solr/bin/solr+++ b/solr/bin/solr@@ -746,7 +746,7 @@ function solr_pid_by_port() {# extract the value of the -Djetty.port parameter from a running Solr processfunction jetty_port() {SOLR_PID="$1"- SOLR_PROC=$(ps -o command='' -p "$SOLR_PID" | grep start\.jar | grep jetty\.port)+ SOLR_PROC=$(ps -f -p "$SOLR_PID" | grep start\.jar | grep jetty\.port)IFS=' ' read -a proc_args <<< "$SOLR_PROC"for arg in "${proc_args[@]}"do