fixup! Fix rabbitmq-diagnostics remote_shell for 26.0

Author: Loïc Hoguin

deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/remote_shell_command.ex

@@ -13,19 +13,20 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.RemoteShellCommand do
 
   def run([], %{node: node_name}) do
     _ = :c.l(:shell)
+
     if :erlang.function_exported(:shell, :start_interactive, 1) do
-        :shell.start_interactive({node_name, :shell, :start, []})
-        :timer.sleep(:infinity)
+      :shell.start_interactive({node_name, :shell, :start, []})
+      :timer.sleep(:infinity)
     else
-        _ = Supervisor.terminate_child(:kernel_sup, :user)
-        Process.flag(:trap_exit, true)
-        user_drv = :user_drv.start(['tty_sl -c -e', {node_name, :shell, :start, []}])
-        Process.link(user_drv)
-
-        receive do
-          {'EXIT', _user_drv, _} ->
-            {:ok, "Disconnected from #{node_name}."}
-        end
+      _ = Supervisor.terminate_child(:kernel_sup, :user)
+      Process.flag(:trap_exit, true)
+      user_drv = :user_drv.start(['tty_sl -c -e', {node_name, :shell, :start, []}])
+      Process.link(user_drv)
+
+      receive do
+        {'EXIT', _user_drv, _} ->
+          {:ok, "Disconnected from #{node_name}."}
+      end
     end
   end
 

deps/rabbitmq_cli/mix.exs

@@ -185,18 +185,21 @@ defmodule RabbitMQCtl.MixfileBase do
         "deps.compile"
       ],
       make_app: [
+        "format --check-formatted",
         "compile",
         "escript.build"
       ],
       make_all: [
         "deps.get",
         "deps.compile",
+        "format --check-formatted",
         "compile",
         "escript.build"
       ],
       make_all_in_src_archive: [
         "deps.get --only prod",
         "deps.compile",
+        "format --check-formatted",
         "compile",
         "escript.build"
       ]