From 774de2bdc5f557a9a5e7375175db2e715db368f8 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Sun, 27 Jun 2021 17:08:21 +0200
Subject: [PATCH] Include odbc app in release only when required (#3633)

---
 rebar.config        |  2 +-
 rebar.config.script | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index 8f520948f..9639372bb 100644
--- a/rebar.config
+++ b/rebar.config
@@ -173,7 +173,7 @@
                        {"stringprep", []}]}.
 
 {relx, [{release, {ejabberd, {cmd, "grep {vsn, vars.config | sed 's|{vsn, \"||;s|\"}.||' | tr -d '\012'"}},
-         [ejabberd, odbc]},
+         [ejabberd]},
         {sys_config, "./rel/sys.config"},
         {vm_args, "./rel/vm.args"},
         {overlay_vars, "vars.config"},
diff --git a/rebar.config.script b/rebar.config.script
index 9e47b70e3..efd51d6ba 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -339,6 +339,17 @@ fun(Deps, FDeps) ->
 		  end, Deps)
 end,
 
+
+VarsApps = case file:consult(filename:join([filename:dirname(SCRIPT),"vars.config"])) of
+    {ok, TermsV} ->
+        case proplists:get_bool(odbc, TermsV) of
+            true -> [odbc];
+            false -> []
+        end;
+    _->
+        []
+    end,
+
 ProcessRelx = fun(Relx, Deps) ->
     {value, {release, NameVersion, DefaultApps}, RelxTail} = lists:keytake(release, 1, Relx),
     ProfileApps = case os:getenv("REBAR_PROFILE") of
@@ -348,7 +359,7 @@ ProcessRelx = fun(Relx, Deps) ->
     DepApps = lists:map(fun({DepName, _, _}) -> DepName;
                         ({DepName, _}) -> DepName
                 end, Deps),
-    [{release, NameVersion, DefaultApps ++ ProfileApps ++ DepApps} | RelxTail]
+    [{release, NameVersion, DefaultApps ++ VarsApps ++ ProfileApps ++ DepApps} | RelxTail]
     end,
 
 GithubConfig = case {os:getenv("GITHUB_ACTIONS"), os:getenv("GITHUB_TOKEN")} of