diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2018-04-17 02:55:16 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2018-04-17 02:55:16 +0200 |
| commit | 03fcdd08a35697ef0f01673c243420e3d13b47e0 (patch) | |
| tree | ef1230281d685eae583c8ecbb36af72506ad4a1e /Completion/Unix/Command/_pgrep | |
| parent | f0421610cd92ad949eedb22390a908020a1d0e1e (diff) | |
| parent | fd4056f4edb12000ac5b0181aef8bb741e60801c (diff) | |
| download | zsh-03fcdd08a35697ef0f01673c243420e3d13b47e0.tar.gz zsh-03fcdd08a35697ef0f01673c243420e3d13b47e0.zip | |
Merge tag 'zsh-5.5.1' and branch 'upstream' into branch 'debian'
Release 5.5.1.
Diffstat (limited to 'Completion/Unix/Command/_pgrep')
| -rw-r--r-- | Completion/Unix/Command/_pgrep | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Completion/Unix/Command/_pgrep b/Completion/Unix/Command/_pgrep index 714bf095b..ec3f8bfd0 100644 --- a/Completion/Unix/Command/_pgrep +++ b/Completion/Unix/Command/_pgrep @@ -32,9 +32,7 @@ arguments=('-P[parent process id]:parent process id:->ppid' '-x[match exactly]' '-z[match only in zones]:zone:_zones') -if [[ $service == 'pkill' ]]; then - arguments+=('-'${^signals}'[signal]') -elif [[ $service == 'pgrep' ]]; then +if [[ $service == 'pgrep' ]]; then arguments+=('-d[output delimiter]:delimiter:compadd ${(s\:\:)IFS}' '-l[list name in addition to id]') fi @@ -64,8 +62,12 @@ case "$OSTYPE" in optchars="flvxdnoPgsuUGt" ;; esac +# Only keep relevant arguments according to $optchars. arguments=( ${(M)arguments:#(|\*)(|\(*\))-[$optchars]*} '*:process name:->pname') +if [[ $service == 'pkill' ]]; then + arguments+=('-'${^signals}'[signal]') +fi _arguments -C -s -w $arguments && ret=0 |