summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2010-02-09 08:25:34 +0000
committerDavid Wragg <dpw@lshift.net>2010-02-09 08:25:34 +0000
commit07836a9fae75cf538a887e5ee0d1be0bc8851539 (patch)
treebefd57db87f044caa6d050cff1b99d6d629dee0a /scripts
parent90b34ec16f049f5631475ef8549a8dd4fa2ebea3 (diff)
parent7f1813c07bfcd7f3376939bdd9b79ba48c50dc4d (diff)
downloadrabbitmq-server-git-07836a9fae75cf538a887e5ee0d1be0bc8851539.tar.gz
Merge bug22303 into master
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-service.bat27
1 files changed, 20 insertions, 7 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 4668112576..cc2e8166f7 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -45,17 +45,30 @@ if "%RABBITMQ_NODENAME%"=="" (
)
if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (
- if not "%RABBITMQ_NODE_PORT%"=="" (
- set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
- )
+ if not "%RABBITMQ_NODE_PORT%"=="" (
+ set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
+ )
) else (
- if "%RABBITMQ_NODE_PORT%"=="" (
- set RABBITMQ_NODE_PORT=5672
- )
+ if "%RABBITMQ_NODE_PORT%"=="" (
+ set RABBITMQ_NODE_PORT=5672
+ )
)
if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (
- set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.6.5\erts-5.6.5\bin
+ if not exist "%ERLANG_HOME%\bin\erl.exe" (
+ echo.
+ echo ******************************
+ echo ERLANG_HOME not set correctly.
+ echo ******************************
+ echo.
+ echo Please either set ERLANG_HOME to point to your Erlang installation or place the
+ echo RabbitMQ server distribution in the Erlang lib folder.
+ echo.
+ exit /B
+ )
+ for /f "delims=" %%i in ('dir /ad/b "%ERLANG_HOME%"') do if exist "%ERLANG_HOME%\%%i\bin\erlsrv.exe" (
+ set ERLANG_SERVICE_MANAGER_PATH=%ERLANG_HOME%\%%i\bin
+ )
)
set CONSOLE_FLAG=