github-repos/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-27 15:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Septs 2020-11-20 03:42:51 -08:00 committed by GitHub
parent e92a4667cb
commit d57131dc49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/shell-proxy/proxy.py
View File

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

2
plugins/shell-proxy/ssh-agent.py
View File

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