Browse Source

fix(shell-proxy): change NAME env variable for WSL clash (#9447)

Septs 3 years ago
parent
commit
d57131dc49
2 changed files with 2 additions and 2 deletions
  1. 1 1
      plugins/shell-proxy/proxy.py
  2. 1 1
      plugins/shell-proxy/ssh-agent.py

+ 1 - 1
plugins/shell-proxy/proxy.py

@@ -30,7 +30,7 @@ def merge(mapping: dict):
 class CommandSet:
     proxies = make_proxies(get_http_proxy())
     aliases = {
-        _: "env NAME=%s %s" % (_, ssh_agent)
+        _: "env __SSH_PROGRAM_NAME__=%s %s" % (_, ssh_agent)
         for _ in ("ssh", "sftp", "scp", "slogin", "ssh-copy-id")
     }
 

+ 1 - 1
plugins/shell-proxy/ssh-agent.py

@@ -6,7 +6,7 @@ import sys
 ssh_proxy = os.path.join(os.path.dirname(__file__), "ssh-proxy.py")
 
 argv = [
-    os.environ.get("NAME", "ssh"),
+    os.environ.get("__SSH_PROGRAM_NAME__", "ssh"),
     "-o",
     "ProxyCommand={} %h %p".format(ssh_proxy),
     "-o",