summaryrefslogtreecommitdiff
path: root/scripts/rabbitmqctl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-08-25 14:00:50 +0100
committerMatthew Sackman <matthew@lshift.net>2009-08-25 14:00:50 +0100
commit01c010089a9923af81b374a6d79ca343a70bf834 (patch)
tree841aba5d1389a816f3beb412db8019742bf8204a /scripts/rabbitmqctl
parent3e3aa9ad4397dee291d64ebc84f3107cbca8dcc8 (diff)
parent0e3b435c1e181a76b2d7022e0c1399adf72a86b4 (diff)
downloadrabbitmq-server-git-01c010089a9923af81b374a6d79ca343a70bf834.tar.gz
merging in from default
Diffstat (limited to 'scripts/rabbitmqctl')
-rwxr-xr-xscripts/rabbitmqctl4
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} \