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

- use of \ls to avoid calling an alias will still call a function of that

Browse Source 
name, if one is defined. Use built-in 'command' instead
This commit is contained in:
ianmacd 2002-06-04 03:45:09 +00:00
parent 9bbdab7c79
commit e7f77a7cdb
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bash_completion
View File

@ -1,6 +1,6 @@
# bash_completion - some programmable completion functions for bash 2.05a # bash_completion - some programmable completion functions for bash 2.05a
# #
# $Id: bash_completion,v 1.345 2002/06/04 05:28:41 ianmacd Exp $ # $Id: bash_completion,v 1.346 2002/06/04 05:45:09 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -465,7 +465,7 @@ _insmod()
else if ($1 !~ /:/ && $1 ~ /^'$cur'/) { print $1 }}' ) ) else if ($1 !~ /:/ && $1 ~ /^'$cur'/) { print $1 }}' ) )
elif [ -r $modpath -a -x $modpath ]; then elif [ -r $modpath -a -x $modpath ]; then
# do module name completion # do module name completion
COMPREPLY=( $( \ls -R $modpath | \ COMPREPLY=( $( command ls -R $modpath | \
sed -ne 's/^\('$cur'.*\)\.o\(\|.gz\)$/\1/p') ) sed -ne 's/^\('$cur'.*\)\.o\(\|.gz\)$/\1/p') )
else else
_filedir _filedir
@ -497,7 +497,7 @@ _man()
UNAME=$( uname -s ) UNAME=$( uname -s )
if [ $UNAME = GNU -o $UNAME = Linux ]; then if [ $UNAME = GNU -o $UNAME = Linux ]; then
manpath=$( manpath 2>/dev/null || \man --path ) manpath=$( manpath 2>/dev/null || command man --path )
else else
manpath=$MANPATH manpath=$MANPATH
fi fi
@ -518,7 +518,7 @@ _man()
fi fi
# redirect stderr for when path doesn't exist # redirect stderr for when path doesn't exist
COMPREPLY=( $( eval \\ls "$manpath" 2>/dev/null ) ) COMPREPLY=( $( eval command ls "$manpath" 2>/dev/null ) )
# weed out directory path names and paths to man pages # weed out directory path names and paths to man pages
COMPREPLY=( ${COMPREPLY[@]##*/?(:)} ) COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
# strip suffix from man pages # strip suffix from man pages
@ -751,7 +751,9 @@ _ifupdown()
/etc/network/interfaces ) ) /etc/network/interfaces ) )
else else
# Assume Red Hat # Assume Red Hat
COMPREPLY=( $( \ls /etc/sysconfig/network-scripts/ifcfg-* | sed -ne 's|.*ifcfg-\('$cur'.*\)|\1|p' ) ) COMPREPLY=( $( command ls \
/etc/sysconfig/network-scripts/ifcfg-* | \
sed -ne 's|.*ifcfg-\('$cur'.*\)|\1|p' ) )
fi fi
fi fi
@ -937,9 +939,9 @@ get_entries()
get_modules() get_modules()
{ {
if [ -n "$prefix" ]; then if [ -n "$prefix" ]; then
COMPREPLY=( $( \ls -d ${cvsroot}/${prefix}/!(CVSROOT) )) COMPREPLY=( $( command ls -d ${cvsroot}/${prefix}/!(CVSROOT) ) )
else else
COMPREPLY=( $( \ls -d ${cvsroot}/!(CVSROOT) ) ) COMPREPLY=( $( command ls -d ${cvsroot}/!(CVSROOT) ) )
fi fi
} }
@ -1006,8 +1008,8 @@ _cvs()
if [ $COMP_CWORD -gt 1 -a -r ${prefix}CVS/Entries ]; then if [ $COMP_CWORD -gt 1 -a -r ${prefix}CVS/Entries ]; then
get_entries get_entries
[ -z "$cur" ] && \ [ -z "$cur" ] && \
files=$( \ls -A !(CVS) ) || \ files=$( command ls -A !(CVS) ) || \
files=$( \ls -d ${cur}* 2>/dev/null ) files=$( command ls -d ${cur}* 2>/dev/null )
for i in ${entries[@]}; do for i in ${entries[@]}; do
files=( ${files[@]%$i} ) files=( ${files[@]%$i} )
done done
@ -1942,7 +1944,7 @@ _tar()
# #
# get name of tar file from command line # get name of tar file from command line
tar=$( echo "$COMP_LINE" | \ tar=$( echo "$COMP_LINE" | \
sed -e 's/^.* \([^ ]*'$regex'\) .*$/\1/' ) sed -e 's|^.* \([^ ]*'$regex'\) .*$|\1|' )
# devise how to untar and list it # devise how to untar and list it
untar=t${COMP_WORDS[1]//[^Izjyf]/} untar=t${COMP_WORDS[1]//[^Izjyf]/}
@ -2329,11 +2331,13 @@ _screen()
case "$prev" in case "$prev" in
-[rR]) -[rR])
# list detached # list detached
COMPREPLY=( $( \screen -ls | sed -ne 's|^['$'\t'']\+\('$cur'[^'$'\t'']\+\).*Detached.*$|\1|p' ) ) COMPREPLY=( $( command screen -ls | \
sed -ne 's|^['$'\t'']\+\('$cur'[^'$'\t'']\+\).*Detached.*$|\1|p' ) )
;; ;;
-[dDx]) -[dDx])
# list attached # list attached
COMPREPLY=( $( \screen -ls | sed -ne 's|^['$'\t'']\+\('$cur'[^'$'\t'']\+\).*Attached.*$|\1|p' ) ) COMPREPLY=( $( command screen -ls | \
sed -ne 's|^['$'\t'']\+\('$cur'[^'$'\t'']\+\).*Attached.*$|\1|p' ) )
;; ;;
-s) -s)
# shells # shells
@ -2853,8 +2857,8 @@ _java_classes()
"META-INF" | sed -e 's|\('$cur'[^/]*/\).*|\1|' \ "META-INF" | sed -e 's|\('$cur'[^/]*/\).*|\1|' \
| sort | uniq ) ) | sort | uniq ) )
elif [ -d $i ]; then elif [ -d $i ]; then
COMPREPLY=( ${COMPREPLY[@]} $( \ls -F -d $i/$cur* \ COMPREPLY=( ${COMPREPLY[@]} $( command ls -F -d \
2>/dev/null | sed -e 's|^'$i'/||' ) ) $i/$cur* 2>/dev/null | sed -e 's|^'$i'/||' ) )
fi fi
done done
# keep only packages and classes # keep only packages and classes
@ -2882,8 +2886,8 @@ _java_packages()
# parse each sourcepath element for packages # parse each sourcepath element for packages
for i in ${sourcepath//:/ }; do for i in ${sourcepath//:/ }; do
if [ -d $i ]; then if [ -d $i ]; then
COMPREPLY=( ${COMPREPLY[@]} $( \ls -F -d $i/$cur* \ COMPREPLY=( ${COMPREPLY[@]} $( command ls -F -d \
2>/dev/null | sed -e 's|^'$i'/||' ) ) $i/$cur* 2>/dev/null | sed -e 's|^'$i'/||' ) )
fi fi
done done
# keep only packages # keep only packages
@ -3370,7 +3374,7 @@ _update_alternatives()
break break
fi fi
done done
COMPREPLY=( $( \ls $admindir | grep "^$cur" ) ) COMPREPLY=( $( command ls $admindir | grep "^$cur" ) )
} }
local cur prev mode args local cur prev mode args