summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2009-02-13 18:31:41 +0000
committerSimon MacMullen <simon@lshift.net>2009-02-13 18:31:41 +0000
commitb4ad26ae09de1db141469019deb0b054ddc09925 (patch)
treeb9374e3a84fd931c69116e253c5f405407595733
parentbc51775fe97d6c5567a70037449f1a0040761160 (diff)
parent3d469c9699845fefba18dfeae58a09c77b11e167 (diff)
downloadrabbitmq-server-git-b4ad26ae09de1db141469019deb0b054ddc09925.tar.gz
Verified.
-rwxr-xr-xscripts/rabbitmq-multi5
-rwxr-xr-xscripts/rabbitmq-server5
2 files changed, 10 insertions, 0 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 84985e900f..164c5e187c 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -54,6 +54,11 @@ export \
RABBITMQ_SCRIPT_HOME \
RABBITMQ_PIDS_FILE
+# we need to turn off path expansion because some of the vars, notably
+# RABBITMQ_MULTI_ERL_ARGS, may contain terms that look like globs and
+# there is no other way of preventing their expansion.
+set -f
+
exec erl \
-pa "`dirname $0`/../ebin" \
-noinput \
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 572262c97e..9a35c47721 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -73,6 +73,11 @@ fi
RABBITMQ_START_RABBIT=
[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit'
+# we need to turn off path expansion because some of the vars, notably
+# RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and
+# there is no other way of preventing their expansion.
+set -f
+
exec erl \
-pa "`dirname $0`/../ebin" \
${RABBITMQ_START_RABBIT} \