From da35b14f48f2826307f8059f02701f7c50cc0174 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Thu, 2 Sep 2021 08:22:28 -0600
Subject: [PATCH] use copied erts dir when tar'ing even when the user sets the
 erts

---
 src/rlx_tar.erl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/rlx_tar.erl b/src/rlx_tar.erl
index 9b07c1973..2e9c87684 100644
--- a/src/rlx_tar.erl
+++ b/src/rlx_tar.erl
@@ -76,7 +76,9 @@ make_tar_opts(ExtraFiles, Release, OutputDir, State) ->
 
 maybe_include_erts(_ExtraFiles, Release, OutputDir, State) ->
      case rlx_state:include_erts(State) of
-         true ->
+         false ->
+             [];
+         IncludeErts ->
              ErtsVersion = rlx_release:erts(Release),
              ErtsDir = filename:join([OutputDir, "erts-" ++ ErtsVersion]),
              case filelib:is_dir(ErtsDir) of
@@ -84,13 +86,11 @@ maybe_include_erts(_ExtraFiles, Release, OutputDir, State) ->
                      %% systools:make_tar looks for directory erts-vsn in
                      %% the dir passed to `erts'
                      [{erts, OutputDir}];
+                 false when IncludeErts =:= true ->
+                     [{erts, code:root_dir()}];
                  false ->
-                     [{erts, code:root_dir()}]
-             end;
-         false ->
-             [];
-         ErtsDir ->
-             [{erts, ErtsDir}]
+                     [{erts, IncludeErts}]
+             end
      end.
 
 maybe_extra_files(ExtraFiles, _Release, _OutputDir, State) ->