summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-10-08 08:40:12 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-10-08 08:40:12 +0000
commitf41d769adc69b180ac368e01814cbd6b0d2c3e79 (patch)
tree486d5c9dc974042a56a35a02d4c00d4cf8b17dd0
parenta66f502e536a4e9cadd8952500e344e0447e4670 (diff)
downloadzsh-f41d769adc69b180ac368e01814cbd6b0d2c3e79.tar.gz
zsh-f41d769adc69b180ac368e01814cbd6b0d2c3e79.tar.xz
zsh-f41d769adc69b180ac368e01814cbd6b0d2c3e79.zip
arno: 23910: spaces in cases in init script
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_init_d2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c27a34fd..f4e12e560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-08  Peter Stephenson  <pws@csr.com>
+
+	* arno: 23910: Completion/Unix/Command/_init_d: handle
+	spaces in cases in init scripts.
+
 2007-10-08  Clint Adams  <clint@zsh.org>
 
 	* 23911: configure.ac, Src/Modules/curses.c,
diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d
index 2443febe3..9a5ed9ae7 100644
--- a/Completion/Unix/Command/_init_d
+++ b/Completion/Unix/Command/_init_d
@@ -15,7 +15,7 @@ script=$words[1]
 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_]} )
+    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $script)"}:#[[:blank:]]#(\'|)${~what}([[:blank:]]#\|[[:blank:]]#${~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...