[solr] branch branch_9x updated: SOLR-16619: Fix `solr` script for IBM i (#1287)

[ep...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new f3a9b1da398 SOLR-16619: Fix `solr` script for IBM i (#1287)
f3a9b1da398 is described below

commit f3a9b1da39811d0388e16ef9f35d41423fb6a7a4
Author: Jesse Gorzinski <17...@users.noreply.github.com>
AuthorDate: Wed Jun 28 15:48:26 2023 -0500

    SOLR-16619: Fix `solr` script for IBM i (#1287)
    
    * Change `ps` invocation to work on more platforms
    
    ---------
    
    Co-authored-by: Eric Pugh <ep...@opensourceconnections.com>
---
 solr/CHANGES.txt | 2 ++
 solr/bin/solr    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bb546459027..1e43fe964ba 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -222,6 +222,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/solr
index 331e6c0a3dc..0db45a080d2 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 process
 function 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