diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-04-05 10:35:32 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-04-05 10:35:32 -0400 |
| commit | 56ea365ca56340448208bf255f138286c5208aa8 (patch) | |
| tree | d606357258e53a201155f04a14a2cd7decba4a9d | |
| parent | 3250faa75683bdbfc521c4e8c6772f45d6d2e863 (diff) | |
| parent | f18e84ce2b8bde2def81b111e6c042cd68f0f779 (diff) | |
Merge pull request #321 from tsloughter/rm_global_plugins
Remove global plugins
| -rw-r--r-- | src/rebar3.erl | 5 | ||||
| -rw-r--r-- | src/rebar_plugins.erl | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl index 461206d..84eae05 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -156,9 +156,8 @@ init_config() -> true -> ?DEBUG("Load global config file ~p", [GlobalConfigFile]), - GlobalConfig = rebar_state:new(global, rebar_config:consult_file(GlobalConfigFile)), - GlobalConfig1 = rebar_plugins:install(GlobalConfig), - rebar_state:new(GlobalConfig1, Config1); + GlobalConfig = rebar_state:new(rebar_config:consult_file(GlobalConfigFile)), + rebar_state:new(GlobalConfig, Config1); false -> rebar_state:new(Config1) end, diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl index a9550ff..02e8f4e 100644 --- a/src/rebar_plugins.erl +++ b/src/rebar_plugins.erl @@ -13,18 +13,16 @@ -spec install(rebar_state:t()) -> rebar_state:t(). install(State) -> - DepsDir = rebar_dir:deps_dir(State), Plugins = rebar_state:get(State, plugins, []), ProjectApps = rebar_state:project_apps(State), - DepApps = rebar_app_discover:find_apps([DepsDir], all), OtherPlugins = lists:flatmap(fun(App) -> AppDir = rebar_app_info:dir(App), C = rebar_config:consult(AppDir), S = rebar_state:new(rebar_state:new(), C, AppDir), rebar_state:get(S, plugins, []) - end, ProjectApps++DepApps), + end, ProjectApps), handle_plugins(Plugins++OtherPlugins, State). |