From 22792315d6623beb6a7458b522913f43d11f9c6d Mon Sep 17 00:00:00 2001
From: jprochzka <joe@swiftbyte.com>
Date: Thu, 11 Oct 2018 13:44:36 -0400
Subject: [PATCH] Hoping for Ubuntu 18.04+ support for dump1090-fa.

---
 CHANGELOG.md                 |  8 ++++++++
 bash/decoders/dump1090-fa.sh | 10 ++++++----
 bash/main.sh                 |  8 ++++----
 bash/variables.sh            |  4 ++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa05cae..f8c199e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 The following is a history of the changes made to this project.
 
+## v2.7.0 *(pre-release)*
+
+* Added option to install dump1090-hptoa.
+* Added ADSBHub support.
+* Added OpenSky Network support
+* Graph data now restored properly by the backup script.
+* Script now checks for php7.2-sqlite3 instead on php7.2-sqlite on Ubuntu 18.04+.
+
 ## v2.6.3 *(June 23rd, 2018)*
 
 * Fix to navigation bar auto hiding code submitted by @vitaliy-sk.
diff --git a/bash/decoders/dump1090-fa.sh b/bash/decoders/dump1090-fa.sh
index c38c372..49638c0 100755
--- a/bash/decoders/dump1090-fa.sh
+++ b/bash/decoders/dump1090-fa.sh
@@ -88,7 +88,9 @@ CheckPackage debhelper
 CheckPackage cron
 CheckPackage rtl-sdr
 CheckPackage librtlsdr-dev
+CheckPackage libusb-1.0-0
 CheckPackage libusb-1.0-0-dev
+CheckPackage libtecla1
 CheckPackage pkg-config
 CheckPackage lighttpd
 CheckPackage fakeroot
@@ -103,7 +105,7 @@ CheckPackage pandoc
 ## BUILD AND INSTALL THE BLADERF PACKAGE FROM SOURCE IF NOT INSTALLED
 
 # Check if the needed bladeRF packages are installed.
-if [[ $(dpkg-query -W -f='${STATUS}' libbladerf1 2>/dev/null | grep -c "ok installed") -eq 0 ]] || [[ $(dpkg-query -W -f='${STATUS}' libbladerf-dev 2>/dev/null | grep -c "ok installed") -eq 0 ]] || [[ $(dpkg-query -W -f='${STATUS}' libbladerf-udev 2>/dev/null | grep -c "ok installed") -eq 0 ]]; then
+if [[ $(dpkg-query -W -f='${STATUS}' libbladerf2 2>/dev/null | grep -c "ok installed") -eq 0 ]] || [[ $(dpkg-query -W -f='${STATUS}' libbladerf-dev 2>/dev/null | grep -c "ok installed") -eq 0 ]] || [[ $(dpkg-query -W -f='${STATUS}' libbladerf-udev 2>/dev/null | grep -c "ok installed") -eq 0 ]]; then
     echo ""
     echo -e "\e[95m  Preparing the bladeRF Git repository...\e[97m"
     echo ""
@@ -142,10 +144,10 @@ if [[ $(dpkg-query -W -f='${STATUS}' libbladerf1 2>/dev/null | grep -c "ok insta
     echo -e "\e[94m  Entering the bladeRF build directory...\e[97m"
     cd ${RECEIVER_BUILD_DIRECTORY}/bladeRF 2>&1
 
-    if [[ $(dpkg-query -W -f='${STATUS}' libbladerf1 2>/dev/null | grep -c "ok installed") -eq 0 ]]; then
-        echo -e "\e[94m  Installing the libbladerf1 package...\e[97m"
+    if [[ $(dpkg-query -W -f='${STATUS}' libbladerf2 2>/dev/null | grep -c "ok installed") -eq 0 ]]; then
+        echo -e "\e[94m  Installing the libbladerf2 package...\e[97m"
         echo ""
-        sudo dpkg -i libbladerf1_*.deb
+        sudo dpkg -i libbladerf2_*.deb
         echo ""
     fi
 
diff --git a/bash/main.sh b/bash/main.sh
index 00ddb61..066582b 100755
--- a/bash/main.sh
+++ b/bash/main.sh
@@ -288,11 +288,11 @@ if [[ ! "${DUMP1090_IS_INSTALLED}" = "true" ]] ; then
     if [[ ! "${RECEIVER_AUTOMATED_INSTALL}" = "true" ]] ; then
 
         # Do not show dump 1090-fa option for Ubuntu 17.10 or higher until it is updated to support it.
-        if [ ! "$RECEIVER_OS_DISTRIBUTION" == "ubuntu" ] && (( $(bc -l <<<"$RECEIVER_OS_RELEASE < 17.10") )); then
+        #if [ ! "$RECEIVER_OS_DISTRIBUTION" == "ubuntu" ] && (( $(bc -l <<<"$RECEIVER_OS_RELEASE < 17.10") )); then
             DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "Dump1090 does not appear to be present on this device. In order to continue setup dump1090 will need to exist on this device. Please select your prefered dump1090 version from the list below.\n\nPlease note that in order to run dump1090-fa PiAware will need to be installed as well." 16 65 3 "dump1090-mutability" "(Mutability)" ON "dump1090-fa" "(FlightAware)" OFF "dump1090-hptoa" "(OpenSky Network)" OFF 3>&1 1>&2 2>&3)
-        else
-            DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "Dump1090 does not appear to be present on this device. In order to continue setup dump1090 will need to exist on this device. Please select your prefered dump1090 version from the list below.\n\nPlease note that in order to run dump1090-fa PiAware will need to be installed as well." 16 65 3 "dump1090-mutability" "(Mutability)" ON "dump1090-hptoa" "(OpenSky Network)" OFF 3>&1 1>&2 2>&3)
-        fi
+        #else
+        #    DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "Dump1090 does not appear to be present on this device. In order to continue setup dump1090 will need to exist on this device. Please select your prefered dump1090 version from the list below.\n\nPlease note that in order to run dump1090-fa PiAware will need to be installed as well." 16 65 3 "dump1090-mutability" "(Mutability)" ON "dump1090-hptoa" "(OpenSky Network)" OFF 3>&1 1>&2 2>&3)
+        #fi
 
         case ${DUMP1090_OPTION} in
             "dump1090-mutability")
diff --git a/bash/variables.sh b/bash/variables.sh
index 448255a..42f90a7 100644
--- a/bash/variables.sh
+++ b/bash/variables.sh
@@ -40,8 +40,8 @@ PROJECT_VERSION="2.6.3"
 RTLSDROGN_VERSION="0.2.5"
 
 # FlightAware PiAware
-DUMP1090_FA_VERSION="3.5.3"
-PIAWARE_VERSION="3.5.3"
+DUMP1090_FA_VERSION="3.6.3"
+PIAWARE_VERSION="3.6.3"
 
 # PlaneFinder Client
 PLANEFINDER_CLIENT_VERSION_ARM="4.1.1"