diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 07:45:50 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 07:45:50 +0200 |
| commit | 6c3de1303e4a1175fa3e222ff7a47a83cb258bbc (patch) | |
| tree | 55dad87b2ed5c91cf28980070b97251b397d1b1c /scripts | |
| parent | ee19ec06d56bc73a8ba542f9202ba7a7f5bccc56 (diff) | |
| parent | 63eccd863a493795a92941af3be41af364e1d637 (diff) | |
| download | rabbitmq-server-git-6c3de1303e4a1175fa3e222ff7a47a83cb258bbc.tar.gz | |
Merge branch 'master' into rabbitmq-server-351
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmqctl.bat | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 45e2929579..9ad855bf87 100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -24,6 +24,10 @@ set TDP0=%~dp0 set STAR=%*
setlocal enabledelayedexpansion
+REM Get default settings with user overrides for (RABBITMQ_)<var_name>
+REM Non-empty defaults should be set in rabbitmq-env
+call "%TDP0%\rabbitmq-env.bat"
+
if not exist "!ERLANG_HOME!\bin\erl.exe" (
echo.
echo ******************************
@@ -36,10 +40,6 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( exit /B 1
)
-REM Get default settings with user overrides for (RABBITMQ_)<var_name>
-REM Non-empty defaults should be set in rabbitmq-env
-call "%TDP0%\rabbitmq-env.bat"
-
"!ERLANG_HOME!\bin\erl.exe" ^
-pa "!TDP0!..\ebin" ^
-noinput ^
|