diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-server.bat | 9 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 5aeb131715..923b8277d5 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -21,6 +21,7 @@ rem Preserve values that might contain exclamation marks before rem enabling delayed expansion
set TDP0=%~dp0
set STAR=%*
+set CONF_SCRIPT_DIR="%~dp0"
setlocal enabledelayedexpansion
REM Get default settings with user overrides for (RABBITMQ_)<var_name>
@@ -48,8 +49,8 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!" -noinput -hidden ^
-s rabbit_prelaunch ^
!RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9! ^
- -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
- -conf_script_dir "%~dp0" ^
+ -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
-conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^
-conf_schema_dir "!RABBITMQ_HOME!\priv\schema" ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
@@ -70,8 +71,8 @@ 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_script_dir "%~dp0" ^
+ -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
-conf_schema_dir "!RABBITMQ_HOME!\priv\schema"
if exist "!RABBITMQ_CONFIG_ADVANCED!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index ea5746c1fd..ae9464d977 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -21,6 +21,7 @@ rem Preserve values that might contain exclamation marks before rem enabling delayed expansion
set TN0=%~n0
set TDP0=%~dp0
+set CONF_SCRIPT_DIR="%~dp0"
set P1=%1
setlocal enabledelayedexpansion
@@ -120,8 +121,8 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!" -pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput -hidden ^
-s rabbit_prelaunch ^
- -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
- -conf_script_dir "!TDP0!" ^
+ -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
-conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^
-conf_schema_dir "!RABBITMQ_HOME!\priv\schema" ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
@@ -146,8 +147,8 @@ if exist "!RABBITMQ_CONFIG_FILE!.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_script_dir "!TDP0!" ^
+ -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
-conf_schema_dir "!RABBITMQ_HOME!\priv\schema"
if exist "!RABBITMQ_CONFIG_ADVANCED!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
|