diff options
author | Andrey Borzenkov <bor@users.sourceforge.net> | 2002-05-08 09:18:12 +0000 |
---|---|---|
committer | Andrey Borzenkov <bor@users.sourceforge.net> | 2002-05-08 09:18:12 +0000 |
commit | e484b0f83ca9a795429caee90550955ac5544926 (patch) | |
tree | 34649b241a045c325ab86a2dd8b84e62a7bcbca6 /Completion/Unix/Command | |
parent | 42080a7fb93b4457f0dd4c8ce28398001738490a (diff) | |
download | zsh-e484b0f83ca9a795429caee90550955ac5544926.tar.gz zsh-e484b0f83ca9a795429caee90550955ac5544926.tar.xz zsh-e484b0f83ca9a795429caee90550955ac5544926.zip |
17075, 17076: _urpmi and chkconfig/services
Diffstat (limited to 'Completion/Unix/Command')
-rw-r--r-- | Completion/Unix/Command/_chkconfig | 7 | ||||
-rw-r--r-- | Completion/Unix/Command/_init_d | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/Completion/Unix/Command/_chkconfig b/Completion/Unix/Command/_chkconfig index 92bc60c60..912ac3829 100644 --- a/Completion/Unix/Command/_chkconfig +++ b/Completion/Unix/Command/_chkconfig @@ -9,13 +9,8 @@ linux*) '(-)--level[specify runlevels to apply to]:-:_values -s "" "run levels" 1 2 3 4 5 6 7' \ '(- 2)--add[add new service]' \ '(- 2)--del[remove service from chkconfig management]' \ - '1:service name:->services' \ + '1:service name:_services' \ '2:state:(on off reset)' && ret=0 - - if [[ -n "$state" ]]; then - _wanted services expl 'system service' \ - compadd ${${${(f)"$($words[1] --list)"}%%[ :]*}##$'\t'*} && ret=0 - fi ;; irix*) _arguments -C \ diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d index b8bd0c61f..3556b85a4 100644 --- a/Completion/Unix/Command/_init_d +++ b/Completion/Unix/Command/_init_d @@ -1,21 +1,24 @@ #compdef -P */(init|rc[0-9S]#).d/* -local magic cmds what +local magic cmds what script # This should probably be system specific... +script=$words[1] +[[ $script = */* ]] || script=/etc/init.d/$script + # If the file starts with `#!' we hope that this is a shell script # and get lines looking like <space>foo|bar) with the words in $what. what='(st(art|op|atus)|(force-|)re(start|load)|debug_(up|down)|dump(|_stats)|add|delete|clean|list)' -[[ -f $words[1] ]] && read -u0k 2 magic < $words[1] && [[ $magic = '#!' ]] && - cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $words[1])"}:#[[:blank:]]#\'#${~what}(\|${~what})#\'#\)*}}//[^a-z_-]} ) +read -u0k 2 magic < $script && [[ $magic = '#!' ]] && + cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $script)"}:#[[:blank:]]#(\'|)${~what}(\|{~what})#(\'|)\)}}//[^a-z_]} ) # This would be the pattern to use every line of the form <space>foo). # Some people say this might match too many lines... # -# cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $words[1])"}:#[[:blank:]]#(\'|)[a-z_|]##(\'|)\)}}//[^a-z_]} ) +# cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $script)"}:#[[:blank:]]#(\'|)[a-z_|]##\'|)\)}}//[^a-z_]} ) (( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds || cmds=(start stop) |