From eb2d31be267ec0f85fe1bcd1f322c37149e3a9a3 Mon Sep 17 00:00:00 2001 From: CarlosEDP Date: Thu, 2 Jul 2015 12:00:13 -0300 Subject: Use rebar own method to read global config file. --- src/rebar_utils.erl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index 2bfe99e..1cd6694 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -663,18 +663,10 @@ maybe_ends_in_comma(H) -> _ -> false end. -get_http_var() -> - {ok, [[Home]]} = init:get_argument(home), - ConfDir = filename:join(Home, ".config/rebar3"), - case file:consult(filename:join(ConfDir, "rebar.config")) of - {ok, Config} -> - Config; - _ -> - [] - end. - -get_http(Scheme) -> - proplists:get_value(Scheme, get_http_var(), []). +get_http_vars(Scheme) -> + GlobalConfigFile = rebar_dir:global_config(), + Config = rebar_config:consult_file(GlobalConfigFile), + proplists:get_value(Scheme, Config, []). set_httpc_options() -> set_httpc_options(https_proxy, get_http_vars(https_proxy)), -- cgit v1.1