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

- rename rpm helper functions to be more consistent

Browse Source
This commit is contained in:
ianmacd 2002-09-09 16:26:14 +00:00
parent 97454710e7
commit d59e393cf6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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.408 2002/09/09 15:46:17 ianmacd Exp $ # $Id: bash_completion,v 1.409 2002/09/09 18:26:14 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -1174,7 +1174,7 @@ complete -F _cvs $default cvs
have rpm && { have rpm && {
# helper functions for rpm completion # helper functions for rpm completion
# #
rpm_installed_packages() _rpm_installed_packages()
{ {
if [ -r /var/log/rpmpkgs -a \ if [ -r /var/log/rpmpkgs -a \
/var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
@ -1188,7 +1188,7 @@ rpm_installed_packages()
fi fi
} }
rpm_group_completion() _rpm_groups()
{ {
local IFS=$'\t' local IFS=$'\t'
# remove trailing backslash, or grep will complain # remove trailing backslash, or grep will complain
@ -1299,7 +1299,7 @@ _rpm()
COMPREPLY=( $( compgen -W '--allmatches --noscripts \ COMPREPLY=( $( compgen -W '--allmatches --noscripts \
--notriggers --nodeps --test --repackage' -- $cur ) ) --notriggers --nodeps --test --repackage' -- $cur ) )
else else
rpm_installed_packages _rpm_installed_packages
fi fi
;; ;;
-@(q*|-query)) -@(q*|-query))
@ -1307,7 +1307,7 @@ _rpm()
if [ "${COMP_LINE#* -*([^ -])f}" != "$COMP_LINE" ]; then if [ "${COMP_LINE#* -*([^ -])f}" != "$COMP_LINE" ]; then
_filedir _filedir
elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then
rpm_group_completion _rpm_groups
elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then
# uninstalled package completion # uninstalled package completion
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
@ -1338,7 +1338,7 @@ _rpm()
--fileid --tid --nodigest --nosignature' \ --fileid --tid --nodigest --nosignature' \
-- $cur ) ) -- $cur ) )
elif [ "${COMP_LINE#* -*([^ -])a}" == "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])a}" == "$COMP_LINE" ]; then
rpm_installed_packages _rpm_installed_packages
fi fi
fi fi
;; ;;
@ -1360,11 +1360,11 @@ _rpm()
elif [ "${COMP_LINE#* -*([^ -])f}" != "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])f}" != "$COMP_LINE" ]; then
_filedir _filedir
elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then
rpm_group_completion _rpm_groups
elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then
_filedir 'rpm' _filedir 'rpm'
else else
rpm_installed_packages _rpm_installed_packages
fi fi
;; ;;
-[bt]*) -[bt]*)
@ -1394,7 +1394,7 @@ _rpm()
_filedir 'rpm' _filedir 'rpm'
;; ;;
--set@(perms|gids)) --set@(perms|gids))
rpm_installed_packages _rpm_installed_packages
;; ;;
--@(clean|rms@(ource|pec))) --@(clean|rms@(ource|pec)))
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
@ -1448,7 +1448,7 @@ _apt_get()
$cur ) ) $cur ) )
else else
# assume RPM based # assume RPM based
rpm_installed_packages _rpm_installed_packages
fi fi
return 0 return 0
;; ;;
@ -3273,7 +3273,7 @@ _urpme()
COMPREPLY=( $( compgen -W '-a --auto' -- $cur ) ) COMPREPLY=( $( compgen -W '-a --auto' -- $cur ) )
else else
# return list of available packages # return list of available packages
rpm_installed_packages _rpm_installed_packages
fi fi
} }
[ "$have" ] && complete -F _urpme urpme [ "$have" ] && complete -F _urpme urpme