diff options
| author | Antonio García-Domínguez <nyoescape@gmail.com> | 2017-01-30 11:47:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 11:47:20 +0000 |
| commit | beaf93a4c212c74d39ac862fa000433312d5e6a2 (patch) | |
| tree | 4b245e39649acbb77fb63630575be1d7bfddf173 /prepare-videochat.sh | |
| parent | 7e266a075ea31e5eaa43107c2249c9b1363d2622 (diff) | |
| parent | b57b9459a8f96333e89ead3f653a311a0c5addbc (diff) | |
Merge pull request #43 from suranc/arch_fix
Fixed distribution checking logic, and added check for arch linux.
Diffstat (limited to 'prepare-videochat.sh')
| -rwxr-xr-x | prepare-videochat.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/prepare-videochat.sh b/prepare-videochat.sh index 33ecbfa..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() { @@ -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" |