diff options
| author | Michael Klishin <michael@novemberain.com> | 2015-10-13 11:14:20 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2015-10-13 11:14:20 +0300 |
| commit | 9a4bfaa6bb5571246a82266e94050965b467a03f (patch) | |
| tree | cf32e8bbbba8f1a3ece98ad4ef7eb3d7eeabe312 | |
| parent | c232c3ea056e949df8473f29878373e2d293218d (diff) | |
| parent | 872074a0029909c760dcae831a439a765b86b8e1 (diff) | |
| download | rabbitmq-server-git-9a4bfaa6bb5571246a82266e94050965b467a03f.tar.gz | |
Merge pull request #354 from Jakauppila/rabbitmq-server-354
Allow ERLANG_HOME to be overridden from rabbitmq-env.bat
| -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 ^
|