The following commit has been merged in the master branch:
commit 65d9348f3e5a31adf38ace19a3c1d4e6a302fe9e
Author: Ville Skyttä <[email protected]>
Date: Sat May 23 11:45:39 2009 +0300
Fix man completion (was broken by recent $UNAME/$USERLAND changes).
diff --git a/bash_completion b/bash_completion
index 4205f13..23fb6d3 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1008,7 +1008,7 @@ complete -F _insmod $filenames insmod modprobe modinfo
-o $UNAME = OpenBSD ] &&
_man()
{
- local cur prev sect manpath manext mansect UNAME
+ local cur prev sect manpath manext mansect uname
manext="@([0-9lnp]|[0-9][px]|man)?(.@(gz|bz2|lzma))"
mansect="@([0-9lnp]|[0-9][px])"
@@ -1030,11 +1030,8 @@ _man()
return 0
fi
- UNAME=$( uname -s )
- # strip OS type and version under Cygwin
- UNAME=${UNAME/CYGWIN_*/Cygwin}
- if [ $USERLAND = GNU -o $UNAME = FreeBSD \
- -o $UNAME = Cygwin ]; then
+ uname=$( uname -s )
+ if [[ $uname == @(Linux|GNU|GNU/*|FreeBSD|Cygwin|CYGWIN_*) ]]; then
manpath=$( manpath 2>/dev/null || command man --path )
else
manpath=$MANPATH
--
bash-completion
_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/bash-completion-commits
