diff options
| author | Tristan Sloughter <t@crashfast.com> | 2014-12-06 17:02:39 -0600 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2014-12-06 20:08:36 -0600 |
| commit | 50f384715bf7452b0083d0392694a2f980173fd1 (patch) | |
| tree | 34b516cf783825da6519098c9f50ef0b7c14777d /src | |
| parent | cf8d63d860a55e97d8400845805c819ff341213a (diff) | |
in relx tar call only include deps dirs if they exist
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_prv_tar.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl index ae1942b..40a84e3 100644 --- a/src/rebar_prv_tar.erl +++ b/src/rebar_prv_tar.erl @@ -32,16 +32,18 @@ init(State) -> -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. do(State) -> - OutputDir = filename:join(rebar_dir:profile_dir(State), ?DEFAULT_RELEASE_DIR), Options = rebar_state:command_args(State), - DepsDir = rebar_dir:deps_dir(State), + DepsDir = rebar_dir:default_deps_dir(State), + ProfileDepsDir = rebar_dir:deps_dir(State), + LibDirs = lists:usort(rebar_utils:filtermap(fun ec_file:exists/1, [DepsDir, ProfileDepsDir])), + OutputDir = filename:join(rebar_dir:profile_dir(State), ?DEFAULT_RELEASE_DIR), AllOptions = string:join(["release", "tar" | Options], " "), case rebar_state:get(State, relx, []) of [] -> - relx:main([{lib_dirs, [DepsDir] + relx:main([{lib_dirs, LibDirs ,{output_dir, OutputDir}}], AllOptions); Config -> - relx:main([{lib_dirs, [DepsDir]} + relx:main([{lib_dirs, LibDirs} ,{config, Config} ,{output_dir, OutputDir}], AllOptions) end, |