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

[David Paleino]

The following commit has been merged in the master branch:
commit bb8912b06ff09f8fed253e7e5b14916e38a48733
Author: David Paleino <d.paleino at gmail.com>
Date:   Sun Oct 11 11:12:09 2009 +0200

    Don't use pidof in _known_hosts_real() to detect whether Avahi is available
    
        It's not available on MacOS X.
        Thanks to Rainer Müller <raimue at codingfarm.de>
        (bash-completion MacPorts maintainer)

diff --git a/CHANGES b/CHANGES
index 1d7fbb1..d6617ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+bash-completion (1.x)
+
+  [ David Paleino ]
+  * Don't use pidof in _known_hosts_real() to detect whether Avahi is
+    available, since it's not available on MacOS X. Thanks to Rainer
+    Müller <raimue at codingfarm.de> (bash-completion MacPorts maintainer)
+
+ -- David Paleino <d.paleino at gmail.com>  Sun, 11 Oct 2009 11:11:57 +0200
+
 bash-completion (1.1)
 
   [ David Paleino ]
diff --git a/bash_completion b/bash_completion
index cb61af8..d755897 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1306,11 +1306,9 @@ _known_hosts_real()
         #  the result. But on Gentoo (at least), -k isn't available
         #  (even if mentioned in the manpage), so...
         if type avahi-browse >&/dev/null; then
-            if [ -n "$(pidof avahi-daemon)" ]; then
-                COMPREPLY=( "${COMPREPLY[@]}" $(
-                compgen -W "$( avahi-browse -cpr _workstation._tcp | \
-                grep ^= | cut -d\; -f7 | sort -u )" -- "$cur" ) )
-            fi
+            COMPREPLY=( "${COMPREPLY[@]}" $(
+            compgen -W "$( avahi-browse -cpr _workstation._tcp 2>/dev/null | \
+            grep ^= | cut -d\; -f7 | sort -u )" -- "$cur" ) )
         fi
 
         # apply suffix and prefix

-- 
bash-completion