diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-02-09 17:42:54 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-02-09 17:42:54 +0300 |
| commit | b685d8cb929c60a84fd1d469891dd0b90884e2ab (patch) | |
| tree | d0ffcab6a25c07725c1a0e073a1573deb99bfcbf | |
| parent | 8cbdf0e8b449815d6c10a73e619880228a8e9434 (diff) | |
| parent | c2fc3f2187aa2ae45853aa4bd89e628685909630 (diff) | |
| download | rabbitmq-server-git-b685d8cb929c60a84fd1d469891dd0b90884e2ab.tar.gz | |
Merge branch 'master' into rabbitmq-auth-backend-ldap-59
| -rw-r--r-- | scripts/rabbitmq-server.bat | 8 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 5da2ac5632..de25f95bdf 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -93,9 +93,9 @@ if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" ( )
) else if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (
set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE_NOEX!" ^
- -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
- -conf_schema_dir !RABBITMQ_SCHEMA_DIR!
+ -conf_schema_dir "!RABBITMQ_SCHEMA_DIR!"
if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
@@ -106,9 +106,9 @@ if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" ( set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
) else if exist "!RABBITMQ_CONFIG_FILE!.conf" (
set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
- -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
- -conf_schema_dir !RABBITMQ_SCHEMA_DIR!
+ -conf_schema_dir "!RABBITMQ_SCHEMA_DIR!"
if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 6390324f0c..624d18d913 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -182,9 +182,9 @@ if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" ( )
) else if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (
set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE_NOEX!" ^
- -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
- -conf_schema_dir !RABBITMQ_SCHEMA_DIR!
+ -conf_schema_dir "!RABBITMQ_SCHEMA_DIR!"
if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
@@ -197,9 +197,9 @@ if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" ( rem Always specify generated config arguments, we cannot
rem assume .conf file is available
set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
- -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
- -conf_schema_dir !RABBITMQ_SCHEMA_DIR!
+ -conf_schema_dir "!RABBITMQ_SCHEMA_DIR!"
if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
|