pactl: Stop parsing option when the first non-option is encountered

[pulseaudio] / shell-completion / pulseaudio-bash-completion.sh

diff --git a/shell-completion/pulseaudio-bash-completion.sh b/shell-completion/pulseaudio-bash-completion.sh
index 686178eeac94a00e183fb67bfc39cad1acddb437..43f4a2c39b8339f15c2f9217ce0e51832965c68a 100644 (file)
--- a/shell-completion/pulseaudio-bash-completion.sh
+++ b/shell-completion/pulseaudio-bash-completion.sh
@@ -174,6 +174,7 @@ _pactl() {
             _known_hosts_real "$cur"
             ;;
     esac
+    [[ $COMPREPLY ]] && return 0
 
     case $prev in
         list) COMPREPLY=($(compgen -W '${list_types[*]}' -- "$cur")) ;;
@@ -234,6 +235,7 @@ _pactl() {
         -s)
             _known_hosts_real "$cur" ;;
     esac
+    [[ $COMPREPLY ]] && return 0
 
     case $cur in
         --server=*)
@@ -257,7 +259,7 @@ _pacmd() {
     local cur prev words cword preprev command
     local comps
     local flags='-h --help --version'
-    local commands=(exit help list-modules list-sinks list-sources list-clients
+    local commands=(exit help list-modules list-cards list-sinks list-sources list-clients
                     list-samples list-sink-inputs list-source-outputs stat info
                     load-module unload-module describe-module set-sink-volume
                     set-source-volume set-sink-input-volume set-source-output-volume
@@ -316,6 +318,7 @@ _pacmd() {
     esac
 
     case $prev in
+        list-*) ;;
         describe-module|load-module)
             comps=$(__all_modules)
             COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
@@ -436,7 +439,7 @@ _pacat () {
                 --rate= --format= --channels= --channel-map= --fix-format --fix-rate
                 --fix-channels --no-remix --no-remap --latency= --process-time=
                 --latency-msec= --process-time-msec= --property= --raw --passthrough
-                --file-format= --list-file-formats'
+                --file-format= --list-file-formats --monitor-stream='
 
     _init_completion -n = || return
 
@@ -449,7 +452,13 @@ _pacat () {
         --device=*)
             cur=${cur#*=}
             comps=$(__sinks)
-            comps+=$(__sources)
+            comps+=" "$(__sources)
+            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
+            ;;
+
+        --monitor-stream=*)
+            cur=${cur#*=}
+            comps=$(__sink_inputs)
             COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
             ;;
 
@@ -478,7 +487,7 @@ _pacat () {
         -s) _known_hosts_real "$cur" ;;
         -d)
             comps=$(__sinks)
-            comps+=$(__sources)
+            comps+=" "$(__sources)
             COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
             ;;
     esac