summaryrefslogtreecommitdiff
path: root/contrib/gpg2
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/gpg2')
-rw-r--r--contrib/gpg219
1 files changed, 9 insertions, 10 deletions
diff --git a/contrib/gpg2 b/contrib/gpg2
index 56e3c6eb..b99783f9 100644
--- a/contrib/gpg2
+++ b/contrib/gpg2
@@ -6,25 +6,25 @@ _gpg2 ()
local cur prev
COMPREPLY=()
- cur=`_get_cword`
- prev=${COMP_WORDS[COMP_CWORD-1]}
+ _get_comp_words_by_ref cur prev
- case "$prev" in
+ case $prev in
--homedir)
_filedir -d
return 0
;;
- -@(s|-sign|-clearsign|-options|-decrypt))
+ -s|--sign|--clearsign|--options|--decrypt)
_filedir
return 0
;;
- --@(export|@(?(l|nr|nrl)sign|edit)-key))
+ --export|--sign-key|--lsign-key|--nrsign-key|--nrlsign-key|--edit-key)
# return list of public keys
COMPREPLY=( $( compgen -W "$( gpg2 --list-keys 2>/dev/null | \
- sed -ne 's@^pub.*/\([^ ]*\).*$@\1@p;s@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur" ))
+ sed -ne 's@^pub.*/\([^ ]*\).*$@\1@p' \
+ -ne 's@^.*\(<\([^>]*\)>\).*$@\2@p' )" -- "$cur" ) )
return 0
;;
- -@(r|-recipient))
+ -r|--recipient)
COMPREPLY=( $( compgen -W "$( gpg2 --list-keys 2>/dev/null | \
sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur" ))
if [ -e ~/.gnupg/gpg.conf ]; then
@@ -37,11 +37,10 @@ _gpg2 ()
esac
if [[ "$cur" == -* ]]; then
- COMPREPLY=( $( compgen -W '-s -b -e -c -d -k -K -a -r -u -z -o -v \
- -n -N -i -h -R -t $(gpg2 --dump-options)' -- "$cur" ) )
+ COMPREPLY=( $( compgen -W '$(gpg2 --dump-options)' -- "$cur" ) )
fi
} &&
-complete -F _gpg2 $default gpg2
+complete -F _gpg2 -o default gpg2
}
# Local variables: