Merge pull request #991 from scop/fix/ip-addresses-colons

fix: IPv6 colon handling issues

Author: scop

bash_completion

@@ -1506,6 +1506,8 @@ _configured_interfaces()
 }
 
 # Local IP addresses.
+# If producing IPv6 completions, `_comp_initialize` with `-n :`.
+#
 # -4: IPv4 addresses only (default)
 # -6: IPv6 addresses only
 # -a: All addresses
@@ -1526,6 +1528,7 @@ _ip_addresses()
         command sed -e 's/[[:space:]]addr:/ /' -ne \
             "s|.*inet${n}[[:space:]]\{1,\}\([^[:space:]/]*\).*|\1|p")
     _comp_compgen -a -- -W "$addrs"
+    [[ ! $n ]] || _comp_ltrim_colon_completions "$cur"
 }
 
 # This function completes on available kernels

completions/curl

@@ -3,7 +3,7 @@
 _comp_cmd_curl()
 {
     local cur prev words cword comp_args
-    _comp_initialize -- "$@" || return
+    _comp_initialize -n : -- "$@" || return
 
     local noargopts='!(-*|*[KbcDoTCFmQreYytzuAwEdHPxX]*)'
     # shellcheck disable=SC2254

completions/iperf

@@ -37,7 +37,6 @@ _comp_cmd_iperf()
         --bind | -${noargopts}B)
             _available_interfaces -a
             _ip_addresses -a
-            _comp_ltrim_colon_completions "$cur"
             return
             ;;
         --bind-dev)

completions/links

@@ -47,7 +47,6 @@ _comp_cmd_links()
             ;;
         -bind-address-ipv6)
             _ip_addresses -6
-            _comp_ltrim_colon_completions "$cur"
             return
             ;;
         -async-dns | -download-utime | -aggressive-cache | -only-proxies | \

completions/nc

@@ -12,7 +12,6 @@ _comp_cmd_nc()
         -*s)
             if [[ ${words[*]} == *-6* ]]; then
                 _ip_addresses -6
-                _comp_ltrim_colon_completions "$cur"
             else
                 _ip_addresses
             fi