diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-02-17 13:38:07 +0000 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-02-17 13:38:07 +0000 |
| commit | 67dff52a1eb5df683e6a20eefb278cd16fad2fc0 (patch) | |
| tree | 26c0f051c59e75f1a93c107bf3fe47ce94cc494f /scripts | |
| parent | 1ba5bef7bb2a8c2f80ff8147c4aefdc381b00552 (diff) | |
| parent | 7637fbde4cae03f534dc53a6deb9bc3589b57229 (diff) | |
| download | rabbitmq-server-git-67dff52a1eb5df683e6a20eefb278cd16fad2fc0.tar.gz | |
merge default into bug20374
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-multi | 5 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 5 |
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} \ |