Skip to content

Commit c99cf73

Browse files
committed
fix(_comp_compgen_known_hosts): work around bash-4.2 nounset
1 parent 6045317 commit c99cf73

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
@@ -2575,21 +2575,22 @@ _comp_compgen_known_hosts__impl()
25752575
_comp_compgen -av known_hosts -- -A hostname -P "$prefix" -S "$suffix"
25762576
fi
25772577

2578-
if ((${#known_hosts[@]})); then
2579-
if [[ $ipv4 ]]; then
2580-
known_hosts=("${known_hosts[@]/*:*$suffix/}")
2581-
fi
2582-
if [[ $ipv6 ]]; then
2583-
known_hosts=("${known_hosts[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}")
2584-
fi
2585-
if [[ $ipv4 || $ipv6 ]]; then
2586-
for i in "${!known_hosts[@]}"; do
2587-
[[ ${known_hosts[i]} ]] || unset -v 'known_hosts[i]'
2588-
done
2589-
fi
2590-
_comp_compgen -v known_hosts -c "$prefix$cur" ltrim_colon "${known_hosts[@]}"
2578+
((${#known_hosts[@]})) || return 1
2579+
2580+
if [[ $ipv4 ]]; then
2581+
known_hosts=("${known_hosts[@]/*:*$suffix/}")
2582+
fi
2583+
if [[ $ipv6 ]]; then
2584+
known_hosts=("${known_hosts[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}")
2585+
fi
2586+
if [[ $ipv4 || $ipv6 ]]; then
2587+
for i in "${!known_hosts[@]}"; do
2588+
[[ ${known_hosts[i]} ]] || unset -v 'known_hosts[i]'
2589+
done
25912590
fi
2591+
((${#known_hosts[@]})) || return 1
25922592

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

0 commit comments

Comments
 (0)