diff options
| author | matt335672 <30179339+matt335672@users.noreply.github.com> | 2021-11-09 11:58:08 +0300 |
|---|---|---|
| committer | matt335672 <30179339+matt335672@users.noreply.github.com> | 2021-11-09 11:58:08 +0300 |
| commit | 2a326d7411cc4b4dd955b985151cd6d2c4fdaa7b (patch) | |
| tree | 943d286b8d5c5c3b45c7d8772f7d6ea195a9f7ea | |
| parent | d37b40dc073d6f9a884f2317fc48bc83a98ff921 (diff) | |
Changes following review and retest
- Find pactl in PATH
- Set default source/sink for xrdp sessions
- Exit status returned from instfiles/load_pa_modules.sh
| -rwxr-xr-x | instfiles/load_pa_modules.sh | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/instfiles/load_pa_modules.sh b/instfiles/load_pa_modules.sh index bfb2bc6..350f8e9 100755 --- a/instfiles/load_pa_modules.sh +++ b/instfiles/load_pa_modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -PACTL=/usr/bin/pactl +status=0 if [ -n "$XRDP_SESSION" -a -n "$XRDP_SOCKET_PATH" ]; then # These values are not present on xrdp versions before v0.9.8 @@ -16,17 +16,39 @@ if [ -n "$XRDP_SESSION" -a -n "$XRDP_SOCKET_PATH" ]; then # are loaded they won't be there # Unload modules - $PACTL unload-module module-xrdp-sink >/dev/null 2>&1 - $PACTL unload-module module-xrdp-source >/dev/null 2>&1 + pactl unload-module module-xrdp-sink >/dev/null 2>&1 + pactl unload-module module-xrdp-source >/dev/null 2>&1 # Reload modules - $PACTL load-module module-xrdp-sink \ - xrdp_socket_path=$XRDP_SOCKET_PATH \ - xrdp_pulse_sink_socket=$XRDP_PULSE_SINK_SOCKET && \ - \ - $PACTL load-module module-xrdp-source \ - xrdp_socket_path=$XRDP_SOCKET_PATH \ - xrdp_pulse_source_socket=$XRDP_PULSE_SOURCE_SOCKET + if pactl load-module module-xrdp-sink \ + xrdp_socket_path=$XRDP_SOCKET_PATH \ + xrdp_pulse_sink_socket=$XRDP_PULSE_SINK_SOCKET + then + echo "- pulseaudio xrdp-sink loaded" + if pacmd set-default-sink xrdp-sink; then + echo "- pulseaudio xrdp-sink set as default" + else + echo "? Can't set pulseaudio xrdp-sink as default" + fi + else + echo "? Can't load pulseaudio xrdp-sink" + status=1 + fi + + if pactl load-module module-xrdp-source \ + xrdp_socket_path=$XRDP_SOCKET_PATH \ + xrdp_pulse_source_socket=$XRDP_PULSE_SOURCE_SOCKET + then + echo "- pulseaudio xrdp-source loaded" + if pacmd set-default-source xrdp-source; then + echo "- pulseaudio xrdp-source set as default" + else + echo "? Can't set pulseaudio xrdp-source as default" + fi + else + echo "? Can't load pulseaudio xrdp-source" + status=1 + fi fi -exit $? +exit $status |