diff options
| -rw-r--r-- | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 | ||||
| -rw-r--r-- | src/rabbit_config.erl | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 1aa6e91320..7963a407cb 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -49,7 +49,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!" -s rabbit_prelaunch ^
!RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9! ^
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
- -conf_gen_script "%TDP0%/cuttlefish" ^
+ -conf_gen_script "%~dp0/cuttlefish" ^
-extra "!RABBITMQ_NODENAME!"
if ERRORLEVEL 2 (
@@ -65,7 +65,7 @@ set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!" if exist "!RABBITMQ_CONFIG_FILE!.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_gen_script "%TDP0%/cuttlefish"
+ set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_gen_script "%~dp0/cuttlefish"
) else (
set RABBITMQ_CONFIG_ARG=
)
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 6b82c0dec1..a80cb3aa6d 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -120,7 +120,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!" -noinput -hidden ^
-s rabbit_prelaunch ^
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
- -conf_gen_script "%TDP0%/cuttlefish" ^
+ -conf_gen_script "%~dp0/cuttlefish" ^
!RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!
if ERRORLEVEL 3 (
@@ -138,7 +138,7 @@ if ERRORLEVEL 3 ( if exist "!RABBITMQ_CONFIG_FILE!.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_gen_script "%TDP0%/cuttlefish"
+ set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_gen_script "%~dp0/cuttlefish"
) else (
set RABBITMQ_CONFIG_ARG=
)
diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl index 2ceb11a27d..fae8d65842 100644 --- a/src/rabbit_config.erl +++ b/src/rabbit_config.erl @@ -34,9 +34,9 @@ generate_config_file(ConfFiles, ConfDir, ConfScript) -> SchemaFile = filename:join([filename:dirname(ConfScript), "rabbitmq.schema"]), GeneratedDir = filename:join([ConfDir, "generated"]), rabbit_file:recursive_delete([GeneratedDir]), - Command = lists:concat(["escript ", ConfScript, - " -f rabbitmq -i ", SchemaFile, - " -e ", ConfDir, + Command = lists:concat(["escript ", "\"", ConfScript, "\"", + " -f rabbitmq -i ", "\"", SchemaFile, "\"", + " -e ", "\"", ConfDir, "\"", [[" -c ", ConfFile] || ConfFile <- ConfFiles]]), Result = rabbit_misc:os_cmd(Command), case string:str(Result, " -config ") of |