- there were still references to _file_glob() in the code

This commit is contained in:
ianmacd 2002-05-19 14:56:19 +00:00
parent 5d5f9b5608
commit 85b27aea4c

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.327 2002/05/19 09:16:30 ianmacd Exp $ # $Id: bash_completion,v 1.328 2002/05/19 16:56:19 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -128,7 +128,7 @@ have()
# This function performs file and directory completion. It's better than # This function performs file and directory completion. It's better than
# simply using 'compgen -f', because it honours spaces in filenames. # simply using 'compgen -f', because it honours spaces in filenames.
# If passed -d, it completes only on directories. If passed anything else, # If passed -d, it completes only on directories. If passed anything else,
# it's assumed to be a fileglob to complete on. # it's assumed to be a file glob to complete on.
# #
_filedir() _filedir()
{ {
@ -916,8 +916,7 @@ _cvs()
@(commit|ci)) @(commit|ci))
mode=commit mode=commit
;; ;;
@(annotate|diff|@(ex|im)port|history|release|status| \ @(annotate|diff|@(ex|im)port|history|release|status|update))
update))
mode=$i mode=$i
;; ;;
?(r)log) ?(r)log)
@ -1187,7 +1186,7 @@ _rpm()
--eval --pipe --queryformat --repackage --nosuggests \ --eval --pipe --queryformat --repackage --nosuggests \
--nodigest --nosignature' -- $cur ) ) --nodigest --nosignature' -- $cur ) )
else else
file_glob rpm _filedir 'rpm'
fi fi
;; ;;
-@(e|-erase)) -@(e|-erase))
@ -1217,7 +1216,7 @@ _rpm()
--conflicts --obsoletes --nodigest \ --conflicts --obsoletes --nodigest \
--nosignature' -- $cur ) ) --nosignature' -- $cur ) )
else else
file_glob rpm _filedir 'rpm'
fi fi
else else
# installed package completion # installed package completion
@ -1243,7 +1242,7 @@ _rpm()
COMPREPLY=( $( compgen -W '--nopgp --nogpg --nomd5 \ COMPREPLY=( $( compgen -W '--nopgp --nogpg --nomd5 \
--nodigest --nosignature' -- $cur ) ) --nodigest --nosignature' -- $cur ) )
else else
file_glob rpm _filedir 'rpm'
fi fi
;; ;;
-@([Vy]*|-verify)) -@([Vy]*|-verify))
@ -1258,7 +1257,7 @@ _rpm()
elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then
rpm_group_completion rpm_group_completion
elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then
file_glob rpm _filedir 'rpm'
else else
rpm_installed_packages rpm_installed_packages
fi fi
@ -1270,9 +1269,9 @@ _rpm()
--targetbuildarch --buildos --nobuild --nodeps \ --targetbuildarch --buildos --nobuild --nodeps \
--nodirtokens' -- $cur ) ) --nodirtokens' -- $cur ) )
elif [[ ${COMP_WORDS[1]} == -b* ]]; then elif [[ ${COMP_WORDS[1]} == -b* ]]; then
file_glob spec _filedir 'spec'
else else
file_glob '@(tgz|tar.@(gz|bz2))' _filedir '@(tgz|tar.@(gz|bz2))'
fi fi
;; ;;
--re@(build|compile)) --re@(build|compile))
@ -1280,14 +1279,14 @@ _rpm()
COMPREPLY=( $( compgen -W '--nodeps --rmsource \ COMPREPLY=( $( compgen -W '--nodeps --rmsource \
--rmspec --sign --nodirtokens' -- $cur ) ) --rmspec --sign --nodirtokens' -- $cur ) )
else else
file_glob src.rpm _filedir 'src.rpm'
fi fi
;; ;;
--tarbuild) --tarbuild)
file_glob '@(tgz|tar.@(gz|bz2))' _filedir '@(tgz|tar.@(gz|bz2))'
;; ;;
--@(re|add)sign) --@(re|add)sign)
file_glob rpm _filedir 'rpm'
;; ;;
--set@(perms|gids)) --set@(perms|gids))
rpm_installed_packages rpm_installed_packages
@ -1297,7 +1296,7 @@ _rpm()
COMPREPLY=( $( compgen -W '--clean --rmsource \ COMPREPLY=( $( compgen -W '--clean --rmsource \
--rmspec' -- $cur ) ) --rmspec' -- $cur ) )
else else
file_glob spec _filedir 'spec'
fi fi
;; ;;
--@(import|dbpath|root)) --@(import|dbpath|root))