Remove dump1090-fa option on Ubuntu 17.10 or higher.

CHANGELOG.md

@@ -4,9 +4,14 @@ The following is a history of the changes made to this project.
 
 ## v2.7.0 *(prerelease)*
 
+* Option to install dump1090-fa removed on Ubuntu 17.10 or higher due to cx_freez issue.
+* Fixed so Ubunbtu 17.10 and higher properly installs PHP 7.1 and its related packages.
+* ADS-B Exchange run script now uses socat instead of netcat to send data.
 * Removed Mapzen support from the scripts due to the service shutting down.
 * Now uses socat instead of netcat to feed ADS-B Exchange.
 * Added option to auto hide portal navigation and footer elements. (thanks to @Mictronics)
+* User can opt to skip the installation of the Postfix MTA using the --mta= flag.
+* Operating system and release detection moved to centralized position.
 
 ## v2.6.1 *(February 28th, 2018)*
 

bash/main.sh

@@ -36,6 +36,8 @@
 RECEIVER_ROOT_DIRECTORY="${PWD}"
 RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
 RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
+RECEIVER_OS_DISTRIBUTION=`. /etc/os-release; echo ${ID/*, /}`
+RECEIVER_OS_RELEASE=`. /etc/os-release; echo ${VERSION_ID/*, /}`
 
 ## INCLUDE EXTERNAL SCRIPTS
 
@@ -232,7 +234,7 @@ fi
 if [[ ! "${DUMP1090_IS_INSTALLED}" = "true" ]] ; then
     # If this is not an automated installation ask the user which one to install.
     if [[ ! "${RECEIVER_AUTOMATED_INSTALL}" = "true" ]] ; then
-        DUMP1090_OPTION=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "The dump1090-mutability or dump1090-fa package does not appear to be installed on this device. In order to continue setup one of the following packages need to be installed. 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 2 "dump1090-mutability" "(Mutability)" ON "dump1090-fa" "(FlightAware)" OFF 3>&1 1>&2 2>&3)
+        DUMP1090_OPTION=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "The dump1090-mutability or dump1090-fa package does not appear to be installed on this device. In order to continue setup one of the following packages need to be installed. 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 2 "dump1090-mutability" "(Mutability)" ON`if [ ! "$RECEIVER_OS_DISTRIBUTION" == "ubuntu" ] $$ [ ! $RECEIVER_OS_RELEASE >= 17.10 ]; then echo "\" dump1090-fa\" \"(FlightAware)\" OFF"` 3>&1 1>&2 2>&3)
         case ${DUMP1090_OPTION} in
             "dump1090-mutability")
                 DUMP1090_FORK="mutability"

bash/portal/install.sh

@@ -242,18 +242,14 @@ fi
 
 ## CHECK FOR PREREQUISITE PACKAGES
 
-# Detect the OS distribution and version.
-DISTRO_ID=`. /etc/os-release; echo ${ID/*, /}`
-DISTRO_RELEASE=`. /etc/os-release; echo ${VERSION_ID/*, /}`
 DISTRO_PHP_VERSION="5"
-
-case $DISTRO_ID in
+case $RECEIVER_OS_DISTRIBUTION in
     debian|raspbian)
-        if [[ $DISTRO_RELEASE -ge "9" ]]; then DISTRO_PHP_VERSION="7.0"; fi
+        if [[ $RECEIVER_OS_RELEASE -ge "9" ]]; then DISTRO_PHP_VERSION="7.0"; fi
         ;;
     ubuntu)
-        if [ `bc -l <<< "$DISTRO_RELEASE >= 16.04"` -eq 1 ]; then DISTRO_PHP_VERSION="7.0"; fi
-        if [ `bc -l <<< "$DISTRO_RELEASE >= 17.10"` -eq 1 ]; then DISTRO_PHP_VERSION="7.1"; fi
+        if [ `bc -l <<< "$RECEIVER_OS_RELEASE >= 16.04"` -eq 1 ]; then DISTRO_PHP_VERSION="7.0"; fi
+        if [ `bc -l <<< "$RECEIVER_OS_RELEASE >= 17.10"` -eq 1 ]; then DISTRO_PHP_VERSION="7.1"; fi
         ;;
 esac
 
@@ -269,6 +265,9 @@ CheckPackage rrdtool
 if [ $RECEIVER_MTA == "POSTFIX" ] || [ -z "$RECEIVER_MTA" ]; then
     CheckPackage postfix
 fi
+
+exit 0
+
 CheckPackage libpython2.7
 
 # Install packages needed for advanced portal setups.

install.sh

@@ -198,6 +198,8 @@ unset RECEIVER_CONFIGURATION_FILE
 unset RECEIVER_VERBOSE
 unset RECEIVER_PROJECT_TITLE
 unset RECEIVER_MTA
+unset RECEIVER_OS_DISTRIBUTION
+unset RECEIVER_OS_RELEASE
 
 # Check if any errors were encountered by any child scripts.
 # If no errors were encountered then exit this script cleanly.