diff options
| author | suranc <suran.c@gmail.com> | 2017-01-29 01:19:33 -0500 |
|---|---|---|
| committer | suranc <suran.c@gmail.com> | 2017-01-29 01:19:33 -0500 |
| commit | 818efe6aa0bae7694e86cf7ec81b0dfb2bd0ed66 (patch) | |
| tree | f86cfeb9afc30920580b22e164f9dc32bb3c4cc1 | |
| parent | 7e266a075ea31e5eaa43107c2249c9b1363d2622 (diff) | |
Fixed distribution checking logic, and added check for arch linux. Previously Arch would not actually get detected.
| -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 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" |