mirror
/
adsb-receiver
kopia lustrzana https://github.com/jprochazka/adsb-receiver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Remove stop points and minnor fixes.

pull/270/head
Joe Prochazka 2016-12-05 13:08:58 -05:00
rodzic 0fdca06e28
commit 0d31a60716
10 zmienionych plików z 16 dodań i 62 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
bash/decoders/dump1090-mutability.sh
Wyświetl plik

@ -101,7 +101,6 @@ else
echo -e "\e[94m Cloning the dump1090-mutability git repository locally...\e[97m"
echo ""
git clone https://github.com/mutability/dump1090.git
echo ""
fi
## BUILD AND INSTALL THE DUMP1090-MUTABILITY PACKAGE
@ -169,7 +168,7 @@ echo -e "\e[94m Setting the receiver's longitude to $RECEIVERLONGITUDE...\e[97m
ChangeConfig "LON" "$(sed -e 's/[[:space:]]*$//' <<<${RECEIVERLONGITUDE})" "/etc/default/dump1090-mutability"
# Ask for a Bing Maps API key.
BINGMAPSKEY=$(whiptail --backtitle "$ADSB_PROJECTTITLE" --title "Bing Maps API Key" --nocancel --inputbox "\nProvide a Bing Maps API key here to enable the Bing imagery layer.\nYou can obtain a free key at https://www.bingmapsportal.com/\n\nProviding a Bing Maps API key is not required to continue." 11 78 `GetConfig "BingMapsAPIKey" "/usr/share/dump1090-mutability/html/config.js"` 3>&1 1>&2 2>&3)
BINGMAPSKEY=$(whiptail --backtitle "$ADSB_PROJECTTITLE" --title "Bing Maps API Key" --nocancel --inputbox "\nProvide a Bing Maps API key here to enable the Bing imagery layer.\nYou can obtain a free key at https://www.bingmapsportal.com/\n\nProviding a Bing Maps API key is not required to continue." 12 78 `GetConfig "BingMapsAPIKey" "/usr/share/dump1090-mutability/html/config.js"` 3>&1 1>&2 2>&3)
if [[ ! -z $BINGMAPSKEY ]]; then
echo -e "\e[94m Setting the Bing Maps API Key to $BINGMAPSKEY...\e[97m"
ChangeConfig "BingMapsAPIKey" "$BINGMAPSKEY" "/usr/share/dump1090-mutability/html/config.js"
@ -182,8 +181,6 @@ if [[ ! -z $MAPZENKEY ]]; then
ChangeConfig "MapzenAPIKey" "$MAPZENKEY" "/usr/share/dump1090-mutability/html/config.js"
fi
exit 0
# Ask if dump1090-mutability should bind on all IP addresses.
if (whiptail --backtitle "$ADSB_PROJECTTITLE" --title "Bind Dump1090-mutability To All IP Addresses" --yesno "By default dump1090-mutability is bound only to the local loopback IP address(s) for security reasons. However some people wish to make dump1090-mutability's data accessable externally by other devices. To allow this dump1090-mutability can be configured to listen on all IP addresses bound to this device. It is recommended that unless you plan to access this device from an external source that dump1090-mutability remain bound only to the local loopback IP address(s).\n\nWould you like dump1090-mutability to listen on all IP addesses?" 15 78) then
echo -e "\e[94m Binding dump1090-mutability to all available IP addresses...\e[97m"
@ -195,7 +192,7 @@ else
fi
# Ask if measurments should be displayed using imperial or metric.
UNITOFMEASUREMENT=$(whiptail --backtitle "$ADSB_PROJECTTITLE" --title "Unit of Measurement" --menu "Choose unit of measurement to be used by dump1090-mutbility." 20 78 4 "Imperial" "" "Metric" "" 3>&1 1>&2 2>&3)
UNITOFMEASUREMENT=$(whiptail --backtitle "$ADSB_PROJECTTITLE" --title "Unit of Measurement" --nocancel --menu "\nChoose unit of measurement to be used by dump1090-mutbility." 11 78 2 "Imperial" "" "Metric" "" 3>&1 1>&2 2>&3)
if [ $UNITOFMEASUREMENT = "Metric" ]; then
echo -e "\e[94m Setting dump1090-mutability unit of measurement to Metric...\e[97m"
ChangeConfig "Metric" "false" "/usr/share/dump1090-mutability/html/config.js"

4
bash/decoders/dump978.sh
Wyświetl plik

