From 87d6bb64f8da862abf22e1e2f4c2d466ae2d442e Mon Sep 17 00:00:00 2001
From: jprochazka <joe@swiftbyte.com>
Date: Mon, 22 Jul 2024 19:06:11 -0400
Subject: [PATCH] Fixes to PiAware installer.

---
 .gitignore              | 1 +
 bash/feeders/piaware.sh | 5 ++---
 bash/main.sh            | 8 ++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f782000..a9ff86d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@ EXTRAS_CHOICES
 FEEDER_CHOICES
 build/dump1090*
 build/dump978*
+build/piaware_builder/
 build/package-archive
 logs/
diff --git a/bash/feeders/piaware.sh b/bash/feeders/piaware.sh
index 8455cd7..2dcec3f 100755
--- a/bash/feeders/piaware.sh
+++ b/bash/feeders/piaware.sh
@@ -21,11 +21,11 @@ clear
 LogProjectTitle
 LogTitleHeading "Setting up the FlightAware PiAware client"
 LogTitleMessage "------------------------------------------------------------------------------"
-echo ""
 if ! whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" \
               --title "FlightAware PiAware client Setup" \
               --yesno "The FlightAware PiAware client takes data from a local dump1090 instance and shares this with FlightAware using the piaware package, for more information please see their website:\n\n  https://www.flightaware.com/adsb/piaware/\n\nContinue setup by installing the FlightAware PiAware client?" \
               13 78; then
+echo ""
     LogAlertHeading "INSTALLATION HALTED"
     LogAlertMessage "Setup has been halted at the request of the user"
     echo ""
@@ -167,9 +167,8 @@ else
     cd $RECEIVER_BUILD_DIRECTORY
     LogMessage "Cloning the piaware_builder git repository locally"
     echo ""
-    git clone https://github.com/flightaware/dump978.git 2>&1 | tee -a $RECEIVER_LOG_FILE
+    git clone https://github.com/flightaware/piaware_builder.git 2>&1 | tee -a $RECEIVER_LOG_FILE
 fi
-echo ""
 
 
 ## BUILD AND INSTALL THE PIAWARE CLIENT PACKAGE
diff --git a/bash/main.sh b/bash/main.sh
index 6a3a4e8..5e2b17d 100755
--- a/bash/main.sh
+++ b/bash/main.sh
@@ -245,12 +245,8 @@ fi
 
 # Check for the PiAware package.
 if [[ $(dpkg-query -W -f='${STATUS}' piaware 2>/dev/null | grep -c "ok installed") -eq 0 ]]; then
-    # Do not show the PiAware install option if the FlightAware fork of dump1090 has been chosen.
-    if [[ "${DUMP1090_FORK}" != "fa" ]] ; then
-        if [[ -z "${PIAWARE_INSTALL}" && "${PIAWARE_INSTALL}" = "true" ]]; then
-            echo "FlightAware PiAware" >> ${RECEIVER_ROOT_DIRECTORY}/FEEDER_CHOICES
-        fi
-    fi
+    # The OpenSky Network feeder package appears to not be installed.
+    FEEDER_LIST=("${FEEDER_LIST[@]}" 'FlightAware PiAware' '' OFF)
 else
     # Check if a newer version can be installed.
     if [[ $(sudo dpkg -s piaware 2>/dev/null | grep -c "Version: ${PIAWARE_VERSION}") -eq 0 ]]; then