The following commit has been merged in the master branch:
commit 0f2656669fbdf627a3ddf11bdb72e3ec9cef68fd
Merge: e5c2eef34b7418b836bf29fef3d9ac868acb2107
7d950bb224ec24000c27fe6b4cd0122ad0041de3
Author: Guillaume Rousse <[email protected]>
Date: Mon Mar 30 22:06:55 2009 +0200
Merge branch 'guillomovitch'
diff --combined bash_completion
index 63a5ae4,cd3bdab..2e703d5
--- a/bash_completion
+++ b/bash_completion
@@@ -4023,49 -4023,6 +4023,6 @@@ _openssl(
complete -F _openssl $default openssl
}
- # screen(1) completion
- #
- have screen &&
- _screen()
- {
- local cur prev preprev
-
- COMPREPLY=()
- cur=`_get_cword`
- prev=${COMP_WORDS[COMP_CWORD-1]}
-
- [ "$COMP_CWORD" -ge 2 ] && preprev=${COMP_WORDS[COMP_CWORD-2]}
-
- if [ "$preprev" = "-d" -o "$preprev" = "-D" -a "$prev" = "-r" -o \
- "$prev" = "-R" ]; then
- # list all
- COMPREPLY=( $( command screen -ls | \
- sed -ne
's|^['$'\t'']\+\('$cur'[0-9]\+\.[^'$'\t'']\+\).*$|\1|p' ) )
- else
- case "$prev" in
- -[rR])
- # list detached
- COMPREPLY=( $( command screen -ls | \
- sed -ne
's|^['$'\t'']\+\('$cur'[0-9]\+\.[^'$'\t'']\+\).*Detached.*$|\1|p' ) )
- ;;
- -[dDx])
- # list attached
- COMPREPLY=( $( command screen -ls | \
- sed -ne
's|^['$'\t'']\+\('$cur'[0-9]\+\.[^'$'\t'']\+\).*Attached.*$|\1|p' ) )
- ;;
- -s)
- # shells
- COMPREPLY=( $( grep ^${cur:-[^#]} /etc/shells ) )
- ;;
- *)
- ;;
- esac
- fi
-
- return 0
- } &&
- complete -F _screen $default screen
-
# lftp(1) bookmark completion
#
have lftp &&
@@@ -6564,6 -6521,122 +6521,6 @@@ _mc(
} &&
complete -F _mc $filenames mc
-# yum(8) completion
-#
-have yum && {
-_yum_list()
-{
- if [[ "$1" == all ]] ; then
- # Try to strip in between headings like "Available Packages"
- # This will obviously only work for English :P
- COMPREPLY=( $( yum -d 0 -C list $1 "$cur*" 2>/dev/null | \
- grep -iv '^\(Available\|Installed\|Updated\) Packages' | \
- sed -e 's/[[:space:]].*//' ) )
- else
- # Drop first line (e.g. "Updated Packages")
- COMPREPLY=( $( yum -d 0 -C list $1 "$cur*" 2>/dev/null | \
- sed -ne 1d -e 's/[[:space:]].*//p' ) )
- fi
-}
-
-_yum()
-{
- local cur prev special
-
- COMPREPLY=()
- cur=`_get_cword`
- prev=${COMP_WORDS[COMP_CWORD-1]}
-
- for (( i=0; i < ${#comp_wor...@]}-1; i++ )); do
- if [[ ${COMP_WORDS[i]} ==
@(install|update|upgrade|remove|erase|deplist|info) ]]; then
- special=${COMP_WORDS[i]}
- fi
- done
-
- if [ -n "$special" ]; then
- case $special in
- install)
- _yum_list available
- return 0
- ;;
- deplist|info)
- _yum_list all
- return 0
- ;;
- upgrade|update)
- _yum_list updates
- return 0
- ;;
- remove|erase)
- # _rpm_installed_packages is not arch-qualified
- _yum_list installed
- return 0
- ;;
- esac
- fi
-
- case $cur in
- --*)
- COMPREPLY=( $( compgen -W '--installroot --version --help
--enablerepo --disablerepo --exclude --obsoletes --noplugins' -- $cur ) )
- return 0
- ;;
- -*)
- COMPREPLY=( $( compgen -W '-c -e -d -y -t -R -C -h' -- $cur ) )
- return 0
- ;;
- esac
-
- case $prev in
- list)
- COMPREPLY=( $( compgen -W 'all available updates installed
extras obsoletes recent' -- $cur ) )
- ;;
- clean)
- COMPREPLY=( $( compgen -W 'packages headers metadata cache
dbcache all' -- $cur ) )
- ;;
- localinstall|localupdate)
- # TODO: should not match *src.rpm
- _filedir rpm
- ;;
- -c)
- _filedir
- ;;
- --installroot)
- _filedir -d
- ;;
- *)
- COMPREPLY=( $( compgen -W 'install update check-update upgrade
remove list \
- search info provides clean
groupinstall groupupdate \
- grouplist deplist erase
groupinfo groupremove \
- localinstall localupdate
makecache resolvedep \
- shell whatprovides' -- $cur ) )
- ;;
- esac
-}
-complete -F _yum $filenames yum
-
-# yum-arch(8) completion
-#
-_yum_arch()
-{
- local cur
- COMPREPLY=()
- cur=`_get_cword`
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W '-d -v -vv -n -c -z -s -l -q' -- $cur ) )
- ;;
- *)
- _filedir -d
- ;;
- esac
-
- return 0
-
-}
-complete -F _yum_arch $filenames yum-arch
-}
-
# ImageMagick completion
#
have convert && {
diff --combined debian/changelog
index 6524529,bbdf012..90dc92c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,12 -3,6 +3,12 @@@ bash-completion (1:1.x) UNRELEASED; urg
[ David Paleino ]
* Prepare for future development.
+ [ Ville Skyttä ]
+ * Split yum and yum-arch completion into contrib/yum.
+ * Install yum-arch completion only if yum-arch is installed.
+ * Update list of yum commands and options.
+ * Add yum repolist, --enable/disablerepo, and --disableexcludes completions.
+
-- David Paleino <[email protected]> Wed, 25 Mar 2009 23:18:24 +0100
bash-completion (1:1.0-1) UNRELEASED; urgency=low
@@@ -25,6 -19,7 +25,7 @@@
* Added quota-tools completion
* Added rdesktop completion
* Added tightvncviewer completion
+ * Cleanup screen completion, and make it completes on options
[ David Paleino ]
* Added .kar to Timidity completion.
--
bash-completion
_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/bash-completion-commits
