feat(_ip_addresses): auto ltrim colon completions when appropriate

Initializing the completion with `-n :` is still needed.
scop · May 26, 2023 · ccdf953 · ccdf953
1 parent 5d57dd0
commit ccdf953
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/bash_completion b/bash_completion
@@ -1506,6 +1506,8 @@ _configured_interfaces()
 }
 
 # Local IP addresses.
+# If producing IPv6 completions, use `-n :' to `_comp_initialize`.
+#
 # -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

diff --git a/completions/iperf b/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)

diff --git a/completions/links b/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 | \

diff --git a/completions/nc b/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