support in bin/solr scirpts, reorg the param details

Author: epugh

solr/bin/solr

@@ -407,12 +407,6 @@ function print_usage() {
     echo "  --data-home <dir>     Sets the solr.data.home system property, where Solr will store index data in <instance_dir>/data subdirectories."
     echo "                          If not set, Solr uses solr.solr.home for config and data."
     echo ""
-    echo "  -e/--example <name>   Name of the example to run; available examples:"
-    echo "      cloud:              SolrCloud example"
-    echo "      techproducts:       Comprehensive example illustrating many of Solr's core capabilities"
-    echo "      schemaless:         Schema-less example (schema is inferred from data during indexing)"
-    echo "      films:              Example of starting with _default configset and adding explicit fields dynamically"
-    echo ""
     echo "  --jvm-opts <jvmParams> Additional parameters to pass to the JVM when starting Solr, such as to setup"
     echo "                          Java debug options. For example, to enable a Java debugger to attach to the Solr JVM"
     echo "                          you could pass: --jvm-opts \"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=18983\""
@@ -423,7 +417,15 @@ function print_usage() {
     echo "                          you could pass: -j \"--include-jetty-dir=/etc/jetty/custom/server/\""
     echo "                          In most cases, you should wrap the additional parameters in double quotes."
     echo ""
-    echo "  -y/--no-prompt        Don't prompt for input; accept all defaults when running examples that accept user input"
+    echo "  -e/--example <name>   Name of the example to run; available examples:"
+    echo "      cloud:              SolrCloud example"
+    echo "      techproducts:       Comprehensive example illustrating many of Solr's core capabilities"
+    echo "      schemaless:         Schema-less example (schema is inferred from data during indexing)"
+    echo "      films:              Example of starting with _default configset and adding explicit fields dynamically"
+    echo ""
+    echo "  -y/--no-prompt        Don't prompt for input; accept all defaults when running examples that accept user input."
+    echo ""
+    echo "  --prompt <values>     Don't prompt for input; comma delimited list of inputs read when running examples that accept user input."
     echo ""
     echo "  --force               If attempting to start Solr as the root user, the script will exit with a warning that running Solr as \"root\" can cause problems."
     echo "                          It is possible to override this warning with the '--force' parameter."

solr/bin/solr.cmd

@@ -325,12 +325,6 @@ goto err
 @echo   --data-home dir Sets the solr.data.home system property, where Solr will store index data in ^<instance_dir^>/data subdirectories.
 @echo                   If not set, Solr uses solr.solr.home for both config and data.
 @echo.
-@echo   -e/--example name Name of the example to run; available examples:
-@echo       cloud:          SolrCloud example
-@echo       techproducts:   Comprehensive example illustrating many of Solr's core capabilities
-@echo       schemaless:     Schema-less example (schema is inferred from data during indexing)
-@echo       films:          Example of starting with _default configset and defining explicit fields dynamically
-@echo.
 @echo   --jvm-opts opts Additional parameters to pass to the JVM when starting Solr, such as to setup
 @echo                 Java debug options. For example, to enable a Java debugger to attach to the Solr JVM
 @echo                 you could pass: --jvm-opts "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=18983"
@@ -341,8 +335,16 @@ goto err
 @echo                 you could pass: -j "--include-jetty-dir=/etc/jetty/custom/server/"
 @echo                 In most cases, you should wrap the additional parameters in double quotes.
 @echo.
+@echo   -e/--example name Name of the example to run; available examples:
+@echo       cloud:          SolrCloud example
+@echo       techproducts:   Comprehensive example illustrating many of Solr's core capabilities
+@echo       schemaless:     Schema-less example (schema is inferred from data during indexing)
+@echo       films:          Example of starting with _default configset and defining explicit fields dynamically
+@echo.
 @echo   -y/--no-prompt Don't prompt for input; accept all defaults when running examples that accept user input
 @echo.
+@echo   --prompt <values>  Don't prompt for input; comma delimited list of inputs read when running examples that accept user input."
+@echo.
 @echo   --verbose and -q/--quiet Verbose or quiet logging. Sets default log level to DEBUG or WARN instead of INFO
 @echo.
 goto done
@@ -399,6 +401,7 @@ IF "%1"=="-j" goto set_addl_jetty_config
 IF "%1"=="--jettyconfig" goto set_addl_jetty_config
 IF "%1"=="-y" goto set_noprompt
 IF "%1"=="--no-prompt" goto set_noprompt
+IF "%1"=="--prompt" goto set_prompt
 
 REM Skip stop arg parsing if not stop command
 IF NOT "%SCRIPT_CMD%"=="stop" goto parse_general_args
@@ -695,6 +698,12 @@ set "PASS_TO_RUN_EXAMPLE=--no-prompt !PASS_TO_RUN_EXAMPLE!"
 SHIFT
 goto parse_args
 
+:set_prompt
+set "PASS_TO_RUN_EXAMPLE=--prompt %~2 !PASS_TO_RUN_EXAMPLE!"
+
+SHIFT
+goto parse_args
+
 REM Handle invalid arguments passed to special commands (start, stop, restart)
 :invalid_cmd_line
 @echo.