(solr) branch branch_9x updated: Parse long format for auth command (#2760)

[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 de3db3ab1de Parse long format for auth command (#2760)
de3db3ab1de is described below

commit de3db3ab1deba52d62be75775f0a456737018362
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Tue Oct 15 07:05:59 2024 -0400

    Parse long format for auth command (#2760)
    
    (cherry picked from commit 6fb78ae1c25f9ae618154bbac06bd737fd7a3fbd)
---
 solr/bin/solr.cmd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index b05f644e6f6..b862345e57c 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1832,11 +1832,11 @@ for %%a in (%*) do (
       if "!arg:~0,1!" equ "-" set "option=!arg!"
    ) else (
       set "option!option!=%%a"
-      if "!option!" equ "-d" set "SOLR_SERVER_DIR=%%a"
-      if "!option!" equ "--server-dir" set "SOLR_SERVER_DIR=%%a"
       if "!option!" equ "-s" set "SOLR_HOME=%%a"
-      if "!option!" equ "--solr-home" set "SOLR_HOME=%%a"      
-      if not "!option!" equ "-s" if not "!option!" equ "-d" (
+      if "!option!" equ "--solr-home" set "SOLR_HOME=%%a"        
+      if "!option!" equ "-d" set "SOLR_SERVER_DIR=%%a"
+      if "!option!" equ "--server-dir" set "SOLR_SERVER_DIR=%%a"    
+      if not "!option!" equ "-s" if not "!option!" equ "--solr-home" if not "!option!" equ "-d" if not "!option!" equ "--server-dir" (
         set "AUTH_PARAMS=!AUTH_PARAMS! !option! %%a"
       )
       set "option="