@ -237,15 +237,13 @@ if ! grep -Fxq "$DUMP978BUILDDIRECTORY/dump978-maint.sh &" /etc/rc.local; then
((LINENUMBER>0)) && sudo sed -i "${LINENUMBER[$((${#LINENUMBER[@]}-1))]}i ${DUMP978BUILDDIRECTORY}/dump978-maint.sh &\n" /etc/rc.local
fi
exit 0
## EXECUTE THE MAINTAINANCE SCRIPT TO START DUMP978
echo ""
echo -e "\e[95m Starting dump978...\e[97m"
echo ""
echo -e "\e[94m Starting dump978 by executing the dump978 maintenance script...\e[97m"
sudo $DUMP978BUILDDIRECTORY/dump978-maint.sh > /dev/null &
sudo nohup $DUMP978BUILDDIRECTORY/dump978-maint.sh > /dev/null 2>&1 &
## DUMP978 SETUP COMPLETE

1
bash/feeders/planefinder.sh
Wyświetl plik

@ -108,7 +108,6 @@ fi
## INSTALL THE PLANEFINDER ADS-B CLIENT PACKAGE
echo ""
echo -e "\e[95m Installing the Plane Finder ADS-B Client package...\e[97m"
echo ""
echo -e "\e[94m Entering the Plane Finder ADS-B Client build directory...\e[97m"

24
bash/main.sh
Wyświetl plik

@ -58,9 +58,6 @@ function InstallDump1090Mutability() {
chmod +x $BASHDIRECTORY/decoders/dump1090-mutability.sh
$BASHDIRECTORY/decoders/dump1090-mutability.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}
@ -70,9 +67,6 @@ function InstallDump1090Fa() {
chmod +x $BASHDIRECTORY/decoders/dump1090-fa.sh
$BASHDIRECTORY/decoders/dump1090-fa.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}
@ -83,9 +77,6 @@ function InstallDump978() {
chmod +x $BASHDIRECTORY/decoders/dump978.sh
$BASHDIRECTORY/decoders/dump978.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}
@ -97,9 +88,6 @@ function InstallPiAware() {
chmod +x $BASHDIRECTORY/feeders/piaware.sh
$BASHDIRECTORY/feeders/piaware.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}
@ -109,9 +97,6 @@ function InstallPlaneFinder() {
chmod +x $BASHDIRECTORY/feeders/planefinder.sh
$BASHDIRECTORY/feeders/planefinder.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}
@ -121,9 +106,6 @@ function InstallFlightradar24() {
chmod +x $BASHDIRECTORY/feeders/flightradar24.sh
$BASHDIRECTORY/feeders/flightradar24.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}
@ -133,9 +115,6 @@ function InstallAdsbExchange() {
chmod +x $BASHDIRECTORY/feeders/adsbexchange.sh
$BASHDIRECTORY/feeders/adsbexchange.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}
@ -147,9 +126,6 @@ function InstallWebPortal() {
chmod +x $BASHDIRECTORY/portal/install.sh
$BASHDIRECTORY/portal/install.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1
fi
}

15
bash/portal/core.sh 100644 → 100755
Wyświetl plik

@ -44,8 +44,6 @@ DATABASEUSER=$ADSB_DATABASEUSER
DATABASEPASSWORD1=$ADSB_DATABASEPASSWORD1
DATABASENAME=$ADSB_DATABASENAME
PYTHONPATH=`which python`
## SETUP FLIGHT LOGGING
echo ""
@ -77,17 +75,4 @@ EOF
}
EOF
;;
*)
echo ""
echo -e "\e[91m \e[5mINSTALLATION HALTED!\e[25m"
echo -e " SETUP HAS BEEN TERMINATED!"
echo ""
echo -e "\e[93mInvalid \"DATABASEENGINE\" supplied.\e[39m"
echo ""
echo -e "\e[93m----------------------------------------------------------------------------------------------------"
echo -e "\e[92m ADS-B Receiver Project Portal halted.\e[39m"
echo ""
read -p "Press enter to continue..." CONTINUE
exit 1
;;
esac

8
bash/portal/install.sh
Wyświetl plik

