summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-11-23 13:35:41 +0000
committerSimon MacMullen <simon@rabbitmq.com>2010-11-23 13:35:41 +0000
commit5375bc5c6f1821e063bb2ea5da600aa7b755ee3e (patch)
treec8eefe89689ff22a912d6bbe198ac550b9d9aab6 /scripts/rabbitmq-server
parent462a16fadee38f9ccf0eaac1f1ff96ea72e9e125 (diff)
parentb80bd52526abac83d886e12371c86678a66a72e0 (diff)
downloadrabbitmq-server-git-5375bc5c6f1821e063bb2ea5da600aa7b755ee3e.tar.gz
And, err, merge heads.
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 0eb7092d39..c5d883c365 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -89,13 +89,10 @@ RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
if erl \
-pa "$RABBITMQ_EBIN_ROOT" \
- -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
- -rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \
- -rabbit rabbit_ebin "\"$RABBITMQ_EBIN_ROOT\"" \
-noinput \
-hidden \
-s rabbit_plugin_activator \
- -extra "$@"
+ -extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}"
then
RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit"
RABBITMQ_EBIN_PATH=""