summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2016-06-11 11:58:16 -0400
committerGitHub <noreply@github.com>2016-06-11 11:58:16 -0400
commite337793e9fda77462d5d5dec7ed0fa3fd11483d7 (patch)
treeaa46d668be4b1630e4c2d44203314ed074ea3df0 /bootstrap
parent3978062dc1180efde6624541535962957fc672e4 (diff)
parent87f9950839f8d7e9fd904c7ff21c95fb5aeac726 (diff)
Merge pull request #1230 from ferd/support-env-proxy-vars
Expand os ENV proxy support to bootstrap script
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap6
1 files changed, 5 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index f52779e..323b0a5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -133,7 +133,11 @@ get_rebar_config() ->
end.
get_http_vars(Scheme) ->
- proplists:get_value(Scheme, get_rebar_config(), []).
+ OS = case os:getenv(atom_to_list(Scheme)) of
+ Str when is_list(Str) -> Str;
+ _ -> []
+ end,
+ proplists:get_value(Scheme, get_rebar_config(), OS).
set_httpc_options() ->
set_httpc_options(https_proxy, get_http_vars(https_proxy)),