Skip to content

Commit d2860cb

Browse files
committed
fix(_comp_compgen_known_hosts): work around bash-4.2 nounset
1 parent 43bb8f0 commit d2860cb

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

bash_completion

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2642,21 +2642,22 @@ _comp_compgen_known_hosts__impl()
26422642
_comp_compgen -av known_hosts -- -A hostname -P "$prefix" -S "$suffix"
26432643
fi
26442644

2645-
if ((${#known_hosts[@]})); then
2646-
if [[ $ipv4 ]]; then
2647-
known_hosts=("${known_hosts[@]/*:*$suffix/}")
2648-
fi
2649-
if [[ $ipv6 ]]; then
2650-
known_hosts=("${known_hosts[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}")
2651-
fi
2652-
if [[ $ipv4 || $ipv6 ]]; then
2653-
for i in "${!known_hosts[@]}"; do
2654-
[[ ${known_hosts[i]} ]] || unset -v 'known_hosts[i]'
2655-
done
2656-
fi
2657-
_comp_compgen -v known_hosts -c "$prefix$cur" ltrim_colon "${known_hosts[@]}"
2645+
((${#known_hosts[@]})) || return 1
2646+
2647+
if [[ $ipv4 ]]; then
2648+
known_hosts=("${known_hosts[@]/*:*$suffix/}")
2649+
fi
2650+
if [[ $ipv6 ]]; then
2651+
known_hosts=("${known_hosts[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}")
2652+
fi
2653+
if [[ $ipv4 || $ipv6 ]]; then
2654+
for i in "${!known_hosts[@]}"; do
2655+
[[ ${known_hosts[i]} ]] || unset -v 'known_hosts[i]'
2656+
done
26582657
fi
2658+
((${#known_hosts[@]})) || return 1
26592659

2660+
_comp_compgen -v known_hosts -c "$prefix$cur" ltrim_colon "${known_hosts[@]}"
26602661
} # _comp_compgen_known_hosts__impl()
26612662
complete -F _known_hosts traceroute traceroute6 \
26622663
fping fping6 telnet rsh rlogin ftp dig drill mtr ssh-installkeys showmount

0 commit comments

Comments
 (0)