_rpm(): more removal of compgen -G in favour of compgen -f -X

This commit is contained in:
ianmacd 2002-02-18 18:07:37 +00:00
parent a1c8489a45
commit 930f3a8cbd

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.129 2002/02/18 18:55:25 ianmacd Exp $ # $Id: bash_completion,v 1.130 2002/02/18 19:07:37 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -815,9 +815,9 @@ _rpm()
else else
_expand || return 0 _expand || return 0
# complete on .tar files # complete on .tar files
COMPREPLY=( $( compgen -G $cur\*.+(tgz|tar.+(gz|bz2)) ) ) COMPREPLY=( $( compgen -f -X '!*.@(tgz|tar.+(gz|bz2))' \
[ ${#COMPREPLY[@]} = 0 ] && \ $cur ) )
COMPREPLY=( $( compgen -d $cur ) ) COMPREPLY=( ${COMPREPLY[@]} $( compgen -d $cur ) )
fi fi
return 0 return 0
;; ;;
@ -827,15 +827,16 @@ _rpm()
nodirtokens' ${cur_nodash#-} ) ) nodirtokens' ${cur_nodash#-} ) )
dashify dashify
# complete on source RPMs # complete on source RPMs
COMPREPLY=( ${COMPREPLY[@]} $( compgen -G $cur\*.src.rpm ) ) COMPREPLY=( ${COMPREPLY[@]} $( compgen -f -X '!*.src.rpm' \
[ ${#COMPREPLY[@]} = 0 ] && COMPREPLY=( $( compgen -d $cur ) ) $cur ) )
COMPREPLY=( ${COMPREPLY[@]} $( compgen -d $cur ) )
return 0 return 0
;; ;;
--tarbuild) --tarbuild)
_expand || return 0 _expand || return 0
# complete on tarred sources # complete on tarred sources
COMPREPLY=( $( compgen -G $cur\*.+(tgz|tar.+(gz|bz2)) ) ) COMPREPLY=( $( compgen -f -X '!*.@(tgz|tar.+(gz|bz2))' $cur ) )
[ ${#COMPREPLY[@]} = 0 ] && COMPREPLY=( $( compgen -d $cur ) ) COMPREPLY=( ${COMPREPLY[@]} $( compgen -d $cur ) )
return 0 return 0
;; ;;
--@(re|add)sign) --@(re|add)sign)