From 98d77e6c2c7644ccb539ea7233b3b7a58846dc02 Mon Sep 17 00:00:00 2001
From: Laptander <dev-laptander@yandex.ru>
Date: Sun, 26 Jun 2016 18:40:12 +0300
Subject: Avoid stopping adb server, as user may use for something else

---
 prepare-videochat.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'prepare-videochat.sh')

diff --git a/prepare-videochat.sh b/prepare-videochat.sh
index 7e93c11..7364417 100755
--- a/prepare-videochat.sh
+++ b/prepare-videochat.sh
@@ -212,10 +212,6 @@ start_adb() {
     can_run "$ADB" && "$ADB" $ADB_FLAGS start-server
 }
 
-stop_adb() {
-    can_run "$ADB" && "$ADB" $ADB_FLAGS kill-server
-}
-
 phone_plugged() {
     test "$("$ADB" $ADB_FLAGS get-state)" = "device"
 }
@@ -353,7 +349,7 @@ elif [ $CAPTURE_STREAM = v -o $CAPTURE_STREAM = av ]; then
 fi
 
 # check if the user has the pulse gst plugin installed
-if find "/usr/lib/gstreamer-$GST_VER/libgstpulse.so" "/usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgstpulse.so" 2>/dev/null | egrep -q '.*'; then
+if find "/usr/lib/gstreamer-$GST_VER/libgstpulse.so" "/usr/lib/$(uname -m)-linux-gnu/gstreamer-$GST_VER/libgstpulse.so" 2>/dev/null | egrep -q '.*'; then
     # plugin installed, do nothing
     # info "Found the pulse gst plugin"
     :
@@ -531,7 +527,6 @@ echo "Press enter to end stream"
 perl -e '<STDIN>'
 
 kill $GSTLAUNCH_PID > /dev/null 2>&1 || echo ""
-stop_adb
 pactl set-default-source ${DEFAULT_SOURCE}
 pactl unload-module ${ECANCEL_ID}
 pactl unload-module ${SINK_ID}
-- 
cgit v1.2.3