Skip to content

Commit d26fc05

Browse files
committed
fix(_comp_compgen_known_hosts): work around bash-4.2 nounset
1 parent 63a6248 commit d26fc05

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
@@ -2579,21 +2579,22 @@ _comp_compgen_known_hosts__impl()
25792579
_comp_compgen -av known_hosts -- -A hostname -P "$prefix" -S "$suffix"
25802580
fi
25812581

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

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

0 commit comments

Comments
 (0)