diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2017-02-26 13:08:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 13:08:48 -0500 |
| commit | a4df4ece160ceba41ad2a53395cebb97d6939130 (patch) | |
| tree | d12122d154be2ed7381da0b1b8d59055fcce9ed5 /src | |
| parent | b810909314731b2761bc23d607baadea2db01ed4 (diff) | |
| parent | 7c125d95f0583cb200c47c0c6af301c1182ce463 (diff) | |
Merge pull request #1499 from ferd/avoid-clean-wildcard-apps
More fixes for bad calls to find_apps
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_prv_plugins.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rebar_prv_plugins.erl b/src/rebar_prv_plugins.erl index 9e04fa8..c76dae1 100644 --- a/src/rebar_prv_plugins.erl +++ b/src/rebar_prv_plugins.erl @@ -42,9 +42,9 @@ do(State) -> 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], SrcDirs, all), + PluginsDirs = filelib:wildcard(filename:join(rebar_dir:plugins_dir(State), "*")), + CheckoutsDirs = filelib:wildcard(filename:join(rebar_dir:checkouts_dir(State), "*")), + Apps = rebar_app_discover:find_apps(CheckoutsDirs++PluginsDirs, SrcDirs, all), display_plugins("Local plugins", Apps, Plugins), {ok, State}. |