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

Merge branch 'master' of git+ssh://git.debian.org/git/bash-completion/bash-completion

Browse Source
This commit is contained in:
Guillaume Rousse 2009-10-27 10:45:15 +01:00
commit 60ee2500bc
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -7,6 +7,7 @@ bash-completion (2.x)
* Fixed "freq" and "rate" completion for iwconfig * Fixed "freq" and "rate" completion for iwconfig
* contrib/munin-node fixed (Debian: #550943) * contrib/munin-node fixed (Debian: #550943)
* contrib/dpkg fixed -W and --show completing on .?(u)deb's (Debian: #552109) * contrib/dpkg fixed -W and --show completing on .?(u)deb's (Debian: #552109)
* contrib/aptitude: add @(add|remove)-user-tag
[ Ville Skyttä ] [ Ville Skyttä ]
* Create bz2 dist tarball too. * Create bz2 dist tarball too.

11
contrib/aptitude
View File

@ -30,7 +30,7 @@ _aptitude()
-Z -v --verbose --purge-unused --schedule-only' -Z -v --verbose --purge-unused --schedule-only'
for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
if [[ ${COMP_WORDS[i]} == @(install|reinstall|hold|unhold|markauto|unmarkauto|dist-upgrade|full-upgrade|download|show|forbid-version|purge|remove|changelog|why|why-not|keep|keep-all|build-dep) ]]; then if [[ ${COMP_WORDS[i]} == @(@(|re)install|@(|un)hold|@(|un)markauto|@(dist|full)-upgrade|download|show|forbid-version|purge|remove|changelog|why@(|-not)|keep@(|-all)|build-dep|@(add|remove)-user-tag) ]]; then
special=${COMP_WORDS[i]} special=${COMP_WORDS[i]}
fi fi
#exclude some mutually exclusive options #exclude some mutually exclusive options
@ -40,7 +40,7 @@ _aptitude()
if [[ -n "$special" ]]; then if [[ -n "$special" ]]; then
case $special in case $special in
@(install|hold|markauto|unmarkauto|dist-upgrade|full-upgrade|download|show|changelog|why|why-not|build-dep)) @(install|hold|@(|un)markauto|@(dist|full)-upgrade|download|show|changelog|why@(|-not)|build-dep|@(add|remove)-user-tag))
COMPREPLY=( $( apt-cache pkgnames $cur 2> /dev/null ) ) COMPREPLY=( $( apt-cache pkgnames $cur 2> /dev/null ) )
return 0 return 0
;; ;;
@ -57,14 +57,14 @@ _aptitude()
case $prev in case $prev in
# don't complete anything if these options are found # don't complete anything if these options are found
@(autoclean|clean|forget-new|search|upgrade|safe-upgrade|update|keep-all)) @(@(auto|)clean|forget-new|search|@(|safe-)upgrade|update|keep-all))
return 0 return 0
;; ;;
-S) -S)
_filedir _filedir
return 0 return 0
;; ;;
-@(t|-target-release|-default-release)) -@(t|-@(target|default)-release))
COMPREPLY=( $( apt-cache policy | \ COMPREPLY=( $( apt-cache policy | \
grep "release.o=Debian,a=$cur" | \ grep "release.o=Debian,a=$cur" | \
sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2> /dev/null ) ) sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2> /dev/null ) )
@ -79,7 +79,8 @@ _aptitude()
clean autoclean install reinstall remove \ clean autoclean install reinstall remove \
hold unhold purge markauto unmarkauto why why-not \ hold unhold purge markauto unmarkauto why why-not \
dist-upgrade full-upgrade download search show \ dist-upgrade full-upgrade download search show \
forbid-version changelog keep-all build-dep' -- "$cur" ) ) forbid-version changelog keep-all build-dep \
add-user-tag remove-user-tag' -- "$cur" ) )
fi fi
return 0 return 0