update master

shell-completion/bash/meson.build

@@ -1,5 +1,6 @@
 if bashcompletiondir != 'no'
   aliases = []
+<<<<<<< HEAD
 
   if get_option('daemon')
     aliases += [
@@ -16,12 +17,38 @@ if bashcompletiondir != 'no'
     'parec',
     'parecord',
   ]
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
-  install_data('pulseaudio', install_dir : bashcompletiondir)
+  if get_option('daemon')
+    aliases += [
+      'pulseaudio',
+      'pacmd',
+      'pasuspender',
+    ]
+
+    # Create target directory for symlinks
+    if meson.version().version_compare('>= 0.60.0')
+      install_emptydir(bashcompletiondir)
+    else
+      meson.add_install_script('sh', '-c', 'mkdir -p $DESTDIR@0@'.format(bashcompletiondir))
+    endif
+  endif
+
+  if get_option('client')
+    aliases += [
+      'pacat',
+      'padsp',
+      'paplay',
+      'parec',
+      'parecord',
+    ]
+    install_data('pactl', install_dir : bashcompletiondir)
+  endif
 
   foreach alias : aliases
     dst = join_paths(bashcompletiondir, alias)
-    cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pulseaudio', dst)
+    cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pactl', dst)
     meson.add_install_script('sh', '-c', cmd)
   endforeach
 endif

shell-completion/bash/pactl

@@ -109,19 +109,26 @@ in_array() {
 }
 
 _pactl() {
-    local cur prev words cword preprev command
+    local cur prev words cword preprev word command
     local comps
     local flags='-h --help --version -s --server= --client-name='
     local list_types='short sinks sources sink-inputs source-outputs cards
                     modules samples clients message-handlers'
     local commands=(stat info list exit upload-sample play-sample remove-sample
                     load-module unload-module move-sink-input move-source-output
-                    suspend-sink suspend-source set-card-profile set-default-sink
-                    set-sink-port set-default-source set-source-port set-sink-volume
+                    suspend-sink suspend-source set-card-profile get-default-sink
+                    set-default-sink set-sink-port get-default-source set-default-source
+                    set-source-port get-sink-volume set-sink-volume get-source-volume
                     set-source-volume set-sink-input-volume set-source-output-volume
+<<<<<<< HEAD:shell-completion/bash/pulseaudio
                     set-sink-mute set-source-mute set-sink-input-mute
                     set-source-output-mute set-sink-formats set-port-latency-offset
                     subscribe send-message help)
+=======
+                    get-sink-mute set-sink-mute get-source-mute set-source-mute
+                    set-sink-input-mute set-source-output-mute set-sink-formats
+                    set-port-latency-offset subscribe send-message help)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336:shell-completion/bash/pactl
 
     _init_completion -n = || return
     preprev=${words[$cword-2]}
@@ -186,6 +193,8 @@ _pactl() {
 
         remove-sample) ;; # TODO
 
+        get-default*) ;;
+
         load-module)
             comps=$(__all_modules)
             COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
@@ -255,7 +264,7 @@ _pactl() {
 complete -F _pactl pactl
 
 _pacmd() {
-    local cur prev words cword preprev command
+    local cur prev words cword preprev word command
     local comps
     local flags='-h --help --version'
     local commands=(exit help list-modules list-cards list-sinks list-sources list-clients
@@ -500,7 +509,7 @@ _pulseaudio()
                 --start -k --kill --check --system= -D --daemonize= --fail= --high-priority=
                 --realtime= --disallow-module-loading= --disallow-exit= --exit-idle-time=
                 --scache-idle-time= --log-level= -v --log-target= --log-meta= --log-time=
-                --log-backtrace= -p --dl-search-path= --resample-method= --use-pit-file=
+                --log-backtrace= -p --dl-search-path= --resample-method= --use-pid-file=
                 --no-cpu-limit= --disable-shm= --enable-memfd= -L --load= -F --file= -C -n'
     _init_completion -n = || return