linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue with homebrew-installed nc taking precedence in $PATH

Browse source 
This commit addresses a problem where the nc command installed via homebrew was being used preferentially over the intended version due to its higher precedence in the $PATH environment variable. Adjustments have been made to ensure the script selects the correct nc executable, avoiding conflicts and ensuring consistent behavior across different setups.
This commit is contained in:
Vangie Du 2024-04-19 22:10:29 +08:00 • committed by GitHub
commit 89011fc3ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/shell-proxy/ssh-proxy.py
View file

@ -21,8 +21,12 @@ if parsed.scheme not in proxy_protocols:
raise TypeError('unsupported proxy protocol: "{}"'.format(parsed.scheme)) raise TypeError('unsupported proxy protocol: "{}"'.format(parsed.scheme))
def make_argv(): def make_argv():
yield "nc" if sys.platform == 'darwin':
if sys.platform in {'linux', 'cygwin'}: # 'nc' in $PATH may be installed by homebrew, if without path
yield "/usr/bin/nc"
else:
yield "nc"
if sys.platform in {'linux', 'cygwin', 'darwin'}:
# caveats: the built-in netcat of most linux distributions and cygwin support proxy type # caveats: the built-in netcat of most linux distributions and cygwin support proxy type
# caveats: macOS built-in netcat command not supported proxy-type # caveats: macOS built-in netcat command not supported proxy-type
yield "-X" # --proxy-type yield "-X" # --proxy-type