diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-11-21 14:57:26 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-11-21 14:57:26 -0700 |
| commit | 3aaa0bc62ece494dd2b6e47a191de79e562156f9 (patch) | |
| tree | 53b623b60358bd9b8a5f9d267166f717e2f3947c /plugins/shell-proxy | |
| parent | 058885f5263f29f046c96ea2ecf55e6dca3ed321 (diff) | |
| parent | 88b3f028f4a2ffa4f3853a11e4b8e0d78008ca34 (diff) | |
| download | zsh-3aaa0bc62ece494dd2b6e47a191de79e562156f9.tar.gz zsh-3aaa0bc62ece494dd2b6e47a191de79e562156f9.tar.bz2 zsh-3aaa0bc62ece494dd2b6e47a191de79e562156f9.zip | |
Merge remote-tracking branch 'origin/master'
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", |