[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.90-155-g39ac464

Igor Murzov e-mail at date.by
Sun Mar 25 14:25:24 UTC 2012


The following commit has been merged in the master branch:
commit fb2d657fac6be93a1c4ffa76018d8042859e0a03
Author: Igor Murzov <e-mail at date.by>
Date:   Sun Mar 25 17:28:42 2012 +0400

    man: --path option is supported on Darwin (Alioth: #313584)

diff --git a/completions/man b/completions/man
index a9de57c..a14b451 100644
--- a/completions/man
+++ b/completions/man
@@ -8,7 +8,7 @@ _man()
     local cur prev words cword split
     _init_completion -s -n : || return
 
-    local i sect manpath manext mansect uname
+    local i sect manpath manext mansect
 
     manext="@([0-9lnp]|[0-9][px]|man|3pm)?(.@([gx]z|bz2|lzma|Z))"
     mansect="@([0-9lnp]|[0-9][px]|3pm)"
@@ -56,8 +56,7 @@ _man()
         return 0
     fi
 
-    uname=$( uname -s )
-    if [[ $uname == @(Linux|GNU|GNU/*|FreeBSD|Cygwin|CYGWIN_*) ]]; then
+    if [[ $OSTYPE == *@(darwin|linux|freebsd|cygwin)* ]] || _userland GNU; then
         manpath=$( manpath 2>/dev/null || command man --path )
     else
         manpath=$MANPATH

-- 
bash-completion



More information about the Bash-completion-commits mailing list