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
Oh My Zsh
Commits
2e487b18
Unverified
Commit
2e487b18
authored
Apr 06, 2021
by
Septs
Committed by
GitHub
Apr 06, 2021
Browse files
feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting (#9774)
parent
790f185e
Changes
2
Show whitespace changes
Inline
Side-by-side
plugins/shell-proxy/proxy.py
View file @
2e487b18
...
...
@@ -9,8 +9,9 @@ user_proxy = os.environ.get("CONFIG_PROXY", os.path.expandvars("$HOME/.config/pr
def
get_http_proxy
():
if
"DEFAULT_PROXY"
in
os
.
environ
:
return
os
.
environ
[
"DEFAULT_PROXY"
]
default_proxy
=
os
.
environ
.
get
(
"DEFAULT_PROXY"
)
if
default_proxy
:
return
default_proxy
if
os
.
path
.
isfile
(
user_proxy
):
return
check_output
(
user_proxy
).
decode
(
"utf-8"
).
strip
()
raise
Exception
(
"Not found, Proxy configuration"
)
...
...
plugins/shell-proxy/shell-proxy.plugin.zsh
View file @
2e487b18
...
...
@@ -4,7 +4,7 @@
__PROXY__
=
"
${
0
:A:h
}
/proxy.py"
proxy
()
{
source
<
(
"
$__PROXY__
"
"
$1
"
)
source
<
(
env
"DEFAULT_PROXY=
$DEFAULT_PROXY
"
"
$__PROXY__
"
"
$1
"
)
}
_proxy
()
{
...
...
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