From 3219a666f448b882c7534e200295be09ae6434fd Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 7 Dec 2014 18:39:26 -0600 Subject: rewrite profiles --- src/rebar3.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/rebar3.erl') diff --git a/src/rebar3.erl b/src/rebar3.erl index f6a2b78..368ba68 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -106,11 +106,11 @@ run_aux(State, GlobalPluginProviders, RawArgs) -> application:start(ssl), inets:start(), - State2 = case os:getenv("REBAR_DEFAULT_PROFILE") of + State2 = case os:getenv("REBAR_PROFILE") of false -> - rebar_state:current_profile(State, default); + State; Profile -> - State1 = rebar_state:current_profile(State, list_to_atom(Profile)), + State1 = rebar_state:apply_profiles(State, [list_to_atom(Profile)]), rebar_state:default(State1, rebar_state:opts(State1)) end, @@ -143,7 +143,7 @@ init_config() -> Config1 = case rebar_config:consult_file(?LOCK_FILE) of [D] -> - [{locks, D} | Config]; + [{locks, D}, {{deps, default}, D} | Config]; _ -> Config end, -- cgit v1.1