summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2007-05-27 16:57:55 +0000
committerClint Adams <clint@users.sourceforge.net>2007-05-27 16:57:55 +0000
commit934c891c61daac95ee6d8ebd92628e003cc33839 (patch)
treeebd2cb79dc9d725fe11bcb739fce05ac4dfd2789
parente46f178f9cea21958d176d29a7b984ae4ad4d44d (diff)
downloadzsh-934c891c61daac95ee6d8ebd92628e003cc33839.tar.gz
zsh-934c891c61daac95ee6d8ebd92628e003cc33839.zip
23475: call $service instead of 'cdrecord', in case we are using wodim.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_cdrecord4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 397646cb5..c75d93ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-27 Clint Adams <clint@zsh.org>
+
+ * 23475: Completion/Unix/Command/_cdrecord: call $service
+ instead of 'cdrecord', in case we are using wodim.
+
2007-05-26 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 23471: configure.ac: error names not found properly
diff --git a/Completion/Unix/Command/_cdrecord b/Completion/Unix/Command/_cdrecord
index f651e5954..602cd5e8e 100644
--- a/Completion/Unix/Command/_cdrecord
+++ b/Completion/Unix/Command/_cdrecord
@@ -89,14 +89,14 @@ if [[ -n $state ]]; then
case $state in
device)
- devices=( ${(f)"$(_call_program device cdrecord -scanbus 2>/dev/null \
+ devices=( ${(f)"$(_call_program device $service -scanbus 2>/dev/null \
|grep '^ '|cut -c2-6,23-|sed 's/ /:/')"} )
_describe -t devices device devices && return
;;
blank)
btypes=(
'help:display list of available blanking types'
- ${${${${(f)"$(_call_program blank-types cdrecord blank=help 2>&1)"}[2,-1]}#?}/[[:blank:]]##/:}
+ ${${${${(f)"$(_call_program blank-types $service blank=help 2>&1)"}[2,-1]}#?}/[[:blank:]]##/:}
)
_describe -t blank-types 'blanking type' btypes && return
;;