diff options
| author | David Wragg <dpw@lshift.net> | 2010-02-09 11:54:03 +0000 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2010-02-09 11:54:03 +0000 |
| commit | 043e943a46523a2bd50efed1faf0829fc26a8a24 (patch) | |
| tree | 67eb650cf7403b2495491e02de749535349633a7 /scripts | |
| parent | 103a4956910798a5969b46459701e4ef0b79ea8b (diff) | |
| parent | 07836a9fae75cf538a887e5ee0d1be0bc8851539 (diff) | |
| download | rabbitmq-server-git-043e943a46523a2bd50efed1faf0829fc26a8a24.tar.gz | |
Merge default into bug22289
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-service.bat | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index b9ac6eef1f..71a8af3111 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -53,17 +53,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=
@@ -81,7 +94,7 @@ if not exist "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" ( echo ERLANG_SERVICE_MANAGER_PATH not set correctly.
echo **********************************************
echo.
- echo "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" not found.
+ echo "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" not found
echo Please set ERLANG_SERVICE_MANAGER_PATH to the folder containing "erlsrv.exe".
echo.
exit /B 1
|