From 818efe6aa0bae7694e86cf7ec81b0dfb2bd0ed66 Mon Sep 17 00:00:00 2001
From: suranc <suran.c@gmail.com>
Date: Sun, 29 Jan 2017 01:19:33 -0500
Subject: Fixed distribution checking logic, and added check for arch linux. 
 Previously Arch would not actually get detected.

---
 prepare-videochat.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/prepare-videochat.sh b/prepare-videochat.sh
index 33ecbfa..9bbc10d 100755
--- a/prepare-videochat.sh
+++ b/prepare-videochat.sh
@@ -295,6 +295,9 @@ module_id_by_sourcename() {
 if can_run lsb_release; then
     DIST=`lsb_release -i | cut -f2 -d ":"`
     RELEASE=`lsb_release -r | cut -f2 -d ":"`
+elif [ -f "/etc/arch-release" ]; then
+    DIST="Arch"
+    RELASE=""
 elif [ -f /etc/debian_version ] ; then
     DIST="Debian"
     RELEASE=`perl -ne 'chomp; if(m:(jessie|testing|sid):){print "8.0"}elsif(m:[\d\.]+:){print}else{print "0.0"}' < /etc/debian_version`
@@ -315,9 +318,9 @@ GST_1_0_AUDIO_FORMAT="format=S16LE"
 GST_0_10_VIDEO_MIMETYPE=$GST_VIDEO_MIMETYPE
 GST_0_10_VIDEO_FORMAT=$GST_VIDEO_FORMAT
 
-if [ $DIST = "Debian" -a `echo "$RELEASE >= 8.0"   | bc` -eq 1 ] ||\
-   [ $DIST = "Ubuntu" -a `echo "$RELEASE >= 14.04" | bc` -eq 1 ] ||\
-   [ $DIST = "LinuxMint" -a `echo "$RELEASE >= 14.04" | bc` -eq 1 ] ||\
+if [ $DIST = "Debian" ] && [ `echo "$RELEASE >= 8.0"   | bc` -eq 1 ] ||\
+   [ $DIST = "Ubuntu" ] && [ `echo "$RELEASE >= 14.04" | bc` -eq 1 ] ||\
+   [ $DIST = "LinuxMint" ] && [ `echo "$RELEASE >= 14.04" | bc` -eq 1 ] ||\
    [ $DIST = "Arch" ]
 then
     GST_VER="1.0"
-- 
cgit v1.2.3


From b57b9459a8f96333e89ead3f653a311a0c5addbc Mon Sep 17 00:00:00 2001
From: suranc <suran.c@gmail.com>
Date: Sun, 29 Jan 2017 02:14:25 -0500
Subject: Supressed error from adb when checking for device.

---
 prepare-videochat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prepare-videochat.sh b/prepare-videochat.sh
index 9bbc10d..f07708c 100755
--- a/prepare-videochat.sh
+++ b/prepare-videochat.sh
@@ -236,7 +236,7 @@ start_adb() {
 }
 
 phone_plugged() {
-    test "$("$ADB" $ADB_FLAGS get-state)" = "device"
+    test "$("$ADB" $ADB_FLAGS get-state 2>/dev/null)" = "device"
 }
 
 url_reachable() {
-- 
cgit v1.2.3