[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 3f0d8f8e9f1991e7d7610fd210c68421eef4e09f
Guillaume Rousse
Guillaume.Rousse at inria.fr
Thu Aug 19 11:36:59 UTC 2010
The following commit has been merged in the master branch:
commit 3f0d8f8e9f1991e7d7610fd210c68421eef4e09f
Author: Guillaume Rousse <Guillaume.Rousse at inria.fr>
Date: Thu Aug 19 13:36:47 2010 +0200
merge iconv and getent completions, as they are both glibc utils
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f8420e1..aceea78 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -42,15 +42,14 @@ static_bashcomp = abook \
gcl \
gdb \
genisoimage \
- getent \
gkrellm \
+ glibc \
gnatmake \
gpg \
gpg2 \
gzip \
heimdal \
hping2 \
- iconv \
ifupdown \
imagemagick \
info \
diff --git a/contrib/getent b/contrib/getent
deleted file mode 100644
index 54e62ab..0000000
--- a/contrib/getent
+++ /dev/null
@@ -1,55 +0,0 @@
-# bash completion for getent
-
-have getent &&
-_getent()
-{
- local cur prev
-
- COMPREPLY=()
- _get_comp_words_by_ref cur prev
-
- case $prev in
- passwd)
- COMPREPLY=( $( compgen -u "$cur" ) )
- return 0
- ;;
- group)
- COMPREPLY=( $( compgen -g "$cur" ) )
- return 0
- ;;
- services)
- COMPREPLY=( $( compgen -s "$cur" ) )
- return 0
- ;;
- hosts)
- COMPREPLY=( $( compgen -A hostname "$cur" ) )
- return 0
- ;;
- protocols|networks|ahosts|ahostsv4|ahostsv6|rpc)
- COMPREPLY=( $( compgen -W "$( getent "$prev" | \
- awk '{ print $1 }' )" -- "$cur" ) )
- return 0
- ;;
- aliases|shadow)
- COMPREPLY=( $( compgen -W "$( getent "$prev" | cut -d: -f1 )" \
- -- "$cur" ) )
- return 0
- ;;
- esac
-
-
- if [ $COMP_CWORD -eq 1 ]; then
- COMPREPLY=( $( compgen -W 'passwd group hosts services protocols \
- networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc \
- shadow' -- "$cur" ) )
- fi
-} &&
-complete -F _getent getent
-
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/contrib/glibc b/contrib/glibc
new file mode 100644
index 0000000..954a1c6
--- /dev/null
+++ b/contrib/glibc
@@ -0,0 +1,96 @@
+# Completions for tools included in glibc
+
+# iconv(1)
+have iconv &&
+_iconv()
+{
+ local cur prev split=false
+
+ COMPREPLY=()
+ _get_comp_words_by_ref cur prev
+
+ _split_longopt && split=true
+
+ case $prev in
+ -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
+ --widechar-subst)
+ return 0
+ ;;
+ -f|--from-code|-t|--to-code)
+ COMPREPLY=( $( compgen -W '$( iconv -l | \
+ sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
+ return 0
+ ;;
+ -o|--output)
+ _filedir
+ return 0
+ ;;
+ esac
+
+ $split && return 0
+
+ if [[ "$cur" = -* ]]; then
+ COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
+ --unicode-subst --byte-subst --widechar-subst --output --silent
+ --verbose --help --usage --version' -- "$cur" ) )
+ return 0
+ fi
+} &&
+complete -F _iconv -o default iconv
+# Intentionally not -o filenames here, -f/-t completions may contain slashes
+# and -o filenames would break them.
+
+# getent(1)
+have getent &&
+_getent()
+{
+ local cur prev
+
+ COMPREPLY=()
+ _get_comp_words_by_ref cur prev
+
+ case $prev in
+ passwd)
+ COMPREPLY=( $( compgen -u "$cur" ) )
+ return 0
+ ;;
+ group)
+ COMPREPLY=( $( compgen -g "$cur" ) )
+ return 0
+ ;;
+ services)
+ COMPREPLY=( $( compgen -s "$cur" ) )
+ return 0
+ ;;
+ hosts)
+ COMPREPLY=( $( compgen -A hostname "$cur" ) )
+ return 0
+ ;;
+ protocols|networks|ahosts|ahostsv4|ahostsv6|rpc)
+ COMPREPLY=( $( compgen -W "$( getent "$prev" | \
+ awk '{ print $1 }' )" -- "$cur" ) )
+ return 0
+ ;;
+ aliases|shadow)
+ COMPREPLY=( $( compgen -W "$( getent "$prev" | cut -d: -f1 )" \
+ -- "$cur" ) )
+ return 0
+ ;;
+ esac
+
+
+ if [ $COMP_CWORD -eq 1 ]; then
+ COMPREPLY=( $( compgen -W 'passwd group hosts services protocols \
+ networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc \
+ shadow' -- "$cur" ) )
+ fi
+} &&
+complete -F _getent getent
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/contrib/iconv b/contrib/iconv
deleted file mode 100644
index 14b618d..0000000
--- a/contrib/iconv
+++ /dev/null
@@ -1,48 +0,0 @@
-# iconv(1) completion
-
-have iconv &&
-_iconv()
-{
- local cur prev split=false
-
- COMPREPLY=()
- _get_comp_words_by_ref cur prev
-
- _split_longopt && split=true
-
- case $prev in
- -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
- --widechar-subst)
- return 0
- ;;
- -f|--from-code|-t|--to-code)
- COMPREPLY=( $( compgen -W '$( iconv -l | \
- sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
- return 0
- ;;
- -o|--output)
- _filedir
- return 0
- ;;
- esac
-
- $split && return 0
-
- if [[ "$cur" = -* ]]; then
- COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
- --unicode-subst --byte-subst --widechar-subst --output --silent
- --verbose --help --usage --version' -- "$cur" ) )
- return 0
- fi
-} &&
-complete -F _iconv -o default iconv
-# Intentionally not -o filenames here, -f/-t completions may contain slashes
-# and -o filenames would break them.
-
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
-# ex: ts=4 sw=4 et filetype=sh
--
bash-completion
More information about the Bash-completion-commits
mailing list