Skip to content

Commit aba56f5

Browse files
committed
fix(_comp_compgen_known_hosts): work around bash-4.2 nounset
1 parent 3a9d972 commit aba56f5

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
@@ -2587,21 +2587,22 @@ _comp_compgen_known_hosts__impl()
25872587
_comp_compgen -av known_hosts -- -A hostname -P "$prefix" -S "$suffix"
25882588
fi
25892589

2590-
if ((${#known_hosts[@]})); then
2591-
if [[ $ipv4 ]]; then
2592-
known_hosts=("${known_hosts[@]/*:*$suffix/}")
2593-
fi
2594-
if [[ $ipv6 ]]; then
2595-
known_hosts=("${known_hosts[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}")
2596-
fi
2597-
if [[ $ipv4 || $ipv6 ]]; then
2598-
for i in "${!known_hosts[@]}"; do
2599-
[[ ${known_hosts[i]} ]] || unset -v 'known_hosts[i]'
2600-
done
2601-
fi
2602-
_comp_compgen -v known_hosts -c "$prefix$cur" ltrim_colon "${known_hosts[@]}"
2590+
((${#known_hosts[@]})) || return 1
2591+
2592+
if [[ $ipv4 ]]; then
2593+
known_hosts=("${known_hosts[@]/*:*$suffix/}")
2594+
fi
2595+
if [[ $ipv6 ]]; then
2596+
known_hosts=("${known_hosts[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}")
2597+
fi
2598+
if [[ $ipv4 || $ipv6 ]]; then
2599+
for i in "${!known_hosts[@]}"; do
2600+
[[ ${known_hosts[i]} ]] || unset -v 'known_hosts[i]'
2601+
done
26032602
fi
2603+
((${#known_hosts[@]})) || return 1
26042604

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

0 commit comments

Comments
 (0)