From db0099161cc02af0ea179b2b63270f0537baf612 Mon Sep 17 00:00:00 2001 From: robashton Date: Fri, 6 Nov 2020 11:52:48 +0000 Subject: [PATCH] Attempt to add checkout location to rebar3 path --- src/rebar_prv_path.erl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rebar_prv_path.erl b/src/rebar_prv_path.erl index 5374b0c1..d41c7b98 100644 --- a/src/rebar_prv_path.erl +++ b/src/rebar_prv_path.erl @@ -81,11 +81,14 @@ lib_dir(State) -> io_lib:format("~ts", [rebar_dir:deps_dir(State)]). rel_dir(State) -> io_lib:format("~ts/rel", [rebar_dir:base_dir(State)]). ebin_dirs(Apps, State) -> - lists:map(fun(App) -> io_lib:format("~ts/~ts/ebin", [rebar_dir:deps_dir(State), App]) end, Apps). + lists:flatmap(fun(App) -> [io_lib:format("~ts/~ts/ebin", [rebar_dir:checkouts_out_dir(State), App]), + io_lib:format("~ts/~ts/ebin", [rebar_dir:deps_dir(State), App]) ] end, Apps). priv_dirs(Apps, State) -> - lists:map(fun(App) -> io_lib:format("~ts/~ts/priv", [rebar_dir:deps_dir(State), App]) end, Apps). + lists:flatmap(fun(App) -> [io_lib:format("~ts/~ts/priv", [rebar_dir:checkouts_out_dir(State), App]), + io_lib:format("~ts/~ts/priv", [rebar_dir:deps_dir(State), App]) ] end, Apps). src_dirs(Apps, State) -> - lists:map(fun(App) -> io_lib:format("~ts/~ts/src", [rebar_dir:deps_dir(State), App]) end, Apps). + lists:flatmap(fun(App) -> [io_lib:format("~ts/~ts/src", [rebar_dir:checkouts_out_dir(State), App]), + io_lib:format("~ts/~ts/src", [rebar_dir:deps_dir(State), App]) ] end, Apps). print_paths_if_exist(Paths, State) -> {RawOpts, _} = rebar_state:command_parsed_args(State),