Merge pull request #1731 from rabbitmq/rabbitmq-server-1709

Ensure EPMD env vars are exported if set

Author: lukebakken

scripts/rabbitmq-env

@@ -120,6 +120,9 @@ saved_RABBITMQ_PID_FILE="$RABBITMQ_PID_FILE"
 [ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE}
 [ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true
 
+[ -n "$ERL_EPMD_PORT" ] && export ERL_EPMD_PORT
+[ -n "$ERL_EPMD_ADDRESS" ] && export ERL_EPMD_ADDRESS
+
 DEFAULT_SCHEDULER_BIND_TYPE="db"
 [ -n "$SCHEDULER_BIND_TYPE" ] || SCHEDULER_BIND_TYPE="$DEFAULT_SCHEDULER_BIND_TYPE"
 [ -n "$RABBITMQ_SCHEDULER_BIND_TYPE" ] || RABBITMQ_SCHEDULER_BIND_TYPE="$SCHEDULER_BIND_TYPE"
@@ -391,15 +394,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" \
         -sasl errlog_type error \
-        -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
+        -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \
         -nodename "$RABBITMQ_NODENAME" \
         -run escript start \
         -escript main "$escript_main" \