diff options
author | Oliver Kiddle <opk@users.sourceforge.net> | 2005-06-08 12:45:24 +0000 |
---|---|---|
committer | Oliver Kiddle <opk@users.sourceforge.net> | 2005-06-08 12:45:24 +0000 |
commit | 0ba8ae87eac21281e0b17eb9cbb523d133067a4a (patch) | |
tree | 614cc49ce90c3c2562f83d6739f8ea76dc75d7f0 /Completion/Unix/Type/_services | |
parent | 9181f0e3059862d2d8cc109bc849f8705cbbc23c (diff) | |
download | zsh-0ba8ae87eac21281e0b17eb9cbb523d133067a4a.tar.gz zsh-0ba8ae87eac21281e0b17eb9cbb523d133067a4a.tar.xz zsh-0ba8ae87eac21281e0b17eb9cbb523d133067a4a.zip |
21315: make completion functions give precendence to descriptions passed as
parameters and cleanup descriptons in calling functions
Diffstat (limited to 'Completion/Unix/Type/_services')
-rw-r--r-- | Completion/Unix/Type/_services | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Completion/Unix/Type/_services b/Completion/Unix/Type/_services index 8e682bd52..2965e0f3e 100644 --- a/Completion/Unix/Type/_services +++ b/Completion/Unix/Type/_services @@ -7,18 +7,12 @@ if chkconfig --list > /dev/null 2>&1; then alls=( ${(f)"$(LANGUAGE=C LANG=C LC_ALL=C chkconfig --list)"} ) inits=( ${${${alls[1,(r)xinetd based*]}[1,-2]}/%[[:space:]]*/} ) xinetds=( ${${${${alls[(r)xinetd based*,-1]}[2,-1]}/#[[:space:]]#}/%:*} ) + + _alternative \ + 'init:init service:compadd -a inits' \ + 'xinetd:xinetd service:compadd -a xinetds' && ret=0 else - inits=( /etc/init.d/*(-*:t) ) + _wanted services expl service compadd "$@" - /etc/init.d/*(-*:t) && ret=0 fi -_tags init xinetd - -while _tags; do - _requested init expl 'init services' \ - compadd -a inits && ret=0 - _requested xinetd expl 'xinetd services' \ - compadd -a xinetds && ret=0 - (( ret )) || break -done - -return $ret +return ret |