[solr] branch main updated: SOLR-16981: bin/solr stop withuot argument should behave the same even if SOLR_PORT is set (#1924)

[ep...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 6f4cf56c83f SOLR-16981: bin/solr stop withuot argument should behave the same even if SOLR_PORT is set (#1924)
6f4cf56c83f is described below

commit 6f4cf56c83f563deb6d03e47223c3a7bbcc31a5c
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Fri Sep 15 13:07:43 2023 +0200

    SOLR-16981: bin/solr stop withuot argument should behave the same even if SOLR_PORT is set (#1924)
---
 solr/bin/solr | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
old mode 100644
new mode 100755
index cc72f621094..a532fc7ca58
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -147,8 +147,6 @@ fi
 : "${SOLR_STOP_WAIT:=180}"
 : "${SOLR_START_WAIT:=$SOLR_STOP_WAIT}" # defaulting to $SOLR_STOP_WAIT for backwards compatibility reasons
 
-# Store whether a solr port was explicitly provided, for the "solr stop" command.
-PROVIDED_SOLR_PORT="${SOLR_PORT:-}"
 : "${SOLR_PORT:=8983}"
 export SOLR_PORT
 
@@ -412,7 +410,7 @@ function print_usage() {
     echo ""
   elif [ "$CMD" == "stop" ]; then
     echo ""
-    echo "Usage: solr stop [-k key] [-p port] [-V]"
+    echo "Usage: solr stop [-k key] [-p port] [-all] [-V]"
     echo ""
     echo "  -k <key>      Stop key; default is solrrocks"
     echo ""