aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2019-04-01 09:20:02 -0600
committerGitHub <[email protected]>2019-04-01 09:20:02 -0600
commit46afa565c7b319d1a8b23a7583da9d1d5e1e02e1 (patch)
tree8942cafc05aa7f7d8b23752fff93a35c283cc020 /src
parenta0706e46bc9b976afe80a0a8c0bbcc595f6b0b63 (diff)
downloadrelx-46afa565c7b319d1a8b23a7583da9d1d5e1e02e1.tar.gz
relx-46afa565c7b319d1a8b23a7583da9d1d5e1e02e1.tar.bz2
relx-46afa565c7b319d1a8b23a7583da9d1d5e1e02e1.zip
include vm.args.src file in tarball if it exists (#698)
* include vm.args.src in tarball if it exists * only check sys.config.src in tar on otp-21+
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_archive.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rlx_prv_archive.erl b/src/rlx_prv_archive.erl
index e1735d1..8fd03c1 100644
--- a/src/rlx_prv_archive.erl
+++ b/src/rlx_prv_archive.erl
@@ -141,9 +141,10 @@ update_tar(State, TempDir, OutputDir, Name, Vsn, ErtsVersion) ->
config_files(Vsn, OutputDir) ->
VMArgs = {filename:join(["releases", Vsn, "vm.args"]), filename:join([OutputDir, "releases", Vsn, "vm.args"])},
+ VMArgsSrc = {filename:join(["releases", Vsn, "vm.args.src"]), filename:join([OutputDir, "releases", Vsn, "vm.args.src"])},
VMArgsOrig = {filename:join(["releases", Vsn, "vm.args.orig"]), filename:join([OutputDir, "releases", Vsn, "vm.args.orig"])},
SysConfigOrig = {filename:join(["releases", Vsn, "sys.config.orig"]), filename:join([OutputDir, "releases", Vsn, "sys.config.orig"])},
- [{NameInArchive, Filename} || {NameInArchive, Filename} <- [VMArgs, VMArgsOrig, SysConfigOrig], filelib:is_file(Filename)].
+ [{NameInArchive, Filename} || {NameInArchive, Filename} <- [VMArgsSrc, VMArgs, VMArgsOrig, SysConfigOrig], filelib:is_file(Filename)].
overlay_files(_, undefined, _) ->