Unverified Commit 2e487b18 authored by Septs's avatar Septs Committed by GitHub
Browse files

feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting (#9774)

parent 790f185e
...@@ -9,8 +9,9 @@ user_proxy = os.environ.get("CONFIG_PROXY", os.path.expandvars("$HOME/.config/pr ...@@ -9,8 +9,9 @@ user_proxy = os.environ.get("CONFIG_PROXY", os.path.expandvars("$HOME/.config/pr
def get_http_proxy(): def get_http_proxy():
if "DEFAULT_PROXY" in os.environ: default_proxy = os.environ.get("DEFAULT_PROXY")
return os.environ["DEFAULT_PROXY"] if default_proxy:
return default_proxy
if os.path.isfile(user_proxy): if os.path.isfile(user_proxy):
return check_output(user_proxy).decode("utf-8").strip() return check_output(user_proxy).decode("utf-8").strip()
raise Exception("Not found, Proxy configuration") raise Exception("Not found, Proxy configuration")
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
__PROXY__="${0:A:h}/proxy.py" __PROXY__="${0:A:h}/proxy.py"
proxy() { proxy() {
source <("$__PROXY__" "$1") source <(env "DEFAULT_PROXY=$DEFAULT_PROXY" "$__PROXY__" "$1")
} }
_proxy() { _proxy() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment