A handful of fixes.

bash/decoders/dump1090-fa.sh

@@ -9,7 +9,7 @@ source $RECEIVER_BASH_DIRECTORY/functions.sh
 ## BEGIN SETUP
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the FlightAware Dump1090 decoder"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/extras/beastsplitter.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up beast-splitter"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/extras/duckdns.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up Duck DNS"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/feeders/adsbexchange.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the ADS-B Exchange client"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/feeders/airplaneslive.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the Airplanes.live client"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/feeders/flightradar24.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the FlightRadar24 client"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/feeders/flyitalyadsb.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the Fly Italy ADS-B client"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/feeders/openskynetwork.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the OpenSky Network client"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/feeders/piaware.sh

@@ -18,7 +18,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the FlightAware PiAware client"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/feeders/planefinder.sh

@@ -6,7 +6,7 @@ source $RECEIVER_BASH_DIRECTORY/variables.sh
 source $RECEIVER_BASH_DIRECTORY/functions.sh
 
 clear
-LogProjectName ${RECEIVER_PROJECT_TITLE}
+LogProjectTitle
 LogTitleHeading "Setting up the PlaneFinder client"
 LogTitleMessage "------------------------------------------------------------------------------"
 echo ""

bash/init.sh

@@ -27,7 +27,7 @@ if [[ $RECEIVER_DEVELOPMENT_MODE != "true" ]]; then
     current_branch=`git rev-parse --abbrev-ref HEAD`
 
     clear
-    LogProjectName ${RECEIVER_PROJECT_TITLE}
+    LogProjectTitle
     LogTitleHeading "Fetching the latest version of the ${RECEIVER_PROJECT_BRANCH} branch"
     LogTitleMessage "------------------------------------------------------------------------------"
     echo ""
@@ -52,7 +52,9 @@ if [[ $RECEIVER_DEVELOPMENT_MODE != "true" ]]; then
 
     if [[ "${current_branch}" != "${RECEIVER_PROJECT_BRANCH}" ]]; then
         LogMessage "Switching to branch ${RECEIVER_PROJECT_BRANCH}"
+        echo ""
         git checkout $RECEIVER_PROJECT_BRANCH
+        echo ""
     fi
 
     if [[ `git ls-remote --heads https://github.com/jprochazka/adsb-receiver.git refs/heads/$RECEIVER_PROJECT_BRANCH | wc -l` = 1 ]]; then
@@ -84,7 +86,7 @@ if whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" \
             --yesno "It is recommended that you update your system before building and/or installing any ADS-B receiver related packages. This script can do this for you at this time if you like.\n\nWould you like to update your operating system now?" \
             11 78; then
     clear
-    LogProjectName ${RECEIVER_PROJECT_TITLE}
+    LogProjectTitle
     LogTitleHeading "Downloading and installing the latest updates for your operating system"
     LogTitleMessage "------------------------------------------------------------------------------"
     echo ""
@@ -109,7 +111,9 @@ chmod +x $RECEIVER_BASH_DIRECTORY/main.sh
 LogMessage "Executing bash/main"
 bash $RECEIVER_BASH_DIRECTORY/main.sh
 if [[ $? -ne 0 ]] ; then
+    echo ""
     LogAlertHeading "ANY FURTHER SETUP AND/OR INSTALLATION REQUESTS HAVE BEEN TERMINIATED"
+    echo ""
     exit 1
 fi
 

bash/main.sh

@@ -139,7 +139,7 @@ if [[ $(dpkg-query -W -f='${STATUS}' dump1090-fa 2>/dev/null | grep -c "ok insta
     DUMP1090_IS_INSTALLED="true"
     # Check if a newer version can be installed.
     if [[ $(sudo dpkg -s dump1090-fa 2>/dev/null | grep -c "Version: ${DUMP1090_FA_VERSION}") -eq 0 ]] ; then
-        whiptail  --backtitle "RECEIVER_PROJECT_TITLE" --title "Dump1090-fa Upgrade Available" --defaultno --yesno "An updated version of dump1090-fa is available.\n\nWould you like to download, build, then install the new version?" 16 65
+        whiptail  --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Dump1090-fa Upgrade Available" --defaultno --yesno "An updated version of dump1090-fa is available.\n\nWould you like to download, build, then install the new version?" 16 65
         case $? in
             0)
                 DUMP1090_DO_UPGRADE="true"
@@ -153,7 +153,7 @@ fi
 
 # If no dump1090 fork is installed then attempt to install one.
 if [[ ! "${DUMP1090_IS_INSTALLED}" = "true" ]] ; 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." 16 65 2 "dump1090-fa" "(FlightAware)" ON 3>&1 1>&2 2>&3)
+    DUMP1090_OPTION=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --nocancel --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." 16 65 2 "dump1090-fa" "(FlightAware)" ON 3>&1 1>&2 2>&3)
     case ${DUMP1090_OPTION} in
         "dump1090-fa")
             DUMP1090_FORK="fa"
@@ -171,7 +171,7 @@ if [[ $(dpkg-query -W -f='${STATUS}' dump978-fa 2>/dev/null | grep -c "ok instal
     DUMP978_FORK="fa"
     DUMP978_IS_INSTALLED="true"
     if [[ $(sudo dpkg -s dump978-fa 2>/dev/null | grep -c "Version: ${DUMP978_FA_VERSION}") -eq 0 ]]; then
-        whiptail  --backtitle "RECEIVER_PROJECT_TITLE" --title "Dump978-fa Upgrade Available" --defaultno --yesno "An updated version of dump978-fa is available.\n\nWould you like to download, build, then install the new version?" 16 65
+        whiptail  --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Dump978-fa Upgrade Available" --defaultno --yesno "An updated version of dump978-fa is available.\n\nWould you like to download, build, then install the new version?" 16 65
         case $? in
             0)
                 DUMP978_DO_UPGRADE="true"