diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-02-16 17:19:15 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-02-16 17:19:15 +0000 |
| commit | 38bf6ec721f7d71e6e0477e029cde510bda85378 (patch) | |
| tree | c9d9a72608e5ab2c2edb5363f3c8601b2f52efef /scripts | |
| parent | 6aa14c4889e2a85acf4c2ed343694152f7a7051e (diff) | |
| parent | 3b9953647e49883d64d6f205e2ec05c2440a301f (diff) | |
| download | rabbitmq-server-git-38bf6ec721f7d71e6e0477e029cde510bda85378.tar.gz | |
Merge branch 'master' into rabbitmq-auth-backend-uaa-3
Diffstat (limited to 'scripts')
| -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!" ^
|