about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2005-02-09 16:28:39 +0000
committerBart Schaefer <barts@users.sourceforge.net>2005-02-09 16:28:39 +0000
commit97c08895aadc54af80395e4c24517a8bc3fd51bc (patch)
treebbf7a15633911702e012e494edff99e264e15036
parent3add0123c1265288b3aa8f41c5a0588735aaf9a3 (diff)
downloadzsh-97c08895aadc54af80395e4c24517a8bc3fd51bc.tar.gz
zsh-97c08895aadc54af80395e4c24517a8bc3fd51bc.tar.xz
zsh-97c08895aadc54af80395e4c24517a8bc3fd51bc.zip
Kris Shannon: 20901: fix missing $ in expression that parses script
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_init_d28
2 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b003691a..839303a32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-09  Bart Schaefer  <schaefer@zsh.org>
+
+	* Kris Shannon: 20801: Completion/Unix/Command/_init_d: fix
+	missing $ in the param expansion that parses the init script.
+
 2005-02-09  Peter Stephenson  <pws@csr.com>
 
 	* 20793 (part): Src/signals.c, Test/C03traps.ztst: Port main
diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d
new file mode 100644
index 000000000..f439e8007
--- /dev/null
+++ b/Completion/Unix/Command/_init_d
@@ -0,0 +1,28 @@
+#compdef -p */(init|rc[0-9S]#).d/*
+
+local magic cmds what script
+
+_compskip=all
+
+# 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)'
+
+read -u0 -k2 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)"$(< $script)"}:#[[:blank:]]#(\'|)[a-z_|]##\'|)\)}}//[^a-z_]} )
+
+(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds ||
+    cmds=(start stop)
+
+_sub_commands $cmds