diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-08-14 13:40:30 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-08-14 13:40:30 +0100 |
| commit | e84abd31f517f05e50e9c61c57d95f2f70a1bd46 (patch) | |
| tree | b029db82f1cfcb638b75f51f4a801a3ed8c08b94 /scripts/rabbitmqctl | |
| parent | 345d4d0ceb837d6a69a91b26d63349fc83837152 (diff) | |
| parent | 98206e0cc2dd7f6ba24a6b23f99b6f37cbf6d6e0 (diff) | |
| download | rabbitmq-server-git-e84abd31f517f05e50e9c61c57d95f2f70a1bd46.tar.gz | |
merge bug20342 into default
Diffstat (limited to 'scripts/rabbitmqctl')
| -rwxr-xr-x | scripts/rabbitmqctl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index c57978c050..9c45e73dd5 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -30,12 +30,12 @@ ## Contributor(s): ______________________________________. ## -[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf +. `dirname $0`/rabbitmq-env [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} exec erl \ - -pa "`dirname $0`/../ebin" \ + -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ |