From c0447d58b4a4ba346e5fb4a496969d6b94570cd6 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Fri, 20 Aug 2021 19:04:52 +0800
Subject: [PATCH] fix(config): configs in emqx_machine.conf was merged twice
 into emqx.conf

---
 scripts/merge-config.escript | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/merge-config.escript b/scripts/merge-config.escript
index b324b7e5c..372ff3900 100755
--- a/scripts/merge-config.escript
+++ b/scripts/merge-config.escript
@@ -11,9 +11,8 @@
 -mode(compile).
 
 main(_) ->
-    BaseConf = "apps/emqx_machine/etc/emqx_machine.conf",
-    {ok, Bin} = file:read_file(BaseConf),
-    Apps = filelib:wildcard("*", "apps/"),
+    {ok, BaseConf} = file:read_file("apps/emqx_machine/etc/emqx_machine.conf"),
+    Apps = filelib:wildcard("*", "apps/") -- ["emqx_machine"],
     Conf = lists:foldl(fun(App, Acc) ->
         Filename = filename:join([apps, App, "etc", App]) ++ ".conf",
         case filelib:is_regular(Filename) of
@@ -22,5 +21,5 @@ main(_) ->
                 [Acc, io_lib:nl(), Bin1];
             false -> Acc
         end
-    end, Bin, Apps),
+    end, BaseConf, Apps),
     ok = file:write_file("apps/emqx_machine/etc/emqx.conf.all", Conf).