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

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit a6e8891e93b9458b2245df7a7d094ab801f2886d
Author: Guillaume Rousse <guillomovitch at zarb.org>
Date:   Wed May 27 18:32:47 2009 +0200

    split gpg completion

diff --git a/Makefile.am b/Makefile.am
index e5eb1f9..2b0a4f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/genisoimage \
 		contrib/getent \
 		contrib/gkrellm \
+		contrib/gpg \
 		contrib/gnatmake \
 		contrib/gpg2 \
 		contrib/gzip \
diff --git a/bash_completion b/bash_completion
index 8557667..0fcb5d1 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4462,44 +4462,6 @@ _dcop()
 } &&
 complete -F _dcop dcop
 
-# gpg(1) completion
-#
-have gpg &&
-_gpg()
-{
-	local cur prev
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	case "$prev" in
-	-@(s|-sign|-clearsign|-decrypt-files|-load-extension))
-		_filedir
-		return 0
-		;;
-	--@(export|@(?(l|nr|nrl)sign|edit)-key))
-		# return list of public keys
-		COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | sed -ne 's@^pub.*/\([^ ]*\).*$@\1 at p;s@^.*\(<\([^>]*\)>\).*$@\2 at p')" -- "$cur" ))
-		return 0
-		;;
-	-@(r|-recipient))
-		COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | sed -ne 's@^.*<\([^>]*\)>.*$@\1 at p')" -- "$cur" ))
-		if [ -e ~/.gnupg/gpg.conf ]; then
-			COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$( sed -ne 's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1 at p' ~/.gnupg/gpg.conf  )" -- "$cur") )
-		fi
-		return 0
-		;;
-	esac
-
-	if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-s -b -e -f -c -d -a -r -u -Z -o -v\
-				-q -n -N $(gpg --dump-options)' -- $cur ) )
-	 fi
-
-} &&
-complete -F _gpg $default gpg
-
 # iconv(1) completion
 #
 have iconv &&
diff --git a/contrib/gpg b/contrib/gpg
new file mode 100644
index 0000000..a308222
--- /dev/null
+++ b/contrib/gpg
@@ -0,0 +1,40 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for gpg
+
+have gpg &&
+_gpg()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case "$prev" in
+	-@(s|-sign|-clearsign|-decrypt-files|-load-extension))
+		_filedir
+		return 0
+		;;
+	--@(export|@(?(l|nr|nrl)sign|edit)-key))
+		# return list of public keys
+		COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | sed -ne 's@^pub.*/\([^ ]*\).*$@\1 at p;s@^.*\(<\([^>]*\)>\).*$@\2 at p')" -- "$cur" ))
+		return 0
+		;;
+	-@(r|-recipient))
+		COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | sed -ne 's@^.*<\([^>]*\)>.*$@\1 at p')" -- "$cur" ))
+		if [ -e ~/.gnupg/gpg.conf ]; then
+			COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$( sed -ne 's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1 at p' ~/.gnupg/gpg.conf  )" -- "$cur") )
+		fi
+		return 0
+		;;
+	esac
+
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '-s -b -e -f -c -d -a -r -u -Z -o -v\
+				-q -n -N $(gpg --dump-options)' -- $cur ) )
+	 fi
+
+} &&
+complete -F _gpg $default gpg

-- 
bash-completion