Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Parse long format for auth command (#2760)

Eric Pugh6fb78ae1c25f
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index f4f3d927fc0..846433022c5 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1519,11 +1519,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="