From 0ba8ae87eac21281e0b17eb9cbb523d133067a4a Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Wed, 8 Jun 2005 12:45:24 +0000 Subject: 21315: make completion functions give precendence to descriptions passed as parameters and cleanup descriptons in calling functions --- Completion/AIX/Command/_floppy | 2 +- Completion/AIX/Command/_lsdev | 28 ++++++++++++++-------------- Completion/AIX/Command/_lslv | 2 +- Completion/AIX/Command/_lsvg | 2 +- Completion/AIX/Type/_logical_volumes | 2 +- Completion/AIX/Type/_object_classes | 2 +- Completion/AIX/Type/_physical_volumes | 2 +- Completion/AIX/Type/_volume_groups | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'Completion/AIX') diff --git a/Completion/AIX/Command/_floppy b/Completion/AIX/Command/_floppy index 7c030f9bd..3dd3ee8e1 100644 --- a/Completion/AIX/Command/_floppy +++ b/Completion/AIX/Command/_floppy @@ -2,4 +2,4 @@ local expl -_wanted floppyfiles expl 'files on floppy' compadd - ${$(dosdir)[1,-5]:l} +_wanted floppyfiles expl 'file on floppy' compadd - ${$(dosdir)[1,-5]:l} diff --git a/Completion/AIX/Command/_lsdev b/Completion/AIX/Command/_lsdev index 1bb1a8802..c54ed7637 100644 --- a/Completion/AIX/Command/_lsdev +++ b/Completion/AIX/Command/_lsdev @@ -5,33 +5,33 @@ local curcontext="${curcontext}" state line expl _arguments -C \ '(-P)-C[list info about device in customized devices object class]' \ '(-C -l)-P[list info about device in predefined object class]' \ - '-c[specify a device class]:device class:->class' \ - '-f[read flags from file]:files:_files' \ - '-F[specify output format]:format:->columnname' \ + '-c[specify a device class]:device class:->classes' \ + '-f[read flags from file]:file:_files' \ + '-F[specify output format]:format:->columnnames' \ '-H[display headers above columns]' \ '-h[display command usage]' \ '(-P)-l[specify device logical name]:device logical name' \ - '-r[display set of values in a column]:columnname:->columnname' \ + '-r[display set of values in a column]:column name:->columnnames' \ '(-P)-S[specify a device state]:device state:(Available Defined Stopped)' \ - '-s[specify a device subclass]:device subclass:->subclass' \ - '-t[specify a device type name]:device type name:->devtype' && return 0 + '-s[specify a device subclass]:device subclass:->subclasses' \ + '-t[specify a device type name]:device type name:->devtypes' && return 0 case $state in - class) - _wanted devclass expl 'device class names' \ + classes) + _wanted devclasses expl 'device class name' \ compadd - $(lsdev ${words[(r)-[CP]]:--P} -r class) ;; - subclass) - _wanted devsubclass expl 'device subclass names' \ + subclasses) + _wanted devsubclasses expl 'device subclass name' \ compadd - $(lsdev ${words[(r)-[CP]]:--P} -r subclass) ;; - devtype) - _wanted devtype expl 'device type names' \ + devtypes) + _wanted devtypes expl 'device type name' \ compadd - $(lsdev ${words[(r)-[CP]]:--P} -r type) ;; - columnname) + columnnames) [[ $words[CURRENT-1] = -F ]] && compset -P '*[^a-zA-Z]' - _wanted devcolumnname expl 'column names' \ + _wanted devcolumnnames expl 'column name' \ compadd - ${(s: :)words[(r)-C]:+name status location} \ class subclass description type ;; diff --git a/Completion/AIX/Command/_lslv b/Completion/AIX/Command/_lslv index 760c8cc3b..5145c48cc 100644 --- a/Completion/AIX/Command/_lslv +++ b/Completion/AIX/Command/_lslv @@ -5,4 +5,4 @@ _arguments -C -s \ '(-p)-l[list physical volumes in logical volume]' \ '(-p)-m[list partition numbers]' \ '-n[accesses information from the descriptor area of physical volume]:pv:_physical_volumes' \ - '1:lv:_logical_volumes' + '1:lv: _logical_volumes' diff --git a/Completion/AIX/Command/_lsvg b/Completion/AIX/Command/_lsvg index c5b9a1584..028a670ba 100644 --- a/Completion/AIX/Command/_lsvg +++ b/Completion/AIX/Command/_lsvg @@ -7,4 +7,4 @@ _arguments -C -s \ '(-o -n -M -p)-l[list logical volumes in volume group]' \ '(-o -n -l -p)-M[list mapping of physical and logical partition numbers]' \ '(-o -n -l -M)-p[list physical volumes used by volume group]' \ - '*:volume groups:_volume_groups' + '*:volume group:_volume_groups' diff --git a/Completion/AIX/Type/_logical_volumes b/Completion/AIX/Type/_logical_volumes index 1dd351360..bbfa09238 100644 --- a/Completion/AIX/Type/_logical_volumes +++ b/Completion/AIX/Type/_logical_volumes @@ -11,5 +11,5 @@ if zstyle -T ":completion:${curcontext}:" verbose; then else disp=() fi -_wanted logicalvolumes expl 'logical volumes' \ +_wanted logicalvolumes expl 'logical volume' \ compadd "$disp[@]" "$@" - "$names[@]" diff --git a/Completion/AIX/Type/_object_classes b/Completion/AIX/Type/_object_classes index 6122dcdf4..a0d669ca3 100644 --- a/Completion/AIX/Type/_object_classes +++ b/Completion/AIX/Type/_object_classes @@ -3,4 +3,4 @@ local expl _wanted objectclasses expl 'object class' \ - _files -W ${ODMDIR:-/etc/objrepos} -g '^*.vc(-.)' + _files -W ${ODMDIR:-/etc/objrepos} -g '^*.vc(-.)' "$@" - diff --git a/Completion/AIX/Type/_physical_volumes b/Completion/AIX/Type/_physical_volumes index b53054823..fd31edd09 100644 --- a/Completion/AIX/Type/_physical_volumes +++ b/Completion/AIX/Type/_physical_volumes @@ -3,4 +3,4 @@ local expl _wanted physicalvolumes expl 'physical volume' \ - compadd - $(lsdev -C -c disk -S a -F name) + compadd "$@" - $(lsdev -C -c disk -S a -F name) diff --git a/Completion/AIX/Type/_volume_groups b/Completion/AIX/Type/_volume_groups index dc509f6dc..8b8bebfa6 100644 --- a/Completion/AIX/Type/_volume_groups +++ b/Completion/AIX/Type/_volume_groups @@ -2,4 +2,4 @@ local expl -_wanted physicalvolumes expl 'physical volume' compadd - $(lsvg) +_wanted volumegroups expl 'volume group' compadd "$@" - $(lsvg) -- cgit 1.4.1