diff options
| author | Paul Jones <paulj@lshift.net> | 2009-07-27 09:32:13 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-07-27 09:32:13 +0100 |
| commit | 70737b83f245a77092df65fdcd06f4926586cadb (patch) | |
| tree | 9008cbdbe90fc4567339049197f6a1b3cae62f27 | |
| parent | a19194badfb2bd694188af91d112d7cf2a64a092 (diff) | |
| download | rabbitmq-server-bug21243.tar.gz | |
Factored out ebin root from rabbitmq-server script (windows and unix)bug21243
| -rwxr-xr-x | scripts/rabbitmq-server | 7 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 569f54d9..40e32d3d 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -75,12 +75,13 @@ fi RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit' -if [ -f "`dirname $0`/../ebin/rabbit.boot" ]; then - RABBITMQ_BOOT_FILE="`dirname $0`/../ebin/rabbit" +RABBITMQ_EBIN_ROOT="`dirname $0`/../ebin" +if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ]; then + RABBITMQ_BOOT_FILE="${RABBITMQ_EBIN_ROOT}/rabbit" RABBITMQ_EBIN_PATH="" else RABBITMQ_BOOT_FILE=start_sasl - RABBITMQ_EBIN_PATH="-pa `dirname $0`/../ebin" + RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}" fi # we need to turn off path expansion because some of the vars, notably diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 131322b8..b1932a79 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -104,13 +104,14 @@ set CLUSTER_CONFIG=-rabbit cluster_config \""%RABBITMQ_CLUSTER_CONFIG_FILE:\=/%" if "%RABBITMQ_MNESIA_DIR%"=="" (
set RABBITMQ_MNESIA_DIR=%RABBITMQ_MNESIA_BASE%/%RABBITMQ_NODENAME%-mnesia
)
-if exist "%~dp0..\ebin\rabbit.boot" (
- echo Using Custom Boot File "%~dp0..\ebin\rabbit.boot"
- set RABBITMQ_BOOT_FILE="%~dp0..\ebin\rabbit"
+set RABBITMQ_EBIN_ROOT=%~dp0..\ebin
+if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (
+ echo Using Custom Boot File "%RABBITMQ_EBIN_ROOT%\rabbit.boot"
+ set RABBITMQ_BOOT_FILE="%RABBITMQ_EBIN_ROOT%\rabbit"
set RABBITMQ_EBIN_PATH=
) else (
set RABBITMQ_BOOT_FILE=start_sasl
- set RABBITMQ_EBIN_PATH=-pa "%~dp0..\ebin"
+ set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"
)
"%ERLANG_HOME%\bin\erl.exe" ^
|