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

[ja...@apache.org]

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

janhoy 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 2d34a78337a Revert "SOLR-16981: bin/solr stop withuot argument should behave the same even if SOLR_PORT is set (#1924)" (#1929)
2d34a78337a is described below

commit 2d34a78337a32df7fe77de7cfa5af366d2e97803
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Sat Sep 16 13:56:15 2023 -0400

    Revert "SOLR-16981: bin/solr stop withuot argument should behave the same even if SOLR_PORT is set (#1924)" (#1929)
    
    This reverts commit 6f4cf56c83f563deb6d03e47223c3a7bbcc31a5c.
---
 solr/bin/solr | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/bin/solr b/solr/bin/solr
old mode 100755
new mode 100644
index a532fc7ca58..cc72f621094
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -147,6 +147,8 @@ 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
 
@@ -410,7 +412,7 @@ function print_usage() {
     echo ""
   elif [ "$CMD" == "stop" ]; then
     echo ""
-    echo "Usage: solr stop [-k key] [-p port] [-all] [-V]"
+    echo "Usage: solr stop [-k key] [-p port] [-V]"
     echo ""
     echo "  -k <key>      Stop key; default is solrrocks"
     echo ""