diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-02-16 03:08:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 03:08:55 +0300 |
| commit | d9c3ed478dbf374d40350973bc845a210cb54873 (patch) | |
| tree | e1c1ead9c535cc4dfca0c9d6eb162b77b1e56a5b /scripts/rabbitmq-env | |
| parent | 6b26e67b116b9428445ff48c38105b504354cc3c (diff) | |
| parent | 1ccb20e33c1e30a25e70392a45ec2da6ab0e6078 (diff) | |
| download | rabbitmq-server-git-d9c3ed478dbf374d40350973bc845a210cb54873.tar.gz | |
Merge pull request #1517 from rabbitmq/revert-1515-rabbitmq-server-1508-master
Revert "Merge rabbitmq-server-1508 to master"
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index f285bee2f5..e1518ff049 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -344,18 +344,16 @@ run_escript() escript="${1:?escript must be defined}" shift - # Important: do not quote RABBITMQ_CTL_ERL_ARGS as they must be - # word-split # shellcheck disable=SC2086 exec "${ERL_DIR}erl" +B \ - -boot "$CLEAN_BOOT_FILE" \ + -boot "${CLEAN_BOOT_FILE}" \ -noinput -noshell -hidden -smp enable \ - "$RABBITMQ_NAME_TYPE" "rabbitmqescript$$@localhost" \ - $RABBITMQ_CTL_ERL_ARGS \ - -kernel inet_dist_listen_min "$RABBITMQ_CTL_DIST_PORT_MIN" \ - -kernel inet_dist_listen_max "$RABBITMQ_CTL_DIST_PORT_MAX" \ + ${RABBITMQ_CTL_ERL_ARGS} \ + -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN \ + -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX \ -sasl errlog_type error \ - -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \ + -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ + -nodename "$RABBITMQ_NODENAME" \ -run escript start \ -escript main "$escript_main" \ -extra "$escript" "$@" |