From c5b4f7cc4cc8c42d4136896dfcef87b4171d585a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20Sowi=C5=84ski?= Date: Sat, 21 Apr 2012 19:01:05 +0200 Subject: [PATCH 1/9] #350179 fix the completion for 'uses' and 'which' modules of equery - fix pkgspec completion - separate completion for these modules, as they have another sets of options --- gentoo | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gentoo b/gentoo index bb253bc..1d38106 100644 --- a/gentoo +++ b/gentoo @@ -1200,13 +1200,34 @@ _equery() COMPREPLY=($(builtin cd ${portdir}/metadata/cache; compgen -W "$(compgen -G '*')" -- $cur)) fi ;; - @(u?(ses)|w?(hich))) + u?(ses)) # Only complete if the previous entry on the command line is not # a package name. - if [[ ${prev} == ${mode} ]]; then - # Complete on all package names. - _pkgname -A $cur - COMPREPLY=($(compgen -W "${COMPREPLY[@]} --help" -- ${cur})) + if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then + case $cur in + -*) + COMPREPLY=($(compgen -W "-h --help -a --all" -- $cur)) + ;; + *) + # Complete on all package names. + _pkgname -A $cur + ;; + esac + fi + ;; + w?(hich)) + # Only complete if the previous entry on the command line is not + # a package name. + if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then + case $cur in + -*) + COMPREPLY=($(compgen -W "-h --help -m --include-masked" -- $cur)) + ;; + *) + # Complete on all package names. + _pkgname -A $cur + ;; + esac fi ;; g|depgraph) -- 1.7.3.4