[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 0ceca807c50f9cec823999e497f6842c3f16e6e5

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 0ceca807c50f9cec823999e497f6842c3f16e6e5
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Dec 16 19:59:41 2010 +0200

    Add *.apk to unzip and jar filename completions.

diff --git a/CHANGES b/CHANGES
index 4a27d45..51489da 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ bash-completion (2.x)
   * Remove most "-o filenames" options to "complete", turn "-o filenames" on
     dynamically when needed instead.
   * Add/improve various autotools completions.
+  * Add *.apk to unzip and jar filename completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index e724f02..e4787f2 100644
--- a/bash_completion
+++ b/bash_completion
@@ -70,7 +70,7 @@ complete -d pushd
 # START exclude -- do NOT remove this line
 # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
 complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat
-complete -f -X '!*.@(zip|[ejw]ar|exe|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub)' unzip zipinfo
+complete -f -X '!*.@(zip|[ejw]ar|exe|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub|apk)' unzip zipinfo
 complete -f -X '*.Z' compress znew
 # zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
 complete -f -X '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat unpigz
diff --git a/completions/jar b/completions/jar
index f60eb3e..d703019 100644
--- a/completions/jar
+++ b/completions/jar
@@ -18,7 +18,7 @@ _jar()
             _filedir
             ;;
         *f)
-            _filedir '@([ejw]ar|zip)'
+            _filedir '@([ejw]ar|zip|apk)'
             ;;
         *)
             _filedir

-- 
bash-completion