diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2009-02-15 19:12:05 +0200 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2009-02-15 19:12:05 +0200 |
| commit | d07e282122f3ec3edf207bc75d5aa783ff055c12 (patch) | |
| tree | ceea5ea1c26c047b01c11e5458123d91bb678b3f | |
| parent | 9960fbfdcfa226b261c47caccd1cbfc4c260d4a0 (diff) | |
| download | bash-completion-d07e282122f3ec3edf207bc75d5aa783ff055c12.tar.gz | |
Enable pkill completion if the command is available, not just on Linux and FreeBSD.
| -rw-r--r-- | bash_completion | 7 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bash_completion b/bash_completion index 8a68c89e..614a7edb 100644 --- a/bash_completion +++ b/bash_completion @@ -1042,9 +1042,9 @@ _kill() } complete -F _kill kill -# Linux and FreeBSD killall(1) completion. +# killall(1) (Linux and FreeBSD) and pkill(1) completion. # -[ $UNAME = Linux -o $UNAME = FreeBSD ] && +[ $UNAME = Linux -o $UNAME = FreeBSD ] || have pkill && _killall() { local cur @@ -1060,7 +1060,8 @@ _killall() return 0 } -[ $UNAME = Linux -o $UNAME = FreeBSD ] && complete -F _killall killall pkill +[ $UNAME = Linux -o $UNAME = FreeBSD ] && complete -F _killall killall +have pkill && complete -F _killall pkill # pgrep(1) completion. # diff --git a/debian/changelog b/debian/changelog index 555e832d..4062cadb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -126,7 +126,8 @@ bash-completion (200902xx) UNRELEASED; urgency=low for others than Linux and FreeBSD. * Fix process name completion with relative paths (RHBZ: #484578). * Use improved process name completion in pgrep in addition to killall. - * Enable pgrep completion if pgrep is available, not just on Linux/FreeBSD. + * Enable pgrep and pkill completion if the commands are available, not just + on Linux and FreeBSD. [ Freddy Vulto ] * Restored `_display()' completion for `display' by removing |