bash-completion: update irqtop and lsirq completions

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index 0a813f8d5dc13c4a72134e24e0eb7107240cfdff..b80c23f7be14deae4fa666c489e697ffcf00ec52 100644 (file)
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -60,6 +60,9 @@ endif
 if BUILD_LSIPC
 dist_bashcompletion_DATA += bash-completion/lsipc
 endif
+if BUILD_LSIRQ
+dist_bashcompletion_DATA += bash-completion/lsirq
+endif
 if BUILD_LSNS
 dist_bashcompletion_DATA += bash-completion/lsns
 endif

diff --git a/bash-completion/irqtop b/bash-completion/irqtop
index b6a71454d18cbf234a8fc530ff7eadb0abf6fb7e..61373255940f5f8ba4fe6b2c5fd8f1203b39298b 100644 (file)
--- a/bash-completion/irqtop
+++ b/bash-completion/irqtop
@@ -10,10 +10,10 @@ _irqtop_module()
                        return 0
                        ;;
                '-s'|'--sort')
-                       COMPREPLY=( $(compgen -W "i t d n" -- $cur) )
+                       COMPREPLY=( $(compgen -W "irq total delta name" -- $cur) )
                        return 0
                        ;;
-               '--columns')
+               '-o'|'--output')
                        local prefix realcur OUTPUT
                        realcur="${cur##*,}"
                        prefix="${cur%$realcur}"
@@ -31,10 +31,8 @@ _irqtop_module()
                        ;;
        esac
        OPTS="  --delay
-               --once
-               --json
                --sort
-               --columns
+               --output
                --help
                --version"
        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )

diff --git a/bash-completion/lsirq b/bash-completion/lsirq
new file mode 100644 (file)
index 0000000..b644559
--- /dev/null
+++ b/bash-completion/lsirq
@@ -0,0 +1,38 @@
+_lsirq_module()
+{
+       local cur prev OPTS
+       COMPREPLY=()
+       cur="${COMP_WORDS[COMP_CWORD]}"
+       prev="${COMP_WORDS[COMP_CWORD-1]}"
+       case $prev in
+               '-o'|'--output')
+                       local prefix realcur OUTPUT
+                       realcur="${cur##*,}"
+                       prefix="${cur%$realcur}"
+                       for WORD in "IRQ TOTAL NAME"; do
+                               if ! [[ $prefix == *"$WORD"* ]]; then
+                                       OUTPUT="$WORD ${OUTPUT:-""}"
+                               fi
+                       done
+                       compopt -o nospace
+                       COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- $realcur) )
+                       return 0
+                       ;;
+               '-s'|'--sort')
+                       COMPREPLY=( $(compgen -W "irq total name" -- $cur) )
+                       return 0
+                       ;;
+               '-h'|'--help'|'-V'|'--version')
+                       return 0
+                       ;;
+       esac
+       OPTS="  --json
+               --pairs
+               --output
+               --sort
+               --help
+               --version"
+       COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+       return 0
+}
+complete -F _lsirq_module lsirq