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

- when completing on classes inside Java JAR files, use zipinfo instead of

Browse Source 
the jar command, if it is available
This commit is contained in:
ianmacd 2003-01-09 10:44:29 +00:00
parent 44103fd785
commit 7859e94517
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bash_completion
View File

@ -1,6 +1,6 @@
# bash_completion - some programmable completion functions for bash 2.05b # bash_completion - some programmable completion functions for bash 2.05b
# #
# $Id: bash_completion,v 1.506 2003/01/09 11:25:58 ianmacd Exp $ # $Id: bash_completion,v 1.507 2003/01/09 11:44:29 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -124,8 +124,7 @@ complete -c command type which
have() have()
{ {
unset -v have unset -v have
type $1 &> /dev/null type $1 &> /dev/null && have="yes"
[ $? -eq 0 ] && have="yes"
} }
# use GNU sed if we have it, since its extensions are still used in our code # use GNU sed if we have it, since its extensions are still used in our code
@ -3018,6 +3017,7 @@ _dselect()
# available path elements completion # available path elements completion
have java && { have java && {
{
_java_path() _java_path()
{ {
cur=${cur##*:} cur=${cur##*:}
@ -3075,9 +3075,17 @@ _java_classes()
# parse each classpath element for classes # parse each classpath element for classes
for i in ${classpath//:/ }; do for i in ${classpath//:/ }; do
if [ -r $i ] && [[ "$i" == *.@(jar|zip) ]]; then if [ -r $i ] && [[ "$i" == *.@(jar|zip) ]]; then
COMPREPLY=( ${COMPREPLY[@]} $( jar tf $i $cur | grep -v\ if type zipinfo &> /dev/null; then
"META-INF" | sed -e 's|\('$cur'[^/]*/\).*|\1|' \ COMPREPLY=( ${COMPREPLY[@]} $( zipinfo -1 $i |
| sort | uniq ) ) grep "^$cur" | grep -v "META-INF" |
sed -e 's|\('$cur'[^/]*/\).*|\1|' | sort |
uniq ) )
else
COMPREPLY=( ${COMPREPLY[@]} $( jar tf $i $cur |
grep -v "META-INF" | sed -e \
's|\('$cur'[^/]*/\).*|\1|' | sort | uniq ) )
fi
elif [ -d $i ]; then elif [ -d $i ]; then
COMPREPLY=( ${COMPREPLY[@]} $( command ls -F -d \ COMPREPLY=( ${COMPREPLY[@]} $( command ls -F -d \
$i/$cur* 2>/dev/null | sed -e 's|^'$i'/||' ) ) $i/$cur* 2>/dev/null | sed -e 's|^'$i'/||' ) )