From 5fb758c6925554bb764b99ab8dd864406539c102 Mon Sep 17 00:00:00 2001 From: Joe Prochazka Date: Tue, 26 Jun 2018 13:07:01 -0400 Subject: [PATCH] A couple cosmetic fixes. --- bash/init.sh | 2 +- bash/main.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bash/init.sh b/bash/init.sh index f2dc8a4..b11a17e 100755 --- a/bash/init.sh +++ b/bash/init.sh @@ -236,7 +236,7 @@ fi chmod +x ${RECEIVER_BASH_DIRECTORY}/main.sh ${RECEIVER_BASH_DIRECTORY}/main.sh if [[ $? -ne 0 ]] ; then - echo -e " \e[91m ANY FURTHER SETUP AND/OR INSTALLATION REQUESTS HAVE BEEN TERMINIATED\e[39m" + echo -e "\e[91m ANY FURTHER SETUP AND/OR INSTALLATION REQUESTS HAVE BEEN TERMINIATED\e[39m" echo -e "" exit 1 fi diff --git a/bash/main.sh b/bash/main.sh index bc29667..f5694dc 100755 --- a/bash/main.sh +++ b/bash/main.sh @@ -280,9 +280,9 @@ if [[ ! "${DUMP1090_IS_INSTALLED}" = "true" ]] ; then # 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 "Dump1090 does not appear to be present on this device. In order to continue setup dump1090 will need to exist on this device. 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 "dump1090-hptoa" "(OpenSky Network)" OFF3>&1 1>&2 2>&3) + DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "Dump1090 does not appear to be present on this device. In order to continue setup dump1090 will need to exist on this device. 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 3 "dump1090-mutability" "(Mutability)" ON "dump1090-fa" "(FlightAware)" OFF "dump1090-hptoa" "(OpenSky Network)" OFF 3>&1 1>&2 2>&3) else - DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "Dump1090 does not appear to be present on this device. In order to continue setup dump1090 will need to exist on this device. 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-hptoa" "(OpenSky Network)" OFF 3>&1 1>&2 2>&3) + DUMP1090_OPTION=$(whiptail --nocancel --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Choose Dump1090 Version To Install" --radiolist "Dump1090 does not appear to be present on this device. In order to continue setup dump1090 will need to exist on this device. 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 3 "dump1090-mutability" "(Mutability)" ON "dump1090-hptoa" "(OpenSky Network)" OFF 3>&1 1>&2 2>&3) fi case ${DUMP1090_OPTION} in