reverted to previous version of _rpm, since last time's fixes broke more things than
they fixed.
This commit is contained in:
parent
c29fd79ff3
commit
bc4dc3b582
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# <![CDATA[
|
# <![CDATA[
|
||||||
#
|
#
|
||||||
# $Id: bash_completion,v 1.23 2001/08/16 17:49:39 ianmacd Exp $
|
# $Id: bash_completion,v 1.24 2001/08/22 17:20:27 ianmacd Exp $
|
||||||
#
|
#
|
||||||
# Copyright (C) Ian Macdonald <ian@caliban.org>
|
# Copyright (C) Ian Macdonald <ian@caliban.org>
|
||||||
#
|
#
|
||||||
@ -627,20 +627,6 @@ _rpm()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
case "$prev" in
|
case "$prev" in
|
||||||
-*p*)
|
|
||||||
# complete on list of relevant options
|
|
||||||
COMPREPLY=( $( compgen -W 'scripts root rcfile whatprovides \
|
|
||||||
whatrequires requires triggeredby ftpport ftpproxy httpproxy \
|
|
||||||
httpport provides triggers dump changelog dbpath filesbypkg \
|
|
||||||
define eval pipe showrc info list state docfiles \
|
|
||||||
configfiles queryformat' ${cur_nodash#-} ) )
|
|
||||||
dashify
|
|
||||||
# return if $cur is an option
|
|
||||||
[[ "$cur" == -* ]] && return 0
|
|
||||||
# add a list of RPMS to possible completions
|
|
||||||
file_glob rpm
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
--@(db|exclude)path|prefix|relocate|root)
|
--@(db|exclude)path|prefix|relocate|root)
|
||||||
COMPREPLY=( $( compgen -d $cur ) )
|
COMPREPLY=( $( compgen -d $cur ) )
|
||||||
return 0
|
return 0
|
||||||
@ -692,20 +678,18 @@ _rpm()
|
|||||||
file_glob rpm
|
file_glob rpm
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
-q*)
|
-qp*)
|
||||||
# complete on list of relevant options
|
# complete on list of relevant options
|
||||||
COMPREPLY=( $( compgen -W 'scripts root rcfile whatprovides \
|
COMPREPLY=( $( compgen -W 'scripts root rcfile whatprovides \
|
||||||
whatrequires requires triggeredby ftpport ftpproxy httpproxy \
|
whatrequires requires triggeredby ftpport ftpproxy httpproxy \
|
||||||
httpport provides triggers dump changelog dbpath specfile \
|
httpport provides triggers dump changelog dbpath filesbypkg \
|
||||||
querybynumber last filesbypkg define eval pipe showrc info \
|
define eval pipe showrc info list state docfiles \
|
||||||
list state docfiles configfiles queryformat' \
|
configfiles queryformat' ${cur_nodash#-} ) )
|
||||||
${cur_nodash#-} ) )
|
|
||||||
dashify
|
dashify
|
||||||
# return if $cur is an option
|
# return if $cur is an option
|
||||||
[[ "$cur" == -* ]] && return 0
|
[[ "$cur" == -* ]] && return 0
|
||||||
# don't complete on packages if we are querying all packages
|
# add a list of RPMS to possible completions
|
||||||
[[ ${COMP_WORDS[1]} == -qa* ]] && return 0
|
file_glob rpm
|
||||||
add_package_list
|
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
-*f)
|
-*f)
|
||||||
@ -723,6 +707,22 @@ _rpm()
|
|||||||
add_package_list
|
add_package_list
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
|
-q*)
|
||||||
|
# complete on list of relevant options
|
||||||
|
COMPREPLY=( $( compgen -W 'scripts root rcfile whatprovides \
|
||||||
|
whatrequires requires triggeredby ftpport ftpproxy httpproxy \
|
||||||
|
httpport provides triggers dump changelog dbpath specfile \
|
||||||
|
querybynumber last filesbypkg define eval pipe showrc info \
|
||||||
|
list state docfiles configfiles queryformat' \
|
||||||
|
${cur_nodash#-} ) )
|
||||||
|
dashify
|
||||||
|
# return if $cur is an option
|
||||||
|
[[ "$cur" == -* ]] && return 0
|
||||||
|
# don't complete on packages if we are querying all packages
|
||||||
|
[[ ${COMP_WORDS[1]} == -qa* ]] && return 0
|
||||||
|
add_package_list
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
-@(K|-checksig))
|
-@(K|-checksig))
|
||||||
# complete on list of relevant options
|
# complete on list of relevant options
|
||||||
COMPREPLY=( $( compgen -W 'nopgp nogpg nomd5' \
|
COMPREPLY=( $( compgen -W 'nopgp nogpg nomd5' \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user