[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.0-97-gcee32c6

[Ville Skyttä]

The following commit has been merged in the master branch:
commit cee32c6424113a2149daa2830ecb3fa942781420
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Jan 30 23:31:27 2013 +0200

    tshark: New completion.

diff --git a/completions/Makefile.am b/completions/Makefile.am
index 16fae60..b0c35c1 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -322,6 +322,7 @@ bashcomp_DATA = a2x \
 		tcpkill \
 		tcpnice \
 		tracepath \
+		tshark \
 		tune2fs \
 		udevadm \
 		umount \
diff --git a/completions/tshark b/completions/tshark
new file mode 100644
index 0000000..32f853f
--- /dev/null
+++ b/completions/tshark
@@ -0,0 +1,105 @@
+# tshark(1) completion                                     -*- shell-script -*-
+
+_tshark()
+{
+    local cur prev words cword
+    _init_completion -n : || return
+
+    case $prev in
+        -f|-s|-B|-D|-L|-c|-R|-N|-d|-C|-e|-E|-z|-h|-v|-o|-K)
+            return
+            ;;
+        -i)
+            _available_interfaces -a
+            return
+            ;;
+        -y)
+            local opts i
+            for (( i=${#words[@]}-1; i > 0; i-- )); do
+                if [[ ${words[i]} == -i ]]; then
+                    opts+="-i ${words[i+1]}"
+                    break
+                fi
+            done
+            COMPREPLY=( $( compgen -W "$( "$1" $opts -L 2>&1 | \
+                awk '/^  / { print $1 }' )" -- "$cur" ) )
+            return
+            ;;
+        -a|-b)
+            COMPREPLY=( $( compgen -W 'duration: filesize: files:' \
+                -- "$cur" ) )
+            [[ $COMPREPLY == *: ]] && compopt -o nospace
+            return
+            ;;
+        -r)
+            _filedir pcap
+            return
+            ;;
+        -H)
+            _filedir
+            return
+            ;;
+        -w)
+            _filedir
+            [[ $cur == @(|-) ]] && COMPREPLY+=( - )
+            return
+            ;;
+        -F)
+            COMPREPLY=( $( compgen -W "$( "$1" -F 2>&1 | \
+                awk '/^  / { print $1 }' )" -- "$cur" ) )
+            return
+            ;;
+        -O)
+            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=( $( compgen -P "$prefix" -W \
+                "$( "$1" -G protocols 2>&1 | cut -d$'\t' -f 3 )" \
+                -- "${cur##*,}" ) )
+            return
+            ;;
+        -T)
+            # TODO: could be parsed from "-T ." output
+            COMPREPLY=( $( compgen -W 'ps text pdml psml fields' -- "$cur" ) )
+            return
+            ;;
+        -t)
+            # TODO: could be parsed from "-t ." output
+            COMPREPLY=( $( compgen -W 'ad a r d dd e' -- "$cur" ) )
+            return
+            ;;
+        -u)
+            # TODO: could be parsed from "-u ." output
+            COMPREPLY=( $( compgen -W 's hms' -- "$cur" ) )
+            return
+            ;;
+        -W)
+            COMPREPLY=( $( compgen -W 'n' -- "$cur" ) )
+            return
+            ;;
+        -X)
+            if [[ $cur == lua_script:* ]]; then
+                cur=${cur#*:}
+                _filedir lua
+            else
+                COMPREPLY=( $( compgen -W 'lua_script:' -- "$cur" ) )
+                [[ $COMPREPLY == *: ]] && compopt -o nospace
+            fi
+            return
+            ;;
+        -G)
+            COMPREPLY=( $( compgen -W "$( "$1" -G ? | \
+                awk '/^[ \t]*-G / \
+                     { sub("^[[]","",$2); sub("[]]$","",$2); print $2 }' )" \
+                -- "$cur" ) )
+            return
+            ;;
+            
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" -h )' -- "$cur" ) )
+        return
+    fi
+} &&
+complete -F _tshark tshark
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/tshark.exp b/test/completion/tshark.exp
new file mode 100644
index 0000000..885fae3
--- /dev/null
+++ b/test/completion/tshark.exp
@@ -0,0 +1 @@
+assert_source_completions tshark
diff --git a/test/lib/completions/arping.exp b/test/lib/completions/tshark.exp
similarity index 67%
copy from test/lib/completions/arping.exp
copy to test/lib/completions/tshark.exp
index 531bb07..f241911 100644
--- a/test/lib/completions/arping.exp
+++ b/test/lib/completions/tshark.exp
@@ -11,10 +11,10 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "arping "
+assert_complete_any "tshark -"
 sync_after_int
 
-assert_complete_any "arping -"
+assert_complete_any "tshark -G "
 sync_after_int
 
 

-- 
bash-completion