diff options
author | Antonio García-Domínguez <nyoescape@gmail.com> | 2016-02-05 14:34:50 +0000 |
---|---|---|
committer | Antonio García-Domínguez <nyoescape@gmail.com> | 2016-02-05 14:34:50 +0000 |
commit | d2d81c65ce2ea45ec52e48814e92c5a922934339 (patch) | |
tree | ff48d20742d2b300236427824039c8553b5e7f6b | |
parent | 0046a8c0cd21ce9a8b35921a485f0489c3b0c4a4 (diff) |
Fixed two issues found during static analysis (#23, #25)
-rwxr-xr-x | prepare-videochat.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/prepare-videochat.sh b/prepare-videochat.sh index 4e8bc20..0671882 100755 --- a/prepare-videochat.sh +++ b/prepare-videochat.sh @@ -265,11 +265,14 @@ if ! has_kernel_module v4l2loopback; then fi # check if the user has the pulse gst plugin installed -if [ ! -f /usr/lib/*/gstreamer-$GST_VER/libgstpulse.so ]; then +if find /usr/lib -path "*/gstreamer-$GST_VER/libgstpulse.so" | egrep -q '.*'; then + # plugin installed, do nothing + info "Found the pulse gst plugin" +else if [ $DIST = "Debian" ] || [ $DIST = "Ubuntu" ]; then sudo apt-get install -y gstreamer${GST_VER}-pulseaudio elif can_run yaourt; then - echo "we should figure out what package supplies this" + error "we should figure out what package supplies this" fi fi @@ -386,7 +389,7 @@ set +e souphttpsrc location="$AUDIO_URL" do-timestamp=true is-live=true \ ! $GST_AUDIO_CAPS \ ! pulsesink device="$SINK_NAME" sync=true \ - 2>&1 > feed.log & + >feed.log 2>&1 & GSTLAUNCH_PID=$! |