Skip to content

Commit d2d50cf

Browse files
committed
Add -noinput via rabbitmq-env
Follow-up to #10131
1 parent f7b9b8d commit d2d50cf

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

deps/rabbit/scripts/rabbitmq-env

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,24 @@ run_escript()
183183

184184
_rmq_env_set_erl_libs
185185

186-
# shellcheck disable=SC2086
187-
ERL_FLAGS="-boot $CLEAN_BOOT_FILE $RABBITMQ_CTL_ERL_ARGS -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX" "$escript" "$@"
186+
tmp_erl_flags="-boot $CLEAN_BOOT_FILE $RABBITMQ_CTL_ERL_ARGS -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX"
187+
188+
case "$escript" in
189+
*rabbitmq-diagnostics)
190+
if [ "$1" != 'observer' ]
191+
then
192+
tmp_erl_flags="-noinput $tmp_erl_flags"
193+
fi
194+
;;
195+
*)
196+
tmp_erl_flags="-noinput $tmp_erl_flags"
197+
;;
198+
esac
199+
200+
ERL_FLAGS="$tmp_erl_flags" "$escript" "$@"
201+
202+
unset tmp_erl_flags
203+
unset ERL_FLAGS
188204
}
189205

190206
RABBITMQ_ENV_LOADED=1

deps/rabbitmq_cli/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defmodule RabbitMQCtl.MixfileBase do
1616
start_permanent: Mix.env() == :prod,
1717
escript: [
1818
main_module: RabbitMQCtl,
19-
emu_args: "-noinput -hidden",
19+
emu_args: "-hidden",
2020
path: "escript/rabbitmqctl"
2121
],
2222
prune_code_paths: false,

0 commit comments

Comments
 (0)