csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

_rpm now uses /var/log/rpmpkgs if available (in RHL 7.2), since this is much

Browse Source 
faster than rpm -qa, at the expense of actuality
_man completion now looks at section 'l' (local) of the manual
This commit is contained in:
ianmacd 2001-11-04 23:11:48 +00:00
parent 9c4807523e
commit 4253e056d8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bash_completion
View File

@ -2,7 +2,7 @@
# #
# <![CDATA[ # <![CDATA[
# #
# $Id: bash_completion,v 1.25 2001/09/21 20:51:30 ianmacd Exp $ # $Id: bash_completion,v 1.26 2001/11/05 00:11:48 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -273,7 +273,7 @@ _man()
# default completion if parameter contains / or we have no man.config # default completion if parameter contains / or we have no man.config
[[ "$cur" == /* ]] || [ ! -f /etc/man.config ] && return 0 [[ "$cur" == /* ]] || [ ! -f /etc/man.config ] && return 0
if [[ "$prev" == [0-9n] ]]; then if [[ "$prev" == [0-9ln] ]]; then
# churn out a string of paths to search, with * appended to $cur # churn out a string of paths to search, with * appended to $cur
cmd=`awk '{if ($1 ~ /^MANPATH/) \ cmd=`awk '{if ($1 ~ /^MANPATH/) \
print $(NF)"/man'$prev'/'$cur'*"}' /etc/man.config | \ print $(NF)"/man'$prev'/'$cur'*"}' /etc/man.config | \
@ -296,7 +296,7 @@ _man()
COMPREPLY=( $( eval $cmd ) ) COMPREPLY=( $( eval $cmd ) )
COMPREPLY=( ${COMPREPLY[@]##*/} ) COMPREPLY=( ${COMPREPLY[@]##*/} )
COMPREPLY=( ${COMPREPLY[@]%.gz} ) COMPREPLY=( ${COMPREPLY[@]%.gz} )
COMPREPLY=( ${COMPREPLY[@]%.*} $( compgen -G $cur\*.[0-9n] ) ) COMPREPLY=( ${COMPREPLY[@]%.*} $( compgen -G $cur\*.[0-9ln] ) )
fi fi
return 0 return 0
@ -565,8 +565,14 @@ _rpm()
add_package_list() add_package_list()
{ {
COMPREPLY=( ${COMPREPLY[@]} $( rpm -qa | \ if [ -f /var/log/rpmpkgs ]; then
sed -ne 's/^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.]\+$/\1/p' ) ) # using RHL 7.2 - this is quicker than querying the DB
COMPREPLY=( ${COMPREPLY[@]}
$( sed -ne 's/^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.]\+.*\.rpm$/\1/p' /var/log/rpmpkgs ) )
else
COMPREPLY=( ${COMPREPLY[@]} $( rpm -qa | \
sed -ne 's/^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.]\+$/\1/p' ) )
fi
} }
file_glob() file_glob()