diff options
| author | Septs <github@septs.pw> | 2020-11-20 03:42:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 12:42:51 +0100 |
| commit | d57131dc49500a056c5b78b0fb444c7cb1ca83cd (patch) | |
| tree | 7e610db5108dbaf3980387c7d2c44515fd206470 /plugins/shell-proxy | |
| parent | e92a4667cbd65e9567dc962b5a482e10f319596a (diff) | |
| download | zsh-d57131dc49500a056c5b78b0fb444c7cb1ca83cd.tar.gz zsh-d57131dc49500a056c5b78b0fb444c7cb1ca83cd.tar.bz2 zsh-d57131dc49500a056c5b78b0fb444c7cb1ca83cd.zip | |
fix(shell-proxy): change NAME env variable for WSL clash (#9447)
Diffstat (limited to 'plugins/shell-proxy')
| -rwxr-xr-x | plugins/shell-proxy/proxy.py | 2 | ||||
| -rwxr-xr-x | plugins/shell-proxy/ssh-agent.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/shell-proxy/proxy.py b/plugins/shell-proxy/proxy.py index 2b62f6cb5..d2e5361cb 100755 --- a/plugins/shell-proxy/proxy.py +++ b/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") } diff --git a/plugins/shell-proxy/ssh-agent.py b/plugins/shell-proxy/ssh-agent.py index 61cf84c0b..4ee24b755 100755 --- a/plugins/shell-proxy/ssh-agent.py +++ b/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", |