diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2018-02-15 08:30:59 -0800 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2018-02-15 13:00:46 -0800 |
| commit | 3c82673d9bf4d143f475ed37632fc44a6c8680b4 (patch) | |
| tree | 0253559897c3afa1fbb172dccd54e8de3d2ff49c /scripts/rabbitmq-env | |
| parent | 41ec73b886a23c80f40960137d8a11de6454e50c (diff) | |
| download | rabbitmq-server-git-3c82673d9bf4d143f475ed37632fc44a6c8680b4.tar.gz | |
Remove unused -nodename argument to erl, ensure that RABBITMQ_NAME_TYPE is used correctly in Windows batch files
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index e1518ff049..f285bee2f5 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -344,16 +344,18 @@ 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_CTL_ERL_ARGS} \ - -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN \ - -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX \ + "$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" \ -sasl errlog_type error \ - -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ - -nodename "$RABBITMQ_NODENAME" \ + -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \ -run escript start \ -escript main "$escript_main" \ -extra "$escript" "$@" |