[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 38e9ef18b2150740871a569ff16c6aefd018d8a2

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 807ddd4105d56f8dc5f6ace876ff4ed0c8698359
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Apr 21 19:12:05 2010 +0300

    lzma groks *.tlz.

diff --git a/CHANGES b/CHANGES
index 2ffeaca..6705d1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,7 +26,7 @@ bash-completion (2.x)
   * Apply pine completion to alpine too.
   * Remove many unnecessary short option completions where long ones exist.
   * Improve chsh, chgrp, chown, configure, cvs, find, gkrellm, gzip, iconv,
-    lftp, look, make, man, mdadm, modprobe, mount, mplayer, mysqladmin,
+    lftp, look, lzma, make, man, mdadm, modprobe, mount, mplayer, mysqladmin,
     perldoc, rsync, screen, service, scp, ssh, sshfs, update-alternatives,
     vncviewer, wget, yp-tools, and general hostname completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
diff --git a/contrib/lzma b/contrib/lzma
index 8f14e48..e015ef8 100644
--- a/contrib/lzma
+++ b/contrib/lzma
@@ -19,7 +19,7 @@ _lzma()
 
     local IFS=$'\t\n'
 
-    xspec="*.lzma"
+    xspec="*.@(lzma|tlz)"
     if [[ "$prev" == --* ]]; then
         [[ "$prev" == --decompress || \
             "$prev" == --list || \
diff --git a/test/completion/lzma.exp b/test/completion/lzma.exp
new file mode 100644
index 0000000..8d3f637
--- /dev/null
+++ b/test/completion/lzma.exp
@@ -0,0 +1 @@
+assert_source_completions lzma
diff --git a/test/lib/completions/cpio.exp b/test/lib/completions/lzma.exp
similarity index 62%
copy from test/lib/completions/cpio.exp
copy to test/lib/completions/lzma.exp
index df8f94e..79d7885 100644
--- a/test/lib/completions/cpio.exp
+++ b/test/lib/completions/lzma.exp
@@ -11,13 +11,13 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "cpio --"
+assert_complete_any "lzma "
 
 
 sync_after_int
 
 
-assert_complete_any "cpio -R "
+assert_complete "a/ bashcomp.lzma bashcomp.tlz" "lzma -d fixtures/xz/"
 
 
 sync_after_int

-- 
bash-completion