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

make _ifupdown() detect a Debian Linux system and act accordingly

Browse Source 
in _man(), check that /etc/man.config is readable, not just that it exists
in _rpm(), check that /var/log/rpmpkgs is readable, not just that it exists
This commit is contained in:
ianmacd 2002-01-29 22:06:26 +00:00
parent 8be8d85656
commit ee876ec281
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bash_completion
View File

@ -2,7 +2,7 @@
#
# <![CDATA[
#
# $Id: bash_completion,v 1.74 2002/01/29 21:33:49 ianmacd Exp $
# $Id: bash_completion,v 1.75 2002/01/29 23:06:26 ianmacd Exp $
#
# Copyright (C) Ian Macdonald <ian@caliban.org>
#
@ -26,7 +26,7 @@
# Alter the following to reflect the location of this file
#
declare -r BASH_COMPLETION=/etc/bash_completion
[ -z "$BASH_COMPLETION" ] && declare -r BASH_COMPLETION=/etc/bash_completion
# Set a couple of useful vars
#
@ -295,7 +295,7 @@ _man()
# default completion if parameter contains /
[[ "$cur" == */* ]] && return 0
# default to command completion if no man.config
if [ ! -f /etc/man.config ]; then
if [ ! -r /etc/man.config ]; then
COMPREPLY=( $( compgen -c $cur ) )
return 0
fi
@ -504,7 +504,7 @@ _ifconfig()
}
[ $OS = Linux ] && complete -F _ifconfig ifconfig
# RedHat Linux if{up,down} completion by Frank Sweetser <fs@wpi.edu>
# RedHat & Debian Linux if{up,down} completion
#
[ $OS = Linux ] && ( have ifup || have ifdown ) &&
_ifupdown()
@ -514,9 +514,15 @@ _ifupdown()
COMPREPLY=()
cur=${COMP_WORDS[COMP_CWORD]}
if [ $COMP_CWORD = 1 ] ; then
if [ $COMP_CWORD = 1 ]; then
if [ -f /etc/debian_version ]; then
# Debian system
COMPREPLY=( $( sed -ne 's/^iface \([^ ]\+\).*$/\1/p' /etc/network/interfaces ) )
else
# Assume Red Hat
COMPREPLY=( $( \ls /etc/sysconfig/network-scripts/ifcfg-* | sed -ne 's/.*ifcfg-\('$cur'.*\)/\1/p' ) )
fi
fi
return 0
}
@ -610,7 +616,7 @@ _rpm()
add_package_list()
{
if [ -f /var/log/rpmpkgs ]; then
if [ -r /var/log/rpmpkgs ]; then
# 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 ) )