Various cleanups, NFC.
This commit is contained in:
parent
b80e3f66a8
commit
3743ec1d29
@ -848,19 +848,19 @@ complete -F _insmod $filenames insmod modprobe modinfo
|
|||||||
-o $UNAME = OpenBSD ] &&
|
-o $UNAME = OpenBSD ] &&
|
||||||
_man()
|
_man()
|
||||||
{
|
{
|
||||||
local cur prev sect manpath manext UNAME
|
local cur prev sect manpath manext mansect UNAME
|
||||||
|
|
||||||
manext="@([0-9lnp]|[0-9][px]|man)?(.@(gz|bz2|lzma))"
|
manext="@([0-9lnp]|[0-9][px]|man)?(.@(gz|bz2|lzma))"
|
||||||
|
mansect="@([0-9lnp]|[0-9][px])"
|
||||||
|
|
||||||
COMPREPLY=()
|
COMPREPLY=()
|
||||||
cur=`_get_cword`
|
cur=`_get_cword`
|
||||||
prev=${COMP_WORDS[COMP_CWORD-1]}
|
prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||||
|
|
||||||
case $prev in
|
if [[ "$prev" == -l ]]; then
|
||||||
-l)
|
|
||||||
_filedir $manext
|
_filedir $manext
|
||||||
return 0;
|
return 0
|
||||||
esac
|
fi
|
||||||
|
|
||||||
_expand || return 0
|
_expand || return 0
|
||||||
|
|
||||||
@ -886,7 +886,7 @@ _man()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# determine manual section to search
|
# determine manual section to search
|
||||||
[[ "$prev" == @([0-9lnp]|[0-9][px]) ]] && sect=$prev || sect='*'
|
[[ "$prev" == $mansect ]] && sect=$prev || sect='*'
|
||||||
|
|
||||||
manpath=$manpath:
|
manpath=$manpath:
|
||||||
if [ -n "$cur" ]; then
|
if [ -n "$cur" ]; then
|
||||||
@ -903,7 +903,7 @@ _man()
|
|||||||
COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|lzma)} )
|
COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|lzma)} )
|
||||||
COMPREPLY=( $( compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}" ) )
|
COMPREPLY=( $( compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}" ) )
|
||||||
|
|
||||||
if [[ "$prev" != @([0-9lnp]|[0-9][px]) ]]; then
|
if [[ "$prev" != $mansect ]]; then
|
||||||
# File based completion for the rest, prepending ./ if needed
|
# File based completion for the rest, prepending ./ if needed
|
||||||
# (man 1.6f needs that for man pages in current dir)
|
# (man 1.6f needs that for man pages in current dir)
|
||||||
local start=${#COMPREPLY[@]}
|
local start=${#COMPREPLY[@]}
|
||||||
@ -6478,7 +6478,7 @@ complete -F _mc $filenames mc
|
|||||||
have yum && {
|
have yum && {
|
||||||
_yum_list()
|
_yum_list()
|
||||||
{
|
{
|
||||||
if [ "$1" = "all" ] ; then
|
if [[ "$1" == all ]] ; then
|
||||||
# Try to strip in between headings like "Available Packages"
|
# Try to strip in between headings like "Available Packages"
|
||||||
# This will obviously only work for English :P
|
# This will obviously only work for English :P
|
||||||
COMPREPLY=( $( yum -d 0 -C list $1 "$cur*" 2>/dev/null | \
|
COMPREPLY=( $( yum -d 0 -C list $1 "$cur*" 2>/dev/null | \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user