diff options
| -rwxr-xr-x | bootstrap | 10 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 4 |
2 files changed, 7 insertions, 7 deletions
@@ -94,7 +94,7 @@ request(Url) -> Error end. -get_http_var() -> +get_rebar_config() -> {ok, [[Home]]} = init:get_argument(home), ConfDir = filename:join(Home, ".config/rebar3"), case file:consult(filename:join(ConfDir, "rebar.config")) of @@ -104,12 +104,12 @@ get_http_var() -> [] end. -get_http(Scheme) -> - proplists:get_value(Scheme, get_http_var(), []). +get_http_vars(Scheme) -> + proplists:get_value(Scheme, get_rebar_config(), []). set_httpc_options() -> - set_httpc_options(https_proxy, get_http(https_proxy)), - set_httpc_options(proxy, get_http(http_proxy)). + set_httpc_options(https_proxy, get_http_vars(https_proxy)), + set_httpc_options(proxy, get_http_vars(http_proxy)). set_httpc_options(_, []) -> ok; diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index 97104ce..2bfe99e 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -677,8 +677,8 @@ get_http(Scheme) -> proplists:get_value(Scheme, get_http_var(), []). set_httpc_options() -> - set_httpc_options(https_proxy, get_http(https_proxy)), - set_httpc_options(proxy, get_http(http_proxy)). + set_httpc_options(https_proxy, get_http_vars(https_proxy)), + set_httpc_options(proxy, get_http_vars(http_proxy)). set_httpc_options(_, []) -> ok; |