diff options
| author | Tristan Sloughter <t@crashfast.com> | 2016-02-18 11:44:08 -0600 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2016-02-18 11:44:08 -0600 |
| commit | 7b8e79bf16bbe8703f15f1ee8acedb8ab36c1c52 (patch) | |
| tree | a11f102b447ecd2d80bae6d697527eef93fd8e9c /src | |
| parent | 3ba0fafdbbfd5d9c3af7230b68cf88d15c5376cd (diff) | |
| download | relx-7b8e79bf16bbe8703f15f1ee8acedb8ab36c1c52.tar.gz relx-7b8e79bf16bbe8703f15f1ee8acedb8ab36c1c52.tar.bz2 relx-7b8e79bf16bbe8703f15f1ee8acedb8ab36c1c52.zip | |
allow 'false' to tell relx to not create a sys.config or vm.args
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlx_config.erl | 4 | ||||
| -rw-r--r-- | src/rlx_prv_assembler.erl | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/rlx_config.erl b/src/rlx_config.erl index d82757b..3c3ba98 100644 --- a/src/rlx_config.erl +++ b/src/rlx_config.erl @@ -250,8 +250,12 @@ load_terms({release, {RelName, Vsn}, Applications, Config}, {ok, State0}) -> Release2 = rlx_release:config(Release1, Config), {ok, rlx_state:add_configured_release(State0, Release2)} end; +load_terms({vm_args, false}, {ok, State}) -> + {ok, rlx_state:vm_args(State, false)}; load_terms({vm_args, VmArgs}, {ok, State}) -> {ok, rlx_state:vm_args(State, filename:absname(VmArgs))}; +load_terms({sys_config, false}, {ok, State}) -> + {ok, rlx_state:sys_config(State, false)}; load_terms({sys_config, SysConfig}, {ok, State}) -> {ok, rlx_state:sys_config(State, filename:absname(SysConfig))}; load_terms({root_dir, Root}, {ok, State}) -> diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index 8e0050c..2f08005 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -410,6 +410,8 @@ generate_start_erl_data_file(Release, ReleasesDir) -> copy_or_generate_vmargs_file(State, Release, RelDir) -> RelVmargsPath = filename:join([RelDir, "vm.args"]), case rlx_state:vm_args(State) of + false -> + ok; undefined -> RelName = erlang:atom_to_list(rlx_release:name(Release)), unless_exists_write_default(RelVmargsPath, vm_args_file(RelName)); @@ -428,6 +430,8 @@ copy_or_generate_vmargs_file(State, Release, RelDir) -> copy_or_generate_sys_config_file(State, RelDir) -> RelSysConfPath = filename:join([RelDir, "sys.config"]), case rlx_state:sys_config(State) of + false -> + ok; undefined -> unless_exists_write_default(RelSysConfPath, sys_config_file()); ConfigPath -> |