(Re)fix gzip and bzip2 options completion (Debian bug 351913 resurfaced in r934).

This commit is contained in:
Ville Skyttä 2009-01-12 21:16:51 +02:00
parent 984d8ed071
commit eb95aa30cd
2 changed files with 7 additions and 2 deletions

View File

@ -3350,7 +3350,7 @@ complete -F _mysqladmin mysqladmin
have gzip && have gzip &&
_gzip() _gzip()
{ {
local cur prev xspec IFS=$'\t\n' local cur prev xspec
COMPREPLY=() COMPREPLY=()
cur=`_get_cword` cur=`_get_cword`
@ -3367,6 +3367,8 @@ _gzip()
return 0 return 0
fi fi
local IFS=$'\t\n'
xspec="*.?(t)gz" xspec="*.?(t)gz"
if [[ "$prev" == --* ]]; then if [[ "$prev" == --* ]]; then
[[ "$prev" == --decompress || \ [[ "$prev" == --decompress || \
@ -3394,7 +3396,7 @@ complete -F _gzip $filenames gzip
have bzip2 && have bzip2 &&
_bzip2() _bzip2()
{ {
local cur prev xspec IFS=$'\t\n' local cur prev xspec
COMPREPLY=() COMPREPLY=()
cur=`_get_cword` cur=`_get_cword`
@ -3409,6 +3411,8 @@ _bzip2()
return 0 return 0
fi fi
local IFS=$'\t\n'
xspec="*.bz2" xspec="*.bz2"
if [[ "$prev" == --* ]]; then if [[ "$prev" == --* ]]; then
[[ "$prev" == --decompress || \ [[ "$prev" == --decompress || \

1
debian/changelog vendored
View File

@ -64,6 +64,7 @@ bash-completion (200811xx) UNRELEASED; urgency=low
* Improved filename based man page completion (Ville Skyttä). * Improved filename based man page completion (Ville Skyttä).
* Added minimal sqlite3 completion (Ville Skyttä). * Added minimal sqlite3 completion (Ville Skyttä).
* Improved getent completion (Ville Skyttä, Guillaume Rousse). * Improved getent completion (Ville Skyttä, Guillaume Rousse).
* (Re)fix gzip and bzip2 options completion (Ville Skyttä).
* Merge from Gentoo: * Merge from Gentoo:
- fix 'find' completion so that it properly completes on -?(i)whilename. - fix 'find' completion so that it properly completes on -?(i)whilename.
Patch by Ciaran McCreesh. Patch by Ciaran McCreesh.