diff options
| author | Septs <github@septs.pw> | 2021-04-06 20:49:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 14:49:03 +0200 |
| commit | 2e487b187eac96ac63c8bd0f5e3c28d5ed06d828 (patch) | |
| tree | 47448822d17fc5649ccce0a56f9bb0a0700d98df /plugins/shell-proxy | |
| parent | 790f185e0fd8b70eab33847afe02af07f6af3a1e (diff) | |
| download | zsh-2e487b187eac96ac63c8bd0f5e3c28d5ed06d828.tar.gz zsh-2e487b187eac96ac63c8bd0f5e3c28d5ed06d828.tar.bz2 zsh-2e487b187eac96ac63c8bd0f5e3c28d5ed06d828.zip | |
feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting (#9774)
Diffstat (limited to 'plugins/shell-proxy')
| -rwxr-xr-x | plugins/shell-proxy/proxy.py | 5 | ||||
| -rw-r--r-- | plugins/shell-proxy/shell-proxy.plugin.zsh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/shell-proxy/proxy.py b/plugins/shell-proxy/proxy.py index d2e5361cb..97f4cf873 100755 --- a/plugins/shell-proxy/proxy.py +++ b/plugins/shell-proxy/proxy.py @@ -9,8 +9,9 @@ user_proxy = os.environ.get("CONFIG_PROXY", os.path.expandvars("$HOME/.config/pr def get_http_proxy(): - if "DEFAULT_PROXY" in os.environ: - return os.environ["DEFAULT_PROXY"] + default_proxy = os.environ.get("DEFAULT_PROXY") + if default_proxy: + return default_proxy if os.path.isfile(user_proxy): return check_output(user_proxy).decode("utf-8").strip() raise Exception("Not found, Proxy configuration") diff --git a/plugins/shell-proxy/shell-proxy.plugin.zsh b/plugins/shell-proxy/shell-proxy.plugin.zsh index fd0e2fe79..315ade665 100644 --- a/plugins/shell-proxy/shell-proxy.plugin.zsh +++ b/plugins/shell-proxy/shell-proxy.plugin.zsh @@ -4,7 +4,7 @@ __PROXY__="${0:A:h}/proxy.py" proxy() { - source <("$__PROXY__" "$1") + source <(env "DEFAULT_PROXY=$DEFAULT_PROXY" "$__PROXY__" "$1") } _proxy() { |