Merge pull request #10108 from rabbitmq/lukebakken/figure-out-rabbitmqctl-stdin

Ensure that elixir escript does not read from stdin

Author: michaelklishin

deps/rabbit/scripts/rabbitmq-diagnostics

@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-diagnostics "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-diagnostics "$@"

deps/rabbit/scripts/rabbitmq-env

@@ -178,25 +178,13 @@ _rmq_env_set_erl_libs()
 
 run_escript()
 {
- escript_main="${1:?escript_main must be defined}"
- shift
  escript="${1:?escript must be defined}"
  shift
 
  _rmq_env_set_erl_libs
 
- # Important: do not quote RABBITMQ_CTL_ERL_ARGS as they must be
- # word-split
  # shellcheck disable=SC2086
- exec erl +B \
- -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" \
- -run escript start \
- -escript main "$escript_main" \
- -extra "$escript" "$@"
+ 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" "$@"
 }
 
 RABBITMQ_ENV_LOADED=1

deps/rabbit/scripts/rabbitmq-plugins

@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-plugins "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-plugins "$@"

deps/rabbit/scripts/rabbitmq-queues

@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-queues "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-queues "$@"

deps/rabbit/scripts/rabbitmq-streams

@@ -21,4 +21,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-streams "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-streams "$@"

deps/rabbit/scripts/rabbitmq-upgrade

@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-upgrade "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-upgrade "$@"

deps/rabbit/scripts/rabbitmqctl

@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmqctl "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmqctl "$@"

deps/rabbit/scripts/vmware-rabbitmq

@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/vmware-rabbitmq "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/vmware-rabbitmq "$@"

deps/rabbitmq_cli/mix.exs

@@ -14,7 +14,11 @@ defmodule RabbitMQCtl.MixfileBase do
  elixir: ">= 1.13.4 and < 1.16.0",
  build_embedded: Mix.env() == :prod,
  start_permanent: Mix.env() == :prod,
- escript: [main_module: RabbitMQCtl, emu_args: "-hidden", path: "escript/rabbitmqctl"],
+ escript: [
+ main_module: RabbitMQCtl,
+ emu_args: "-noinput -hidden",
+ path: "escript/rabbitmqctl"
+ ],
  prune_code_paths: false,
  deps: deps(Mix.env()),
  aliases: aliases(),