diff options
| author | drelo <1127662780@qq.com> | 2020-06-19 15:27:40 +0800 |
|---|---|---|
| committer | Oliver Kiddle <okiddle@yahoo.co.uk> | 2020-06-26 00:34:36 +0200 |
| commit | eec1c48a91c3da2e88212cd49e1cd33a3db24048 (patch) | |
| tree | 771361462464d868d3777e3cf048a22212270257 | |
| parent | c4540e154f49de6573b3fa1e924528178cfd7853 (diff) | |
| download | zsh-eec1c48a91c3da2e88212cd49e1cd33a3db24048.tar.gz zsh-eec1c48a91c3da2e88212cd49e1cd33a3db24048.zip | |
46075: drelo: prefer ip on linux for finding network interfaces
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Type/_find_net_interfaces | 12 |
2 files changed, 12 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2020-06-26 Oliver Kiddle <okiddle@yahoo.co.uk> + * 46075: drelo: Completion/Unix/Type/_find_net_interfaces: + prefer ip on linux for finding network interfaces + * 45895: oxiedi: Completion/Base/Utility/_sequence, Test/Y01completion.ztst: ignore dedup patterns in _sequence diff --git a/Completion/Unix/Type/_find_net_interfaces b/Completion/Unix/Type/_find_net_interfaces index 3f5db6b9a..06238b11c 100644 --- a/Completion/Unix/Type/_find_net_interfaces +++ b/Completion/Unix/Type/_find_net_interfaces @@ -22,11 +22,17 @@ case $OSTYPE in darwin*|freebsd*|dragonfly*) net_intf_list=( $(ifconfig -l) ) ;; irix*) net_intf_list=( ${${${(f)"$(/usr/etc/netstat -i)"}%% *}[2,-1]} ) ;; *) - # linux's deprecated ifconfig may truncate long interface names - net_intf_list=( $(_call_program interfaces "ifconfig -a 2>/dev/null | sed -n 's/^\([^ :]*\).*/\1/p'") ) + if (( $+commands[ip] )); then + # if ip is available, we can also show altnames + net_intf_list=( $(_call_program interfaces "ip link | sed -ne 's/^[0-9]\+: \([^:@]\+\).*/\1/p;t; s/^[\ ]\+altname \(.\+\)\$/\1/p'") ) + else + # linux's deprecated ifconfig may truncate long interface names + net_intf_list=( $(_call_program interfaces "ifconfig -a 2>/dev/null | sed -n 's/^\([^ :]*\).*/\1/p'") ) + fi + if (( ${#net_intf_list} == 0 )) && [[ -d /proc/sys/net/ipv4/conf ]]; then # On linux we used to use the following as the default, without /sys/class/net/*. - # However, we now use ifconfig since it finds additional devices such + # However, we now use ip or ifconfig since it finds additional devices such # as tunnels. So only do this if that didn't work. typeset -gU net_intf_list net_intf_list=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) /sys/class/net/*(N:t) ) |