From 2e487b187eac96ac63c8bd0f5e3c28d5ed06d828 Mon Sep 17 00:00:00 2001
From: Septs <github@septs.pw>
Date: Tue, 6 Apr 2021 20:49:03 +0800
Subject: [PATCH] feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting
 (#9774)

---
 plugins/shell-proxy/proxy.py               | 5 +++--
 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() {