@ -488,7 +488,7 @@ chmod +x $BASHDIRECTORY/portal/graphs.sh
$BASHDIRECTORY/portal/graphs.sh
if [ $? -ne 0 ]; then
echo ""
echo -e "\e[91m THE SCRIPT GRAPHS.SH ENCOUNTERED AND ERROR"
echo -e "\e[91m THE SCRIPT GRAPHS.SH ENCOUNTERED AN ERROR"
echo ""
exit 1
fi
@ -496,7 +496,7 @@ fi
## SETUP COMMON PORTAL FEATURES
# Export variables needed by logging.sh.
if [ $DATABASEENGINE = "MySQL" ] || [ $DATABASEENGINE = "SQLite" ]; then
if [ "$DATABASEENGINE" = "MySQL" ] || [ "$DATABASEENGINE" = "SQLite" ]; then
export ADSB_DATABASEENGINE=$DATABASEENGINE
export ADSB_DATABASEHOSTNAME=$DATABASEHOSTNAME
export ADSB_DATABASEUSER=$DATABASEUSER
@ -515,7 +515,7 @@ chmod +x $BASHDIRECTORY/portal/core.sh
$BASHDIRECTORY/portal/core.sh
if [ $? -ne 0 ]; then
echo ""
echo -e "\e[91m THE SCRIPT CORE.SH ENCOUNTERED AND ERROR"
echo -e " \e[91m THE SCRIPT CORE.SH ENCOUNTERED AN ERROR"
echo ""
exit 1
fi
@ -532,7 +532,7 @@ if [ $ADVANCED = TRUE ]; then
$BASHDIRECTORY/portal/logging.sh
if [ $? -ne 0 ]; then
echo ""
echo -e "\e[91m THE SCRIPT LOGGING.SH ENCOUNTERED AND ERROR"
echo -e " \e[91m THE SCRIPT LOGGING.SH ENCOUNTERED AN ERROR"
echo ""
exit 1
fi

4
build/portal/html/admin/index.php
Wyświetl plik

@ -277,7 +277,7 @@
////////////////
// BEGIN HTML
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."includes/header.inc.php");
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php");
// Display the updated message if settings were updated.
if ($updated) {
@ -581,5 +581,5 @@
<input type="submit" class="btn btn-default" value="Save Settings">
</form>
<?php
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."includes/footer.inc.php");
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."footer.inc.php");
?>

10
build/portal/html/classes/links.class.php
Wyświetl plik

@ -126,8 +126,8 @@
if ($settings::db_driver == "xml") {
// XML
$links = simplexml_load_file($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."data".DIRECTORY_SEPARATOR."links.xml");
$link = $blogPosts->addChild('blogPost', '');
$link->addChild('name', $title);
$link = $links->addChild('link', '');
$link->addChild('name', $name);
$link->addChild('address', $address);
$dom = dom_import_simplexml($links)->ownerDocument;
$dom->formatOutput = TRUE;
@ -182,14 +182,14 @@
$settings = new settings();
if ($settings::db_driver == "xml") {
$blogPosts = simplexml_load_file($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."data".DIRECTORY_SEPARATOR."links.xml");
foreach($linkss as $link) {
$links = simplexml_load_file($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."data".DIRECTORY_SEPARATOR."links.xml");
foreach($links as $link) {
if($link->name == $name) {
$dom = dom_import_simplexml($link);
$dom->parentNode->removeChild($dom);
}
}
file_put_contents($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."data".DIRECTORY_SEPARATOR."links.xml", $blogPosts->asXml());
file_put_contents($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."data".DIRECTORY_SEPARATOR."links.xml", $links->asXml());
} else {
// PDO
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."common.class.php");

2
build/portal/html/classes/template.class.php
Wyświetl plik

@ -53,7 +53,7 @@
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."links.class.php");
$links = new links();
$pageData['customLinks'] = $links->getAllLinks();
$pageData['links'] = $links->getAllLinks();
// Load the template for the requested page.
$page = $this->readTemplate($common->removeExtension($_SERVER["SCRIPT_NAME"]).'.tpl');

3
install.sh
Wyświetl plik

@ -48,7 +48,7 @@ source $BASHDIRECTORY/functions.sh
## MORE VARIABLES
export ADSB_PROJECTTITLE="The ADS-B Receiver Project Installer"
TERMINATEDMESSAGE="\e[91m ANY FURTHER SETUP AND/OR INSTALLATION REQUESTS HAVE BEEN TERMINIATED\e[39m"
TERMINATEDMESSAGE=" \e[91m ANY FURTHER SETUP AND/OR INSTALLATION REQUESTS HAVE BEEN TERMINIATED\e[39m"
## CHECK IF THIS IS THE FIRST RUN USING THE IMAGE RELEASE
@ -155,7 +155,6 @@ fi
chmod +x $BASHDIRECTORY/main.sh
$BASHDIRECTORY/main.sh
if [ $? -ne 0 ]; then
echo ""
echo -e $TERMINATEDMESSAGE
echo ""
exit 1