Detect normal proxy variables instead of defining my own

LivInTheLookingGlass · Oct 1, 2019 · 146b841 · 146b841
1 parent 33c6d15
commit 146b841
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/c/Makefile b/c/Makefile
@@ -1,13 +1,16 @@
 PY?=python3
-PROXY?=
 USER_FLAG?=--user
 PIP?=$(PY) -m pip
 
-ifneq ($(PROXY), )
-PROXY_ARG="--proxy=$(PROXY)"
+ifneq ($(https_proxy), )
+PROXY_ARG=--proxy=$(https_proxy)
+else
+ifneq ($(http_proxy), )
+PROXY_ARG=--proxy=$(http_proxy)
 else
 PROXY_ARG=
 endif
+endif
 
 test_%: dependencies
 	$(PY) -m pytest -v -n$* test_euler.py

diff --git a/python/Makefile b/python/Makefile
@@ -1,6 +1,5 @@
 LINT?=
 PY?=python3
-PROXY?=
 USER_FLAG?=--user
 PIP?=$(PY) -m pip
 MYPY?=true
@@ -23,11 +22,15 @@ endif
 endif
 endif
 
-ifneq ($(PROXY), )
-PROXY_ARG="--proxy=$(PROXY)"
+ifneq ($(https_proxy), )
+PROXY_ARG=--proxy=$(https_proxy)
+else
+ifneq ($(http_proxy), )
+PROXY_ARG=--proxy=$(http_proxy)
 else
 PROXY_ARG=
 endif
+endif
 
 test: dependencies _test