[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2d699bd8b54620791e54c32f1969c744aa20ac3d

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit 2d699bd8b54620791e54c32f1969c744aa20ac3d
Author: Guillaume Rousse <Guillaume.Rousse at inria.fr>
Date:   Sun Aug 22 11:16:33 2010 +0200

    Revert "merge iconv and getent completions, as they are both glibc utils"
    
    This reverts commit 3f0d8f8e9f1991e7d7610fd210c68421eef4e09f, as this is
    only true for Linux

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index aceea78..f8420e1 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -42,14 +42,15 @@ 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
new file mode 100644
index 0000000..54e62ab
--- /dev/null
+++ b/contrib/getent
@@ -0,0 +1,55 @@
+# 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
deleted file mode 100644
index 954a1c6..0000000
--- a/contrib/glibc
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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
new file mode 100644
index 0000000..14b618d
--- /dev/null
+++ b/contrib/iconv
@@ -0,0 +1,48 @@
+# 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