summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2014-12-06 17:00:01 -0600
committerTristan Sloughter <t@crashfast.com>2014-12-06 20:08:36 -0600
commitcf8d63d860a55e97d8400845805c819ff341213a (patch)
tree5d69641f7c0b009e89e0e2f3354a1a87240c023c /src
parent90438fb1a33d273ae1c97dfa97f32d7357521a99 (diff)
in relx call only include deps dirs if they exist
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_release.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index d9cc40f..d382ab5 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -33,16 +33,18 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
Options = rebar_state:command_args(State),
- DepsDir = [rebar_dir:default_deps_dir(State)], % 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" | Options], " "),
try
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,