summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-02-08 10:55:42 +0000
committerMatthew Sackman <matthew@lshift.net>2010-02-08 10:55:42 +0000
commitdfdf6c9e201ea127ba7a6991baed88bf95be5367 (patch)
treed93575ca6813929d386427132dd3456156424d4c
parent4291be65bed0055ee9d0bf2004c7e80114601829 (diff)
downloadrabbitmq-server-dfdf6c9e201ea127ba7a6991baed88bf95be5367.tar.gz
Some cosmetics, but also make service_manager_path be based off erlang_home if it's not set
-rwxr-xr-xscripts/rabbitmq-service.bat25
1 files changed, 18 insertions, 7 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 46681125..9fc4f2e3 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -45,17 +45,28 @@ 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
+ )
+ set ERLANG_SERVICE_MANAGER_PATH=%ERLANG_HOME%\erts-5.7.4\bin
)
set CONSOLE_FLAG=