From 30df1dbe3f613c9b61185ff3561288227fbc4d88 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 19 Dec 2023 22:45:13 +0100
Subject: [PATCH] Mix: Set the nodename when using the ejabberd script
 generated by Elixir

Also use start instead of console in Elixir script
---
 mix.exs          |  2 +-
 rebar.config     |  2 +-
 rel/setup-dev.sh | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mix.exs b/mix.exs
index cf968a764..11b347df8 100644
--- a/mix.exs
+++ b/mix.exs
@@ -320,7 +320,7 @@ defmodule Ejabberd.MixProject do
     end
 
     case Mix.env() do
-      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh")
+      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh mix")
       _ -> :ok
     end
 
diff --git a/rebar.config b/rebar.config
index bca63ad41..23bfc8b1e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -268,7 +268,7 @@
                             {overlay, [{copy, "sql/*", "lib/ejabberd-\{\{release_version\}\}/priv/sql/"},
                                        {copy, "ejabberdctl.cfg.example", "conf/ejabberdctl.cfg"},
                                        {copy, "ejabberd.yml.example", "conf/ejabberd.yml"}]}]}]},
-            {dev, [{post_hooks, [{release, "rel/setup-dev.sh"}]},
+            {dev, [{post_hooks, [{release, "rel/setup-dev.sh rebar3"}]},
                    {relx, [{debug_info, keep},
                            {dev_mode, true},
                            {include_erts, true},
diff --git a/rel/setup-dev.sh b/rel/setup-dev.sh
index d9d94a2d0..af3875cf0 100755
--- a/rel/setup-dev.sh
+++ b/rel/setup-dev.sh
@@ -23,5 +23,14 @@ sed -i "s|#' POLL|EJABBERD_BYPASS_WARNINGS=true\n\n#' POLL|g" ejabberdctl.cfg.ex
 
 echo ""
 echo "===> Some example ways to start this ejabberd dev:"
-echo "     _build/dev/rel/ejabberd/bin/ejabberd console"
 echo "     _build/dev/rel/ejabberd/bin/ejabberdctl live"
+case "$1" in
+    "rebar3")
+        echo "     _build/dev/rel/ejabberd/bin/ejabberd console"
+        ;;
+    "mix")
+        echo "     RELEASE_NODE=ejabberd@localhost _build/dev/rel/ejabberd/bin/ejabberd start"
+        ;;
+    "*")
+        ;;
+esac