diff options
| author | Essien Ita Essien <essiene@gmail.com> | 2009-02-19 08:46:15 +0100 |
|---|---|---|
| committer | Essien Ita Essien <essiene@gmail.com> | 2009-02-19 08:46:15 +0100 |
| commit | 9b35a0aed208f16f9cfa1fb63c6e5c2b75f02a08 (patch) | |
| tree | 688f577439c883a99eab30bb33ed543fd8e8ce0a /scripts | |
| parent | a7c825b0dd8ef6828cca881dd6cfc6bfc2c6ecda (diff) | |
| parent | 3f5c0fce99c119abbe27ca1dd05e4bf57f27db3e (diff) | |
| download | rabbitmq-server-git-9b35a0aed208f16f9cfa1fb63c6e5c2b75f02a08.tar.gz | |
Merge with upstream default
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} \ |