summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2015-10-13 12:27:42 +0300
committerMichael Klishin <mklishin@pivotal.io>2015-10-13 12:27:42 +0300
commit3ff2d98109c2a769ceadcc5f21c6b53e3bccfe70 (patch)
tree89663100b09ecbffd0c4c007243d9b13d06b8ffb /scripts
parent1a24c9bb842a59e16c2b70ed45ee9f960c033cd1 (diff)
parent9a4bfaa6bb5571246a82266e94050965b467a03f (diff)
downloadrabbitmq-server-git-3ff2d98109c2a769ceadcc5f21c6b53e3bccfe70.tar.gz
Merge branch 'stable'
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 ^