Additional logging testing and debugging.

.gitignore

@@ -2,6 +2,9 @@ EXTRAS_CHOICES
 FEEDER_CHOICES
 build/dump1090*
 build/dump978*
-build/piaware_builder/
+build/flightradar24
+build/flyitalyadsb
+build/piaware_builder
+build/planefinder
 build/package-archive
-logs/
+logs

bash/feeders/flyitalyadsb.sh

@@ -9,11 +9,11 @@ clear
 LogProjectTitle
 LogTitleHeading "Setting up the Fly Italy ADS-B client"
 LogTitleMessage "------------------------------------------------------------------------------"
-echo ""
 if ! whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" \
               --title "Fly Italy ADS-B feeder client Setup" \
               --yesno "The Fly Italy ADS-B feeder client takes data from a local dump1090 instance and shares this with Fly Italy ADS-B. for more information please see their website:\n\n  https://flyitalyadsb.com/come-condividere-la-propria-antenna/\n\nContinue setup by installing the Fly Italy ADS-B feeder client?" \
               13 78; then
+    echo ""
     LogAlertHeading "INSTALLATION HALTED"
     LogAlertMessage "Setup has been halted at the request of the user"
     echo ""
@@ -45,26 +45,22 @@ cd $RECEIVER_BUILD_DIRECTORY/flyitalyadsb
 
 LogMessage "Downloading the Fly Italy ADS-B installation script"
 echo ""
-wget -v -O $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install.sh wget https://raw.githubusercontent.com/flyitalyadsb/mlat-client/master/scripts/install.sh 2>&1 | tee -a $RECEIVER_LOG_FILE
-echo ""
+wget -v -O $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install.sh https://raw.githubusercontent.com/flyitalyadsb/fly-italy-adsb/master/install.sh 2>&1 | tee -a $RECEIVER_LOG_FILE
 LogMessage "Executing the Fly Italy ADS-B feeder installation script"
 echo ""
 sudo bash $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install.sh
-echo ""
 
 LogMessage "Asking if the user wishes to install the Fly Italy ADS-B updater"
 if whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" \
             --title "Install The Fly Italy ADS-B Updater" \
             --yesno "It is recommended that the Fly Italy ADS-B updater be installed as well.\n\nWould you like to install the updater at this time?" \
-            12 78;
+            12 78; then
     LogMessage "Downloading the Fly Italy ADS-B updater script"
     echo ""
-    wget -v -O $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install_updater.sh wget https://raw.githubusercontent.com/flyitalyadsb/mlat-client/master/scripts/install_updater.sh 2>&1 | tee -a $RECEIVER_LOG_FILE
-    echo ""
+    wget -v -O $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install_updater.sh https://raw.githubusercontent.com/flyitalyadsb/mlat-client/master/scripts/install_updater.sh 2>&1 | tee -a $RECEIVER_LOG_FILE
     LogMessage "Executing the Fly Italy ADS-B feeder updater script"
     echo ""
     sudo bash $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install_updater.sh
-    echo ""
 fi
 
 

bash/feeders/openskynetwork.sh

@@ -69,7 +69,9 @@ echo ""
 sudo apt-get update 2>&1 | tee -a $RECEIVER_LOG_FILE
 echo ""
 LogMessage "Installing the OpenSky Network fedder package using apt"
-CheckPackage opensky-feeder
+echo ""
+sudo apt-get install opensky-feeder
+echo ""
 
 
 ## SETUP COMPLETE

bash/feeders/piaware.sh

@@ -230,7 +230,6 @@ else
     LogMessage "Copying the FlightAware PiAware client binary package into the archive directory"
     echo ""
     cp -vf $RECEIVER_BUILD_DIRECTORY/piaware_builder/*.deb $RECEIVER_BUILD_DIRECTORY/package-archive/ 2>&1 | tee -a $RECEIVER_LOG_FILE
-    echo ""
 fi
 
 

bash/feeders/planefinder.sh

@@ -9,11 +9,11 @@ clear
 LogProjectTitle
 LogTitleHeading "Setting up the PlaneFinder client"
 LogTitleMessage "------------------------------------------------------------------------------"
-echo ""
 if ! whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" \
               --title "PlaneFinder ADS-B Client Setup" \
               --yesno "The PlaneFinder ADS-B Client is an easy and accurate way to share your ADS-B and MLAT data with Plane Finder. It comes with a beautiful user interface that helps you explore and interact with your data in realtime.\n\n  https://planefinder.net/sharing/client\n\nContinue setup by installing PlaneFinder ADS-B Client?" \
               13 78; then
+    echo ""
     LogAlertHeading "INSTALLATION HALTED"
     LogAlertMessage "Setup has been halted at the request of the user"
     echo ""
@@ -85,7 +85,8 @@ cd $RECEIVER_BUILD_DIRECTORY/planefinder
 
 LogMessage "Downloading the appropriate PlaneFinder client Debian package"
 echo ""
-wget -v -O --no-check-certificate http://client.planefinder.net/$PACKAGE_NAME $RECEIVER_BUILD_DIRECTORY/planefinder/$PACKAGE_NAME 2>&1 | tee -a $RECEIVER_LOG_FILE
+wget -v -O $RECEIVER_BUILD_DIRECTORY/planefinder/$package_name http://client.planefinder.net/$package_name 2>&1 | tee -a $RECEIVER_LOG_FILE
+echo ""
 
 LogMessage "Installing the PlaneFinder Client Debian package"
 echo -e ""