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

Remove dump1090-fa option on Ubuntu 17.10 or greater.

pull/290/merge
Joe Prochazka 2018-03-23 13:06:22 -04:00
rodzic 6a0c1ef016
commit f17ca410dd
2 zmienionych plików z 9 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
bash/init.sh
Wyświetl plik

@ -86,6 +86,7 @@ function CheckPrerequisites() {
echo -e ""
CheckPackage whiptail
CheckPackage git
CheckPackage bc
echo -e ""
echo -e "\e[93m ------------------------------------------------------------------------------"
echo -e "\e[92m The whiptail and git packages are installed.\e[39m"

9
bash/main.sh
Wyświetl plik

@ -234,7 +234,14 @@ fi
if [[ ! "${DUMP1090_IS_INSTALLED}" = "true" ]] ; then
# If this is not an automated installation ask the user which one to install.
if [[ ! "${RECEIVER_AUTOMATED_INSTALL}" = "true" ]] ; then
DUMP1090_OPTION=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "The dump1090-mutability or dump1090-fa package does not appear to be installed on this device. In order to continue setup one of the following packages need to be installed. Please select your prefered dump1090 version from the list below.\n\nPlease note that in order to run dump1090-fa PiAware will need to be installed as well." 16 65 2 "dump1090-mutability" "(Mutability)" ON`if [ ! "$RECEIVER_OS_DISTRIBUTION" == "ubuntu" ] $$ [ ! $RECEIVER_OS_RELEASE >= 17.10 ]; then echo "\" dump1090-fa\" \"(FlightAware)\" OFF"` 3>&1 1>&2 2>&3)
# Do not show dump 1090-fa option for Ubuntu 17.10 or higher until it is updated to support it.
if [ ! "$RECEIVER_OS_DISTRIBUTION" == "ubuntu" ] && (( $(bc -l <<<"$RECEIVER_OS_RELEASE < 17.10") )); then
DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "The dump1090-mutability or dump1090-fa package does not appear to be installed on this device. In order to continue setup one of the following packages need to be installed. Please select your prefered dump1090 version from the list below.\n\nPlease note that in order to run dump1090-fa PiAware will need to be installed as well." 16 65 2 "dump1090-mutability" "(Mutability)" ON "dump1090-fa" "(FlightAware)" OFF 3>&1 1>&2 2>&3)
else
DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "The dump1090-mutability or dump1090-fa package does not appear to be installed on this device. In order to continue setup one of the following packages need to be installed. Please select your prefered dump1090 version from the list below.\n\nPlease note that in order to run dump1090-fa PiAware will need to be installed as well." 16 65 2 "dump1090-mutability" "(Mutability)" ON 3>&1 1>&2 2>&3)
fi
case ${DUMP1090_OPTION} in
"dump1090-mutability")
DUMP1090_FORK="mutability"