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

This commit is contained in:
David Paleino 2009-10-16 19:43:28 +02:00
commit 5ca835bfac
7 changed files with 45 additions and 32 deletions

View File

@ -6,6 +6,14 @@ bash-completion (1.x)
Müller <raimue@codingfarm.de> (bash-completion MacPorts maintainer) Müller <raimue@codingfarm.de> (bash-completion MacPorts maintainer)
* Fixed "freq" and "rate" completion for iwconfig * Fixed "freq" and "rate" completion for iwconfig
[ Ville Skyttä ]
* Create bz2 dist tarball too.
* Include CHANGES in dist tarball.
* Include profile snippet in tarball, install it.
* Rename contrib/bluez-utils to contrib/bluez to follow bluez 4.x naming.
* Apply cardctl completion to pccardctl too.
* Apply pine completion to alpine too.
-- David Paleino <d.paleino@gmail.com> Sun, 11 Oct 2009 11:11:57 +0200 -- David Paleino <d.paleino@gmail.com> Sun, 11 Oct 2009 11:11:57 +0200
bash-completion (1.1) bash-completion (1.1)

View File

@ -14,7 +14,7 @@ bashcomp_DATA = contrib/ant \
contrib/bind-utils \ contrib/bind-utils \
contrib/bitkeeper \ contrib/bitkeeper \
contrib/bittorrent \ contrib/bittorrent \
contrib/bluez-utils \ contrib/bluez \
contrib/brctl \ contrib/brctl \
contrib/bzip2 \ contrib/bzip2 \
contrib/cardctl \ contrib/cardctl \

55
README
View File

@ -1,11 +1,11 @@
INSTALLATION INSTALLATION
------------ ------------
The easiest way to install this software is to use a package, such as The easiest way to install this software is to use a package; it is available
the RPM that I maintain for Red Hat Linux, the .deb package for in many operating system distributions. The package's name is usually
Debian/GNU Linux or Ubuntu, etc. You still need to source it from either bash-completion. Depending on the package, you may still need to source it
/etc/bashrc or ~/.bashrc (or any other file sourcing those). You can do from either /etc/bashrc or ~/.bashrc (or any other file sourcing those). You
this by simply using: can do this by simply using:
# Use bash-completion, if available # Use bash-completion, if available
if [ -f /etc/bash_completion ]; then if [ -f /etc/bash_completion ]; then
@ -88,8 +88,8 @@ maintainer:
If you get errors about 'complete' not accepting the -o flag, you are If you get errors about 'complete' not accepting the -o flag, you are
probably running bash 2.04. In this case, you should upgrade to bash probably running bash 2.04. In this case, you should upgrade to bash
2.05a or later. However, I have endeavoured to make the code detect 2.05a or later. However, we have endeavoured to make the code detect
this version of bash and work around this issue, so please inform me this version of bash and work around this issue, so please inform us
if you still encounter this error. if you still encounter this error.
Copies of the patches and prepatched versions of bash are available Copies of the patches and prepatched versions of bash are available
@ -100,7 +100,7 @@ from:
If you find that a given function is producing errors under certain If you find that a given function is producing errors under certain
circumstances when you attempt completion, try running 'set -v' or circumstances when you attempt completion, try running 'set -v' or
'set -x' prior to attempting the completion again. This will produce 'set -x' prior to attempting the completion again. This will produce
useful debugging output that will aid me in fixing the problem if you useful debugging output that will aid us in fixing the problem if you
are unable to do so yourself. Turn off the trace output by running are unable to do so yourself. Turn off the trace output by running
either 'set +v' or 'set +x'. either 'set +v' or 'set +x'.
@ -142,7 +142,7 @@ If you are seeing 'unbound variable' warnings from bash when hitting
somewhere in your start-up files. This causes bash to flag the use of somewhere in your start-up files. This causes bash to flag the use of
any uninitialised shell variables as an error. any uninitialised shell variables as an error.
Whilst I try to avoid references to uninitialised variables in the Whilst we try to avoid references to uninitialised variables in the
code, there seem to be at least some cases where bash issues this code, there seem to be at least some cases where bash issues this
warning even though the variable in question has been initialised. warning even though the variable in question has been initialised.
@ -241,7 +241,7 @@ Q. When doing tar completion on a file within a tar file like this:
correctly. The slashes are removed and everything looks like it's correctly. The slashes are removed and everything looks like it's
in a single directory. Why is this? in a single directory. Why is this?
A. It's a choice I had to make. bash's programmable completion is A. It's a choice we had to make. bash's programmable completion is
limited in how it handles the list of possible completions it limited in how it handles the list of possible completions it
returns. returns.
@ -335,7 +335,7 @@ A. The readline(3) library offers a few settings that can make tab
set show-all-if-ambiguous on set show-all-if-ambiguous on
This will allow single tab completion as opposed to requiring a This will allow single tab completion as opposed to requiring a
double tab. This makes things much more pleasant, in my opinion. double tab. This makes things much more pleasant, in our opinion.
set visible-stats on set visible-stats on
@ -343,27 +343,27 @@ A. The readline(3) library offers a few settings that can make tab
denoting its type, in a similar way to ls(1) with -F or --classify. denoting its type, in a similar way to ls(1) with -F or --classify.
set page-completions off set page-completions off
This turns off the use of the internal pager when returning long This turns off the use of the internal pager when returning long
completion lists. completion lists.
Q. This code is rubbish/not bad/pretty good/the best thing since Q. This code is rubbish/not bad/pretty good/the best thing since
sliced bread. How can I show my appreciation? sliced bread. How can I show my appreciation?
A. If you're a registered Freshmeat user, take a moment to rate the A. If you're a registered freshmeat.net user, take a moment to rate the
project at: project at:
http://freshmeat.net/rate/19041/ http://freshmeat.net/projects/bashcompletion
Of course, writing to me and letting me know how you feel also works. Of course, writing to us and letting us know how you feel also works.
Patches and new completion routines are most welcome, too. Patches and new completion routines are most welcome, too.
Q. How can I stay abreast of new releases? Q. How can I stay abreast of new releases?
A. If you're a registered Freshmeat user, you can subscribe to new release A. If you're a registered freshmeat.net user, you can subscribe to new release
announcements at: announcements at:
http://freshmeat.net/subscribe/19041/ http://freshmeat.net/projects/bashcompletion
Q. Is bash the be-all-and-end-all of completion as far as shells go? Q. Is bash the be-all-and-end-all of completion as far as shells go?
@ -410,7 +410,7 @@ guidelines in mind:
Similarly, 3.0 added the use of the regex operator '=~', commonly Similarly, 3.0 added the use of the regex operator '=~', commonly
found in Perl and Ruby. Whilst this is very useful, it's not yet found in Perl and Ruby. Whilst this is very useful, it's not yet
safe to assume its ubiquity. safe to assume its ubiquity.
On the other hand, extended globs were added in bash 2.02 and often On the other hand, extended globs were added in bash 2.02 and often
enable you to avoid the use of external programs, which are enable you to avoid the use of external programs, which are
expensive to fork and execute, so do make full use of those: expensive to fork and execute, so do make full use of those:
@ -484,13 +484,18 @@ guidelines in mind:
particular problems. Read the bash man page for details of all the particular problems. Read the bash man page for details of all the
programming tools available to you within the shell. programming tools available to you within the shell.
- Please test your code thoroughly before sending it to me. I don't - Please test your code thoroughly before sending it to us. We don't
have access to all the commands for which I am sent completion have access to all the commands for which we are sent completion
functions, so I am unable to test them all personally. If your code functions, so we are unable to test them all personally. If your code
is accepted into the distribution, a lot of people will try it out, is accepted into the distribution, a lot of people will try it out,
so try to do a thorough job of eradicating all the bugs before you so try to do a thorough job of eradicating all the bugs before you
send it to me. send it to us.
- File bugs, enhancement requests (preferably with patches attached) at
the project tracker at https://alioth.debian.org/projects/bash-completion/
Sending them to the developers list usually works too, but bits are more
likely to fall through the cracks that way compared to the tracker.
-- --
Ian Macdonald bash-completion developers
ian@caliban.org bash-completion-devel@lists.alioth.debian.org

