[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-339-gf1d5758
Ville Skyttä
ville.skytta at iki.fi
Thu Jun 2 07:52:44 UTC 2011
The following commit has been merged in the master branch:
commit 8f3777e278da40a99cc6967736a6a2a1922e33cd
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Thu Jun 2 10:49:06 2011 +0300
Rename _ssh_bindaddress to global _ip_addresses for reuse in other completions.
diff --git a/bash_completion b/bash_completion
index 8dd399a..b1e70f3 100644
--- a/bash_completion
+++ b/bash_completion
@@ -888,6 +888,17 @@ _configured_interfaces()
fi
}
+# Local IP addresses.
+#
+_ip_addresses()
+{
+ COMPREPLY+=( $( compgen -W \
+ "$( PATH="$PATH:/sbin" ifconfig -a |
+ sed -ne 's/.*addr:\([^[:space:]]*\).*/\1/p' \
+ -ne 's/.*inet[[:space:]]\{1,\}\([^[:space:]]*\).*/\1/p' )" \
+ -- "$cur" ) )
+}
+
# This function completes on available kernels
#
_kernel_versions()
diff --git a/completions/ssh b/completions/ssh
index 16654bc..ebce83c 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -2,15 +2,6 @@
have ssh || return
-_ssh_bindaddress()
-{
- COMPREPLY+=( $( compgen -W \
- "$( PATH="$PATH:/sbin" ifconfig -a | \
- sed -ne 's/.*addr:\([^[:space:]]*\).*/\1/p' \
- -ne 's/.*inet[[:space:]]\{1,\}\([^[:space:]]*\).*/\1/p' )" \
- -- "$cur" ) )
-}
-
_ssh_ciphers()
{
COMPREPLY+=( $( compgen -W '3des-cbc aes128-cbc \
@@ -73,7 +64,7 @@ _ssh_suboption()
COMPREPLY=( $( compgen -W 'any inet inet6' -- "$cur" ) )
;;
BindAddress)
- _ssh_bindaddress
+ _ip_addresses
;;
Cipher)
COMPREPLY=( $( compgen -W 'blowfish des 3des' -- "$cur" ) )
@@ -149,7 +140,7 @@ _ssh()
return 0
;;
-b)
- _ssh_bindaddress
+ _ip_addresses
return 0
;;
-D|-e|-I|-L|-O|-p|-R|-W)
--
bash-completion
More information about the Bash-completion-commits
mailing list