diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2002-02-03 21:37:55 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2002-02-03 21:37:55 +0000 |
| commit | 1ca0fc6b6991a96eb2635a8eb9171eff25798ca3 (patch) | |
| tree | f693b457e8143f23bd5ddb514a790e612d482a35 | |
| parent | 050c62d36a0286afde17e63896014d6f85a529ed (diff) | |
| download | zsh-1ca0fc6b6991a96eb2635a8eb9171eff25798ca3.tar.gz zsh-1ca0fc6b6991a96eb2635a8eb9171eff25798ca3.tar.xz zsh-1ca0fc6b6991a96eb2635a8eb9171eff25798ca3.zip | |
16514: initscript completion fixes
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_init_d | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 4b4e8be7e..a03e2193b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-02-03 Clint Adams <clint@zsh.org> + * 16514: Completion/Unix/Command/_init_d: do not attempt + to read file if it doesn't exist, match pipe-separated lists + and characters following the parenthesis, and don't wantonly + remove hyphens from completions. + * Sven: 16507: Completion/Zsh/Type/_command_names: slight improvement for 16500 to allow completion after ./<TAB> in all cases diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d new file mode 100644 index 000000000..b8bd0c61f --- /dev/null +++ b/Completion/Unix/Command/_init_d @@ -0,0 +1,23 @@ +#compdef -P */(init|rc[0-9S]#).d/* + +local magic cmds what + +# This should probably be system specific... + +# 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_-]} ) + +# 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 )) || zstyle -a ":completion:${curcontext}:commands" commands cmds || + cmds=(start stop) + +_sub_commands $cmds |