From 3fcf8ee5bbd93bb0c1125b3ca5f6e552d8775f30 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sat, 23 May 2009 10:55:05 +0000 Subject: Add completion for "set", "enable", and "disable" subactions. svn path=/trunk/; revision=561 --- ChangeLog | 3 ++- misc/eselect.bashcomp | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4c5676..901dbb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ * misc/eselect.bashcomp (_eselect): Remove --no-colour option; it is not needed since output is to a pipe. Use only POSIX basic - regular expressions for sed. + regular expressions for sed. Add completion for "set", "enable", + and "disable" subactions. 2009-05-21 Ulrich Mueller diff --git a/misc/eselect.bashcomp b/misc/eselect.bashcomp index 61e04a0..2904388 100644 --- a/misc/eselect.bashcomp +++ b/misc/eselect.bashcomp @@ -6,10 +6,11 @@ # Author: Aaron Walker _eselect() { - local cur sedcmd possibles + local cur sedcmd sedcmd3 possibles COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" sedcmd='s/^ \([[:alnum:]-][[:alnum:]_-]*\)[[:space:],].*$/\1/p' + sedcmd3='s/^ \[[[:digit:]][[:digit:]]*\] *\([[:graph:]]*\).*$/\1/p' set - "${COMP_WORDS[@]:1}" while [[ $# -gt 1 && $1 == -* ]]; do @@ -21,6 +22,13 @@ _eselect() { | sed -n -e "${sedcmd}") ;; 2) possibles=$(eselect "$1" usage 2>/dev/null \ | sed -n -e "${sedcmd}") ;; + 3) + case $2 in + set|enable|disable) + possibles=$(eselect "$1" list 2>/dev/null \ + | sed -n -e "${sedcmd3}") ;; + esac + ;; esac [[ -n "${possibles}" ]] && \ -- cgit v1.2.3-65-gdbad