summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJared Kauppila <Jared@Kauppi.la>2015-10-12 21:33:11 -0500
committerJared Kauppila <Jared@Kauppi.la>2015-10-12 21:33:11 -0500
commit872074a0029909c760dcae831a439a765b86b8e1 (patch)
treeccb849e8e1db58c38b64fed0f397ea0d0955037e /scripts
parentaaa09daf1a451d141a49a2b90238db9852d657d9 (diff)
downloadrabbitmq-server-git-872074a0029909c760dcae831a439a765b86b8e1.tar.gz
Move call rabbitmq-ev.bat
Moving the rabbitmq-ev.bat call above the ERLANG_HOME check. This grants the ability to override ERLANG_HOME within rabbitmq-env-conf.bat.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmqctl.bat8
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 ^