[Bash-completion-commits] [SCM] bash-completion branch, master, updated. d07e282122f3ec3edf207bc75d5aa783ff055c12

Ville Skyttä ville.skytta at iki.fi
Sun Feb 15 17:12:03 UTC 2009


The following commit has been merged in the master branch:
commit 9960fbfdcfa226b261c47caccd1cbfc4c260d4a0
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Feb 15 19:04:51 2009 +0200

    Enable pgrep completion if pgrep is available, not just on Linux/FreeBSD.

diff --git a/bash_completion b/bash_completion
index 542031b..8a68c89 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1062,9 +1062,9 @@ _killall()
 }
 [ $UNAME = Linux -o $UNAME = FreeBSD ] && complete -F _killall killall pkill
 
-# Linux and FreeBSD pgrep(1) completion.
+# pgrep(1) completion.
 #
-[ $UNAME = Linux -o $UNAME = FreeBSD ] &&
+[ $UNAME = Linux ] || have pgrep &&
 _pgrep()
 {
 	local cur
@@ -1076,7 +1076,8 @@ _pgrep()
 
 	return 0
 }
-[ $UNAME = Linux -o $UNAME = FreeBSD ] && complete -F _pgrep pgrep
+have pgrep && complete -F _pgrep pgrep
+
 # Linux pidof(8) completion.
 [ $UNAME = Linux ] && complete -F _pgrep pidof
 
diff --git a/debian/changelog b/debian/changelog
index 67453a6..555e832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -126,6 +126,7 @@ 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.
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing

-- 
bash-completion



More information about the Bash-completion-commits mailing list