summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Walker <ka0ttic@gentoo.org>2005-02-04 12:51:46 +0000
committerAaron Walker <ka0ttic@gentoo.org>2005-02-04 12:51:46 +0000
commit950453462b24250bcf0e493495253527a91a3b55 (patch)
tree9f673a37198238a3c0b70cbd27e5a13f6f7b83d4 /app-shells/bash-completion/files
parentFixed multilib issues. (diff)
downloadhistorical-950453462b24250bcf0e493495253527a91a3b55.tar.gz
historical-950453462b24250bcf0e493495253527a91a3b55.tar.bz2
historical-950453462b24250bcf0e493495253527a91a3b55.zip
Revision bump for bug 78922; fixes a few equery completion bugs.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'app-shells/bash-completion/files')
-rw-r--r--app-shells/bash-completion/files/digest-bash-completion-20050121-r1 (renamed from app-shells/bash-completion/files/digest-bash-completion-20050121)0
-rw-r--r--app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff119
2 files changed, 119 insertions, 0 deletions
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r1
index 9db0f10e078e..9db0f10e078e 100644
--- a/app-shells/bash-completion/files/digest-bash-completion-20050121
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050121-r1
diff --git a/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff b/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff
new file mode 100644
index 000000000000..8dc5cc1bc04b
--- /dev/null
+++ b/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff
@@ -0,0 +1,119 @@
+diff -urN gentoo-bashcomp-20050117.orig/gentoo gentoo-bashcomp-20050117/gentoo
+--- gentoo-bashcomp-20050117.orig/gentoo 2005-01-31 03:41:52.876228512 -0500
++++ gentoo-bashcomp-20050117/gentoo 2005-01-31 04:07:55.467678504 -0500
+@@ -750,7 +750,8 @@
+ for i in "${COMP_WORDS[@]}"; do
+ if [ $j -lt $COMP_CWORD ]; then
+ j=$((j + 1))
+- case $i in @(belongs|ch@(anges|eck)|dep@(ends|graph)|files|glsa|list|s@(ize|tats)|uses|which|hasuse))
++ case $i in
++ @(belongs|ch@(anges|eck)|dep@(ends|graph)|files|glsa|list|s@(ize|tats)|uses|which|hasuse|b|c|k|d|g|f|a|h|l|s|t|u|w))
+ mode=$i
+ ;;
+ esac
+@@ -769,11 +770,11 @@
+ ;;
+ esac
+ ;;
+- changes|glsa|stats)
++ c?(hanges)|a|glsa|t|stats)
+ # These commands have not been implemented in 'equery' yet ...
+ echo -n "# Not implemented! "
+ ;;
+- files)
++ f?(iles))
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -788,7 +789,7 @@
+ esac
+ fi
+ ;;
+- list)
++ l?(ist))
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -803,7 +804,7 @@
+ esac
+ fi
+ ;;
+- belongs)
++ b?(elongs))
+ # Only complete if the previous entry on the command line is not
+ # a file name.
+ if \
+@@ -823,8 +824,8 @@
+ COMPREPLY=($(compgen -W "-c --category -e --earlyout" -- $cur))
+ ;;
+ *)
+- # Complete filenames. Function defined in /etc/bash_completion.
+- _filedir
++ COMPREPLY=($(compgen -f -- $cur) \
++ $(compgen -d -S '/' -- $cur))
+ ;;
+ esac
+ # Are we completing a category?
+@@ -832,7 +833,7 @@
+ COMPREPLY=($(cd ${portdir}/metadata/cache; compgen -W "$(compgen -G '*')" -- $cur))
+ fi
+ ;;
+- uses|which)
++ @(u?(ses)|w?(hich)))
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} ]]; then
+@@ -840,7 +841,7 @@
+ _pkgname -A $cur
+ fi
+ ;;
+- depgraph)
++ g|depgraph)
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -855,7 +856,7 @@
+ esac
+ fi
+ ;;
+- depends)
++ d?(epends))
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -878,7 +879,7 @@
+ esac
+ fi
+ ;;
+- check)
++ k|check)
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} ]]; then
+@@ -886,7 +887,7 @@
+ _pkgname -I $cur
+ fi
+ ;;
+- size)
++ s?(ize))
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -901,7 +902,7 @@
+ esac
+ fi
+ ;;
+- hasuse)
++ h?(asuse))
+ # Only complete if the previous entry on the command line is not
+ # a package name.
+ if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -921,7 +922,7 @@
+ esac
+ return 0
+ }
+-complete -F _equery -o filenames equery
++complete -F _equery equery
+ }
+
+ #