diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2017-02-19 11:39:15 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2017-02-19 11:39:15 -0500 |
| commit | e498f603df66be8fa662fb4eafa9e2d6cef2d222 (patch) | |
| tree | 17755a992caa2b6c466e122d48cb2c17ab615820 /src/rebar_prv_plugins.erl | |
| parent | d80c3f4da10857d16315d10ecaa5fe0f2f08c961 (diff) | |
Fix plugins usage to support src_dirs options
Diffstat (limited to 'src/rebar_prv_plugins.erl')
| -rw-r--r-- | src/rebar_prv_plugins.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rebar_prv_plugins.erl b/src/rebar_prv_plugins.erl index 7e6b88e..9e04fa8 100644 --- a/src/rebar_prv_plugins.erl +++ b/src/rebar_prv_plugins.erl @@ -34,14 +34,17 @@ do(State) -> GlobalConfigFile = rebar_dir:global_config(), GlobalConfig = rebar_state:new(rebar_config:consult_file(GlobalConfigFile)), GlobalPlugins = rebar_state:get(GlobalConfig, plugins, []), + GlobalSrcDirs = rebar_state:get(GlobalConfig, src_dirs, ["src"]), GlobalPluginsDir = filename:join([rebar_dir:global_cache_dir(rebar_state:opts(State)), "plugins", "*"]), - GlobalApps = rebar_app_discover:find_apps([GlobalPluginsDir], all), + GlobalApps = rebar_app_discover:find_apps([GlobalPluginsDir], GlobalSrcDirs, all), display_plugins("Global plugins", GlobalApps, GlobalPlugins), + RebarOpts = rebar_state:opts(State), + SrcDirs = rebar_dir:src_dirs(RebarOpts, ["src"]), Plugins = rebar_state:get(State, plugins, []), PluginsDir = filename:join(rebar_dir:plugins_dir(State), "*"), CheckoutsDir = filename:join(rebar_dir:checkouts_dir(State), "*"), - Apps = rebar_app_discover:find_apps([CheckoutsDir, PluginsDir], all), + Apps = rebar_app_discover:find_apps([CheckoutsDir, PluginsDir], SrcDirs, all), display_plugins("Local plugins", Apps, Plugins), {ok, State}. |