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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit cb01d8ea5434c2c9f4826b35f5f687d7723102e8
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Feb 6 15:15:20 2011 +0200

    Add javaws completion.

diff --git a/CHANGES b/CHANGES
index 642f124..d54844c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,9 +14,9 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
-    filefrag, gendiff, growisofs, iftop, ip (Debian: #600617), kid3, lrzip,
-    lsof, mktemp, portecle, POSIX sh, sha{,224,256,384,512}sum, sysbench,
-    tune2fs, xmodmap, and xrdb completions.
+    filefrag, gendiff, growisofs, iftop, ip (Debian: #600617), javaws, kid3,
+    lrzip, lsof, mktemp, portecle, POSIX sh, sha{,224,256,384,512}sum,
+    sysbench, tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/completions/java b/completions/java
index 999e6bf..460ae28 100644
--- a/completions/java
+++ b/completions/java
@@ -494,6 +494,36 @@ _jarsigner()
 } &&
 complete -F _jarsigner jarsigner
 
+have javaws &&
+_javaws()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -help|-license|-about|-viewer|-arg|-param|-property|-update|-umask)
+            return 0
+            ;;
+        -basedir|-codebase)
+            _filedir -d
+            return 0
+            ;;
+        -uninstall|-import)
+            _filedir jnlp
+            return 0
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W "$( _parse_help "$1" -help ) " -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir jnlp
+} &&
+complete -F _javaws javaws
+
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4
diff --git a/test/completion/javaws.exp b/test/completion/javaws.exp
new file mode 100644
index 0000000..c1c6b10
--- /dev/null
+++ b/test/completion/javaws.exp
@@ -0,0 +1 @@
+assert_source_completions javaws
diff --git a/test/lib/completions/a2ps.exp b/test/lib/completions/javaws.exp
similarity index 79%
copy from test/lib/completions/a2ps.exp
copy to test/lib/completions/javaws.exp
index 77cd07f..cb29c65 100644
--- a/test/lib/completions/a2ps.exp
+++ b/test/lib/completions/javaws.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "a2ps "
+assert_complete_any "javaws "
 
 
 sync_after_int

-- 
bash-completion