Minor fixes before release.

CHANGELOG.md

@@ -4,6 +4,10 @@ The following is a history of the changes made to this project.
 
 ## v2.6.0 (*prerelease*)
 
+* Added "Extras" option to install process.
+* Added the ability to install beast-splitter as an extra.
+* Added the ability to setup Duck DNS dynamic DNS service as an extra.
+* Added the ability to setup the AboveTustin Twitter bot.
 * Ubuntu 16.04 and above now detected properly when deciding which version of PHP to use.
 * Raspbian 9 and above now detected properly when deciding which version of PHP to use.
 * Debian 9 and above now detected properly when deciding which version of PHP to use.
@@ -17,9 +21,6 @@ The following is a history of the changes made to this project.
 * Added check for the dvb_usb_rtl28xxu kernel module before trying to remove it.
 * Checks for the package dirmngr before executing the Flightradar24 setup script.
 * Fixed text displaying date time formats which were swapped in the portal settings.
-* Added the ability to install beast-splitter as an extra.
-* Added the ability to setup Duck DNS dynamic DNS service as an extra.
-* Added the ability to setup the AboveTustin Twitter bot.
 * Help pertaining to the new switches is available using the -h or --help switch.
 * An installation log file can be kept by using either the -l or --log-output switch.
 * The branch you wish to use can be specified using the -b or --branch switch.

bash/extras/abovetustin.sh

@@ -184,6 +184,10 @@ if [[ `lsb_release -si` = "Debian" ]] ; then
     echo ""
 fi
 
+# Detect the OS distribution and version.
+DISTRO_ID=`. /etc/os-release; echo ${ID/*, /}`
+DISTRO_RELEASE=`. /etc/os-release; echo ${VERSION_ID/*, /}`
+
 # Check that the required packages are installed.
 CheckPackage ttf-mscorefonts-installer
 CheckPackage python3-pip
@@ -203,10 +207,31 @@ CheckPackage libjpeg-dev
 CheckPackage python
 CheckPackage libx11-dev
 CheckPackage libxext-dev
-CheckPackage libpng-dev
 CheckPackage libc6
 CheckPackage curl
 
+# Depending on the version of Debian, Raspbian, or Ubuntu the correct libpng-dev package needs to be installed.
+# This is currently kind of sloppy and rushed and should definatly be refactored later.
+case $DISTRO_ID in
+    debian|raspbian)
+        if [[ $DISTRO_RELEASE -ge "9" ]]; then
+            CheckPackage libpng-dev
+        else
+            CheckPackage libpng12-dev
+        fi
+        ;;
+    ubuntu)
+        if [[ $DISTRO_RELEASE -ge "16.04" ]]; then
+            CheckPackage libpng-dev
+        else
+            CheckPackage libpng12-dev
+        fi
+        ;;
+    *)
+        CheckPackage libpng12-dev
+        ;;
+esac
+
 if [[ "${PHANTOMJS_BINARY_AVAILABLE}" = "false" ]] ; then
     # These packages are only needed if the user decided to build PhantomJS.
     CheckPackage build-essential
@@ -344,6 +369,7 @@ fi
 # Create a component directory within the build directory if it does not already exist.
 if [[ ! -d "${RECEIVER_BUILD_DIRECTORY}/abovetustin" ]] ; then
     echo -e "\e[94m  Creating the directory ${RECEIVER_BUILD_DIRECTORY}/abovetustin...\e[97m"
+    echo ""
     mkdir -vp ${RECEIVER_BUILD_DIRECTORY}/abovetustin 2>&1
 fi
 
@@ -409,6 +435,7 @@ if [[ "${PHANTOMJS_EXISTS}" = "false" ]] ; then
             echo -e "\e[94m  Copying the PhantomJS binary into the directory /usr/bin...\e[97m"
             echo -e ""
             sudo cp -v phantomjs-${PHANTOMJS_VERSION}-linux-${CPU_ARCHITECTURE}/bin/phantomjs /usr/bin 2>&1
+            echo ""
         else
             echo -e "\e[94m  Unable to copying the PhantomJS binary into the directory /usr/bin...\e[97m"
         fi

bash/extras/beastsplitter.sh

@@ -179,7 +179,9 @@ echo -e ""
 echo -e "\e[94m  Entering the beast-splitter build directory...\e[97m"
 cd ${RECEIVER_BUILD_DIRECTORY}/beast-splitter 2>&1
 echo -e "\e[94m  Installing the beast-splitter package...\e[97m"
+echo ""
 sudo dpkg -i beast-splitter_*.deb 2>&1
+echo ""
 
 if [[ ! -d "${RECEIVER_BUILD_DIRECTORY}/package-archive" ]] ; then
     # Create binary package archive directory.
@@ -208,7 +210,9 @@ while true
 EOF
 
 echo -e "\e[94m  Setting file permissions for beast-splitter_maint.sh...\e[97m"
+echo ""
 sudo chmod -v +x ${RECEIVER_BUILD_DIRECTORY}/beast-splitter/beast-splitter_maint.sh 2>&1
+echo ""
 
 echo -e "\e[94m  Checking if the beast-splitter startup line is contained within the file /etc/rc.local...\e[97m"
 if [[ `grep -cFx "${RECEIVER_BUILD_DIRECTORY}/beast-splitter/beast-splitter_maint.sh &" /etc/rc.local` -eq 0 ]] ; then