kopia lustrzana https://github.com/jprochazka/adsb-receiver
Added Fly Italy ADS-B support and set as v2.8.3.
jprochazka
rodzic
3ac250c3b5
commit
c87643c78e
|
|
@ -2,10 +2,13 @@
|
|||
|
||||
The following is a history of the changes made to this project.
|
||||
|
||||
## v2.8.3 *(in development)*
|
||||
## v2.8.3 *(July 7th, 2024)* :chicken:
|
||||
|
||||
### Installers
|
||||
|
||||
* Added the option to install the Fly Italy ADS-B feeder client.
|
||||
* Tested installation processes on Arbian Bookworm.
|
||||
* Tested installation processes on Arbian Jammy.
|
||||
* Unnecessary RTL-SDR kernel modules are once again blacklisted during decoder installs.
|
||||
* ADS-B Receiver Project repository updates now work properly when executed by the script.
|
||||
* Instead of creating a new branch changes to tracked files are now stashed before updating.
|
||||
|
|
|
|||
13
README.md
13
README.md
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
## Run ADS-B/UAT related applications without the overhead!
|
||||
|
||||
This project continues to realize that for some, Docker and premade images are not always the solution.
|
||||
This project continues to realize that for some, Docker and premade images are not the most optimal solution.
|
||||
|
||||
It would seem as of late the move towards Docker and other PaaS images with preinstalled software are the rage within the community. The problem is Docker images require additional software and overhead in order to run. Solutions in the form of a Docker or premade native image also include software you may never wish to use as part of the image. What this project offers is the possibility for less overhead and better performance, depending on your installation choices of course, on a wide range of devices by installing only the applications you want natively.
|
||||
It would seem as of late the move towards premade and as well as Docker and other PaaS images with preinstalled software are the rage within the community. The problem is Docker images require additional software and overhead in order to run and premade images lack installation options. Solutions such as these come preinstalled with software you may never wish to use as part of the image. What this project offers is the possibility for less overhead and better performance, depending on your installation choices of course, on a wide range of devices and hardware archetectures while installing only the applications you want natively.
|
||||
|
||||
## Obtaining And Using This Software
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ Included is the option to install the ADS-B Portal which offers the following fe
|
|||
|
||||
When setting up the portal you will have to choose between a lite or advanced installation. Advanced features adds flight logging and plotting and should only be chosen on devices running a more sturdy data storage solution.
|
||||
|
||||
*It is recommended that anyone using a SD card as they storage medium not attempt to use the advanced features.*
|
||||
*It is highly recommended that anyone using a SD card as they storage medium not attempt to use the advanced features.*
|
||||
|
||||
### Decoders
|
||||
|
||||
|
|
@ -53,10 +53,11 @@ When setting up the portal you will have to choose between a lite or advanced in
|
|||
|
||||
### Feeders
|
||||
|
||||
* ADS-B Exchange: https://adsbexchange.com
|
||||
* ADS-B Exchange Feeder Client: https://adsbexchange.com
|
||||
* FlightAware's PiAware: https://flightaware.com
|
||||
* Flightradar24 Feeder Client: https://flightradar24.com
|
||||
* OpenSky Feeder: https://opensky-network.org
|
||||
* Fly Italy ADS-B Feeder Client: https://flyitalyadsb.com/
|
||||
* OpenSky Feeder Client: https://opensky-network.org
|
||||
* Plane Finder ADS-B Client: https://planefinder.net
|
||||
|
||||
### Extras
|
||||
|
|
@ -68,6 +69,8 @@ When setting up the portal you will have to choose between a lite or advanced in
|
|||
|
||||
The project currently supports the following Linux distributions.
|
||||
|
||||
* Armbian Bookworm
|
||||
* Armbian Jammy
|
||||
* Debian Bookworm
|
||||
* Debian Bullseye
|
||||
* DietPi (Bookworm)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,99 @@
|
|||
#!/bin/bash
|
||||
|
||||
## INCLUDE EXTERNAL SCRIPTS
|
||||
|
||||
source $RECEIVER_BASH_DIRECTORY/variables.sh
|
||||
source $RECEIVER_BASH_DIRECTORY/functions.sh
|
||||
|
||||
|
||||
## BEGIN SETUP
|
||||
|
||||
clear
|
||||
echo -e "\n\e[91m ${RECEIVER_PROJECT_TITLE}"
|
||||
echo -e ""
|
||||
echo -e "\e[92m Setting up the Fly Italy ADS-B feeder client..."
|
||||
echo -e ""
|
||||
echo -e "\e[93m ------------------------------------------------------------------------------\e[96m"
|
||||
echo -e ""
|
||||
|
||||
# Confirm component installation.
|
||||
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 3>&1 1>&2 2>&3; then
|
||||
echo -e "\e[91m \e[5mINSTALLATION HALTED!\e[25m"
|
||||
echo -e " Setup has been halted at the request of the user."
|
||||
echo -e ""
|
||||
echo -e "\e[93m ------------------------------------------------------------------------------"
|
||||
echo -e "\e[92m Fly Italy ADS-B feeder client setup halted.\e[39m"
|
||||
echo -e ""
|
||||
read -p "Press enter to continue..." discard
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
## START FEEDER
|
||||
|
||||
echo -e ""
|
||||
echo -e "\e[95m Begining the Fly Italy ADS-B feeder client installation process...\e[97m"
|
||||
echo -e ""
|
||||
|
||||
# Create the component build directory if it does not exist
|
||||
if [[ ! -d $RECEIVER_BUILD_DIRECTORY/flyitalyadsb ]]; then
|
||||
echo -e "\e[94m Creating the Fly Italy ADS-B feeder client build directory...\e[97m"
|
||||
echo ""
|
||||
mkdir -vp $RECEIVER_BUILD_DIRECTORY/flyitalyadsb
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Change to the component build directory
|
||||
echo -e "\e[94m Entering the Fly Italy ADS-B feeder client build directory...\e[97m"
|
||||
cd $RECEIVER_BUILD_DIRECTORY/flyitalyadsb 2>&1
|
||||
echo ""
|
||||
|
||||
# Download the official Fly Italy ADS-B feeder installation script
|
||||
echo -e "\e[95m Beginning the Fly Italy ADS-B feeder client installation...\e[97m"
|
||||
echo -e ""
|
||||
|
||||
echo -e "\e[94m Downloading the Fly Italy ADS-B feeder client installation script...\e[97m"
|
||||
echo ""
|
||||
wget -v https://raw.githubusercontent.com/flyitalyadsb/fly-italy-adsb/master/install.sh
|
||||
|
||||
echo -e "\e[94m Executing the Fly Italy ADS-B feeder client installation script...\e[97m"
|
||||
echo ""
|
||||
sudo bash $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install.sh
|
||||
echo ""
|
||||
|
||||
|
||||
## INSTALL 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;
|
||||
# Download the official Fly Italy ADS-B feeder updater script
|
||||
echo -e "\e[95m Beginning the Fly Italy ADS-B feeder updater installation...\e[97m"
|
||||
echo -e ""
|
||||
|
||||
echo -e "\e[94m Downloading the Fly Italy ADS-B feeder updater installation script...\e[97m"
|
||||
echo ""
|
||||
wget -v wget https://raw.githubusercontent.com/flyitalyadsb/mlat-client/master/scripts/install_updater.sh
|
||||
|
||||
echo -e "\e[94m Executing the Fly Italy ADS-B feeder updater installation script...\e[97m"
|
||||
echo ""
|
||||
sudo bash $RECEIVER_BUILD_DIRECTORY/flyitalyadsb/install_updater.sh
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
||||
## POST INSTALLATION INFORMATION
|
||||
|
||||
whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Fly Italy ADS-B Feeder Setup Complete" --msgbox "To check the status of your installation vist https://flyitalyadsb.com/stato-ricevitore/.\n\nFor information on configuring your Fly Italy ADS-B feeder visit https://flyitalyadsb.com/configurazione-script/" 12 78
|
||||
|
||||
## SETUP COMPLETE
|
||||
|
||||
# Return to the project root directory
|
||||
echo -e "\e[94m Returning to ${RECEIVER_PROJECT_TITLE} root directory...\e[97m"
|
||||
cd $RECEIVER_ROOT_DIRECTORY 2>&1
|
||||
|
||||
echo -e ""
|
||||
echo -e "\e[93m ------------------------------------------------------------------------------"
|
||||
echo -e "\e[92m Fly Italy ADS-B feeder client setup is complete.\e[39m"
|
||||
echo -e ""
|
||||
read -p "Press enter to continue..." discard
|
||||
|
||||
exit 0
|
||||
29
bash/main.sh
29
bash/main.sh
|
|
@ -51,6 +51,16 @@ function InstallFlightradar24() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Execute the Fly Italy ADS-B Feeder client setup script.
|
||||
function InstallFlyItalyAdsb() {
|
||||
chmod +x ${RECEIVER_BASH_DIRECTORY}/feeders/flyitalyadsb.sh
|
||||
${RECEIVER_BASH_DIRECTORY}/feeders/flyitalyadsb.sh
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Execute the OpenSky Network setup script.
|
||||
function InstallOpenSkyNetwork() {
|
||||
chmod +x ${RECEIVER_BASH_DIRECTORY}/feeders/openskynetwork.sh
|
||||
|
|
@ -198,6 +208,17 @@ else
|
|||
FEEDER_LIST=("${FEEDER_LIST[@]}" 'ADS-B Exchange Feeder' '' OFF)
|
||||
fi
|
||||
|
||||
# Check if the Fly Italy ADS-B feeder has been set up.
|
||||
if [[ -f /lib/systemd/system/flyitalyadsb-mlat.service && -f /lib/systemd/system/flyitalyadsb-feed.service ]]; then
|
||||
# The feeder appears to be set up.
|
||||
echo "Fly Italy ADS-B Feeder (upgrade)" >> ${RECEIVER_ROOT_DIRECTORY}/FEEDER_CHOICES
|
||||
FEEDER_LIST=("${FEEDER_LIST[@]}" 'Fly Italy ADS-B Feeder (upgrade)' '' OFF)
|
||||
else
|
||||
# The feeder does not appear to be set up.
|
||||
echo "Fly Italy ADS-B Feeder" >> ${RECEIVER_ROOT_DIRECTORY}/FEEDER_CHOICES
|
||||
FEEDER_LIST=("${FEEDER_LIST[@]}" 'Fly Italy ADS-B Feeder' '' OFF)
|
||||
fi
|
||||
|
||||
# Check for the OpenSky Network package.
|
||||
if [[ $(dpkg-query -W -f='${STATUS}' opensky-feeder 2>/dev/null | grep -c "ok installed") -eq 0 ]]; then
|
||||
# The OpenSky Network feeder package appears to not be installed.
|
||||
|
|
@ -434,6 +455,7 @@ fi
|
|||
RUN_ADSBEXCHANGE_SCRIPT="false"
|
||||
RUN_PIAWARE_SCRIPT="false"
|
||||
RUN_FLIGHTRADAR24_SCRIPT="false"
|
||||
RUN_FLYITALYADSB_SCRIPT
|
||||
RUN_OPENSKYNETWORK_SCRIPT="false"
|
||||
RUN_PLANEFINDER_SCRIPT="false"
|
||||
|
||||
|
|
@ -450,6 +472,9 @@ if [[ -s "${RECEIVER_ROOT_DIRECTORY}/FEEDER_CHOICES" ]]; then
|
|||
"Flightradar24 Client"|"Flightradar24 Client (upgrade)"|"Flightradar24 Client (reinstall)")
|
||||
RUN_FLIGHTRADAR24_SCRIPT="true"
|
||||
;;
|
||||
"Fly Italy ADS-B Feeder"|"Fly Italy ADS-B Feeder (upgrade)"
|
||||
RUN_FLYITALYADSB_SCRIPT="true"
|
||||
;;
|
||||
"OpenSky Network Feeder")
|
||||
RUN_OPENSKYNETWORK_SCRIPT="true"
|
||||
;;
|
||||
|
|
@ -472,6 +497,10 @@ if [[ "${RUN_FLIGHTRADAR24_SCRIPT}" = "true" ]]; then
|
|||
InstallFlightradar24
|
||||
fi
|
||||
|
||||
if [[ "${RUN_FLYITALYADSB_SCRIPT}" = "true" ]]; then
|
||||
InstallFlyItalyAdsb
|
||||
fi
|
||||
|
||||
if [[ "${RUN_OPENSKYNETWORK_SCRIPT}" = "true" ]]; then
|
||||
InstallOpenSkyNetwork
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
## SOFTWARE VERSIONS
|
||||
|
||||
# The ADS-B Receiver Project
|
||||
PROJECT_VERSION="2.8.2"
|
||||
PROJECT_VERSION="2.8.3"
|
||||
|
||||
# FlightAware
|
||||
DUMP1090_FA_VERSION="9.0"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
// Check if the portal is installed or needs upgraded.
|
||||
|
||||
$thisVersion = "2.8.2";
|
||||
$thisVersion = "2.8.3";
|
||||
|
||||
if (!file_exists($_SERVER['DOCUMENT_ROOT']."/classes/settings.class.php")) {
|
||||
header ("Location: /install/install.php");
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
/////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// The most current stable release.
|
||||
$thisVersion = "2.8.2";
|
||||
$thisVersion = "2.8.3";
|
||||
|
||||
// Begin the upgrade process if this release is newer than what is installed.
|
||||
if (file_exists($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php")) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
<?php
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////
|
||||
// ADS-B RECEIVER PORTAL //
|
||||
// =============================================================================== //
|
||||
// Copyright and Licensing Information: //
|
||||
// //
|
||||
// The MIT License (MIT) //
|
||||
// //
|
||||
// Copyright (c) 2015-2024 Joseph A. Prochazka //
|
||||
// //
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy //
|
||||
// of this software and associated documentation files (the "Software"), to deal //
|
||||
// in the Software without restriction, including without limitation the rights //
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell //
|
||||
// copies of the Software, and to permit persons to whom the Software is //
|
||||
// furnished to do so, subject to the following conditions: //
|
||||
// //
|
||||
// The above copyright notice and this permission notice shall be included in all //
|
||||
// copies or substantial portions of the Software. //
|
||||
// //
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR //
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, //
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE //
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER //
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, //
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE //
|
||||
// SOFTWARE. //
|
||||
/////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
///////////////////////
|
||||
// UPGRADE TO V2.8.3
|
||||
///////////////////////
|
||||
|
||||
// --------------------------------------------------------
|
||||
// Updates the version setting to 2.8.3.
|
||||
// --------------------------------------------------------
|
||||
|
||||
$results = upgrade();
|
||||
exit(json_encode($results));
|
||||
|
||||
function upgrade() {
|
||||
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."common.class.php");
|
||||
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php");
|
||||
|
||||
$common = new common();
|
||||
$settings = new settings();
|
||||
|
||||
try {
|
||||
|
||||
// Update the version and patch settings..
|
||||
$common->updateSetting("version", "2.8.3");
|
||||
$common->updateSetting("patch", "");
|
||||
|
||||
// The upgrade process completed successfully.
|
||||
$results['success'] = TRUE;
|
||||
$results['message'] = "Upgrade to v2.8.3 successful.";
|
||||
return $results;
|
||||
|
||||
} catch(Exception $e) {
|
||||
// Something went wrong during this upgrade process.
|
||||
$results['success'] = FALSE;
|
||||
$results['message'] = $e->getMessage();
|
||||
return $results;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
$common = new common();
|
||||
|
||||
// The most current stable release.
|
||||
$thisVersion = "2.8.2";
|
||||
$thisVersion = "2.8.3";
|
||||
|
||||
// Begin the upgrade process if this release is newer than what is installed.
|
||||
if ($common->getSetting("version") == $thisVersion) {
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
$version = "2.8.1";
|
||||
}
|
||||
|
||||
// UPGRADE TO V2.8.1
|
||||
// UPGRADE TO V2.8.2
|
||||
if ($common->getSetting("version") == "2.8.1" && $success) {
|
||||
$json = file_get_contents("http://localhost/install/upgrade-v2.8.2.php");
|
||||
$results = json_decode($json, TRUE);
|
||||
|
|
@ -204,6 +204,14 @@
|
|||
$version = "2.8.2";
|
||||
}
|
||||
|
||||
// UPGRADE TO V2.8.3
|
||||
if ($common->getSetting("version") == "2.8.2" && $success) {
|
||||
$json = file_get_contents("http://localhost/install/upgrade-v2.8.3.php");
|
||||
$results = json_decode($json, TRUE);
|
||||
$success = $results['success'];
|
||||
$message = $results['message'];
|
||||
$version = "2.8.3";
|
||||
}
|
||||
|
||||
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php");
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue