From 4a18bc69c983e128fd72230bef6f1c797bba9848 Mon Sep 17 00:00:00 2001
From: Joe Prochazka <joe@swiftbyte.com>
Date: Mon, 7 Mar 2016 12:07:21 -0500
Subject: [PATCH] Added option to add Flightradar24 feed.

---
 CHANGELOG.md                  | 2 ++
 bash/feeders/flightradar24.sh | 4 ++--
 install.sh                    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 bash/feeders/flightradar24.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 656ce54..49ebd08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ The following is a history of the changes made to this project.
 
 ## upgrade Branch
 
+* Added the option to install the Flightradar24 client.
 * Added administrator name and email address settings.
 * Administrators are no longer required to change their password after their first login.
 * Added the ability to display links to aggregate site statistics pages.
@@ -11,6 +12,7 @@ The following is a history of the changes made to this project.
 * The author's name is now displayed when blog posts are rendered instead of their login.
 * The settings page has been categorized and split into tabs.
 * The portal no longer uses public CDN's to server jQuery and Bootstrap files.
+* Scripts now exit properly when package fails to install.
 
 ## March 4th, 2016
 
diff --git a/bash/feeders/flightradar24.sh b/bash/feeders/flightradar24.sh
old mode 100644
new mode 100755
index 18a5274..fd09afa
--- a/bash/feeders/flightradar24.sh
+++ b/bash/feeders/flightradar24.sh
@@ -50,7 +50,7 @@ echo -e "\033[33mThe Flightradar24's Pi24 client can track flights within"
 echo "200-400 miles and will automatically share data with Flightradar24. You"
 echo "can track flights directly off your Pi24 device or via Flightradar24.com"
 echo ""
-echo "http://www.flightradar24.com/raspberry-pi"
+echo "http://www.flightradar24.com/share-your-data"
 echo -e "\033[37m"
 read -p "Press enter to continue..." CONTINUE
 
@@ -72,7 +72,7 @@ if [[ `uname -m` == "x86_64" ]]; then
     CheckPackage libudev1:i386
     CheckPackage zlib1g:i386
     CheckPackage libusb-1.0-0:i386
-    CheckPackage libstdc++6:i386:i386
+    CheckPackage libstdc++6:i386
 else
     CheckPackage libc6
     CheckPackage libudev1
diff --git a/install.sh b/install.sh
index 44d1a83..8edff00 100755
--- a/install.sh
+++ b/install.sh
@@ -371,7 +371,7 @@ declare FEEDERCHOICES
 if [[ -n "$FEEDERLIST" ]]; then
     # Display a checklist containing feeders that are not installed if any.
     # This command is creating a file named FEEDERCHOICES but can not fiogure out how to make it only a variable without the file being created at this time.
-    whiptail --backtitle "$BACKTITLE" --title "Feeder Installation Options" --checklist --nocancel --separate-output "$FEEDERSAVAILABLE" 13 52 3 "${FEEDERLIST[@]}" 2>FEEDERCHOICES
+    whiptail --backtitle "$BACKTITLE" --title "Feeder Installation Options" --checklist --nocancel --separate-output "$FEEDERSAVAILABLE" 13 52 4 "${FEEDERLIST[@]}" 2>FEEDERCHOICES
 else
     # Since all available feeders appear to be installed inform the user of the fact.
     whiptail --backtitle "$BACKTITLE" --title "All Feeders Installed" --msgbox "$ALLFEEDERSINSTALLED" 10 65