Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
d57131dc
Unverified
Commit
d57131dc
authored
Nov 20, 2020
by
Septs
Committed by
GitHub
Nov 20, 2020
Browse files
fix(shell-proxy): change NAME env variable for WSL clash (#9447)
parent
e92a4667
Changes
2
Hide whitespace changes
Inline
Side-by-side
plugins/shell-proxy/proxy.py
View file @
d57131dc
...
@@ -30,7 +30,7 @@ def merge(mapping: dict):
...
@@ -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"
)
}
}
...
...
plugins/shell-proxy/ssh-agent.py
View file @
d57131dc
...
@@ -6,7 +6,7 @@ import sys
...
@@ -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"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment