diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2016-06-11 11:47:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 11:47:23 -0400 |
| commit | 3978062dc1180efde6624541535962957fc672e4 (patch) | |
| tree | 147ed5fdcf30d62c6a3c780d6917ab0c5b8ee835 /src | |
| parent | 979bb18b279d54a59a1ed72a5965b12ec3ac311e (diff) | |
| parent | 398b3085fc20c961a333f7b8f9277e5eb70b3482 (diff) | |
Merge pull request #1229 from ferd/support-env-proxy-vars
Support ENV config for proxy values
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_utils.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index 56a3940..ce6996c 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -789,9 +789,13 @@ maybe_ends_in_comma(H) -> end. get_http_vars(Scheme) -> + OS = case os:getenv(atom_to_list(Scheme)) of + Str when is_list(Str) -> Str; + _ -> [] + end, GlobalConfigFile = rebar_dir:global_config(), Config = rebar_config:consult_file(GlobalConfigFile), - proplists:get_value(Scheme, Config, []). + proplists:get_value(Scheme, Config, OS). set_httpc_options() -> set_httpc_options(https_proxy, get_http_vars(https_proxy)), |