aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_archive.erl
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2019-05-20 09:25:31 -0600
committerGitHub <[email protected]>2019-05-20 09:25:31 -0600
commit670a602f657eeb6ac17589407df8e43cf4d1be89 (patch)
tree097769798d2d6d00fe3e2ff8a17a04034bf52a8f /src/rlx_prv_archive.erl
parentd903c6e52fd7a28e5cee8d0459f0e2ee795f2c93 (diff)
parentcca2a6cade4d97b5b36ca7c055d25677860bdc5d (diff)
downloadrelx-670a602f657eeb6ac17589407df8e43cf4d1be89.tar.gz
relx-670a602f657eeb6ac17589407df8e43cf4d1be89.tar.bz2
relx-670a602f657eeb6ac17589407df8e43cf4d1be89.zip
Merge branch 'master' into goals_option
Diffstat (limited to 'src/rlx_prv_archive.erl')
-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, _) ->