diff options
author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-05-04 22:14:52 -0500 |
---|---|---|
committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-05-04 22:14:52 -0500 |
commit | 9969e734468463f151fd86925ace5af0d0b80bfb (patch) | |
tree | 927ec3100abefb06c4c60318144667e33b499664 /src/rebar3.erl | |
parent | 4bdfb1ff9f8f781f80448c11574ef753e31be26a (diff) | |
parent | 4dd3eb5aefb866ae744d1c0dd30eb8db02ef263c (diff) |
Merge pull request #388 from ferd/fix-semver-stuff
Use resource handlers to deal with deps/semver
Diffstat (limited to 'src/rebar3.erl')
-rw-r--r-- | src/rebar3.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl index b0cc949..92803c5 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -127,19 +127,17 @@ run_aux(State, RawArgs) -> filename:join(filename:absname(rebar_state:dir(State2)), BaseDir)), {ok, Providers} = application:get_env(rebar, providers), - {ok, Resources} = application:get_env(rebar, resources), - State4 = rebar_state:resources(State3, Resources), - State5 = rebar_plugins:install(State4), + State4 = rebar_plugins:install(State3), %% Providers can modify profiles stored in opts, so set default after initializing providers - State6 = rebar_state:create_logic_providers(Providers, State5), - State7 = rebar_state:default(State6, rebar_state:opts(State6)), + State5 = rebar_state:create_logic_providers(Providers, State4), + State6 = rebar_state:default(State5, rebar_state:opts(State5)), {Task, Args} = parse_args(RawArgs), - State8 = rebar_state:code_paths(State7, default, code:get_path()), + State7 = rebar_state:code_paths(State6, default, code:get_path()), - rebar_core:init_command(rebar_state:command_args(State8, Args), Task). + rebar_core:init_command(rebar_state:command_args(State7, Args), Task). init_config() -> %% Initialize logging system |