diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-02-21 12:29:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 12:29:28 +0300 |
| commit | da988060c5557d453dd3de99a2e2f48f7f31fdfc (patch) | |
| tree | 3c22e14cfff65c35b429a68914db50f66d20ecf6 /scripts/rabbitmq-env | |
| parent | 41ec73b886a23c80f40960137d8a11de6454e50c (diff) | |
| parent | 717dfeea6e40c597c3dd083e9bf8da205a810352 (diff) | |
| download | rabbitmq-server-git-da988060c5557d453dd3de99a2e2f48f7f31fdfc.tar.gz | |
Merge pull request #1514 from rabbitmq/rabbitmq-server-1508
RABBITMQ_NAME_TYPE should be correctly set in Windows batch files
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index e1518ff049..5214c686d2 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -344,16 +344,17 @@ 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_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" "$@" |