View File

@ -1,5 +1,5 @@
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_INIT([bash-completion], [1.0]) AC_INIT([bash-completion], [1.1])
AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT

View File

@ -1,4 +1,4 @@
# bash completion for bluez-utils # bash completion for bluez utils
have hcitool && { have hcitool && {
_bluetooth_adresses() _bluetooth_adresses()

View File

@ -1,6 +1,6 @@
# Linux cardctl(8) completion # Linux cardctl(8) completion
have cardctl && have cardctl || have pccardctl &&
_cardctl() _cardctl()
{ {
local cur local cur
@ -13,7 +13,7 @@ _cardctl()
resume reset eject insert scheme' -- "$cur" ) ) resume reset eject insert scheme' -- "$cur" ) )
fi fi
} && } &&
complete -F _cardctl cardctl complete -F _cardctl cardctl pccardctl
# Local variables: # Local variables:
# mode: shell-script # mode: shell-script

View File

@ -1,6 +1,6 @@
# PINE address-book completion # PINE address-book completion
have pine && have pine || have alpine &&
_pineaddr() _pineaddr()
{ {
local cur local cur
@ -11,7 +11,7 @@ _pineaddr()
COMPREPLY=( $( compgen -W '$( awk "{print \$1}" ~/.addressbook \ COMPREPLY=( $( compgen -W '$( awk "{print \$1}" ~/.addressbook \
2>/dev/null)' -- "$cur" ) ) 2>/dev/null)' -- "$cur" ) )
} && } &&
complete -F _pineaddr $default pine complete -F _pineaddr $default pine alpine
# Local variables: # Local variables:
# mode: shell-script # mode: shell-script