Browse Source

Renamed functions.

pull/579/head
CarlosEDP 9 years ago
parent
commit
4a25a4d9d5
2 changed files with 7 additions and 7 deletions
  1. +5
    -5
      bootstrap
  2. +2
    -2
      src/rebar_utils.erl

+ 5
- 5
bootstrap View File

@ -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;

+ 2
- 2
src/rebar_utils.erl View File

@ -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;

Loading…
Cancel
Save