diff --git a/bash/decoders/dump978.sh b/bash/decoders/dump978.sh index 060227d..2201fa9 100755 --- a/bash/decoders/dump978.sh +++ b/bash/decoders/dump978.sh @@ -148,11 +148,15 @@ echo -e "" # Create an RTL-SDR blacklist file so the device does not claim SDR's for other purposes. echo -e "\e[94m Creating an RTL-SDR kernel module blacklist file...\e[97m" sudo tee /etc/modprobe.d/rtlsdr-blacklist.conf > /dev/null <&1 1>&2 2>&3) + COMPONENT_LATITUDE=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --backtitle "${BACKTITLETEXT}" --title "${COMPONENT_LATITUDE_TITLE}" --nocancel --inputbox "\nPlease confirm your receiver's latitude${COMPONENT_LATITUDE_SOURCE_MESSAGE}:\n" 12 78 -- "${COMPONENT_LATITUDE}" 3>&1 1>&2 2>&3) COMPONENT_LATITUDE_TITLE="Receiver Latitude (REQUIRED)" done else @@ -523,7 +523,7 @@ if [[ "${RECEIVER_AUTOMATED_INSTALL}" = "false" ]] ; then if [[ -n "${COMPONENT_LONGITUDE_SOURCE}" ]] ; then COMPONENT_LONGITUDE_SOURCE_MESSAGE=", the value below is obtained from ${COMPONENT_LONGITUDE_SOURCE}" fi - COMPONENT_LONGITUDE=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --backtitle "${BACKTITLETEXT}" --title "${COMPONENT_LONGITUDE_TITLE}" --nocancel --inputbox "\nPlease confirm your receiver's longitude${COMPONENT_LONGITUDE_SOURCE_MESSAGE}:\n" 10 78 -- "${COMPONENT_LONGITUDE}" 3>&1 1>&2 2>&3) + COMPONENT_LONGITUDE=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --backtitle "${BACKTITLETEXT}" --title "${COMPONENT_LONGITUDE_TITLE}" --nocancel --inputbox "\nPlease confirm your receiver's longitude${COMPONENT_LONGITUDE_SOURCE_MESSAGE}:\n" 12 78 -- "${COMPONENT_LONGITUDE}" 3>&1 1>&2 2>&3) COMPONENT_LONGITUDE_TITLE="Receiver Longitude (REQUIRED)" done else @@ -544,12 +544,12 @@ if [[ "${RECEIVER_AUTOMATED_INSTALL}" = "false" ]] ; then while [[ -z "${COMPONENT_ALTITUDE}" ]] ; do if [[ -n "${COMPONENT_LATITUDE}" ]] && [[ -n "${COMPONENT_LONGITUDE}" ]] ; then COMPONENT_ALTITUDE=$(curl -s https://maps.googleapis.com/maps/api/elevation/json?locations=${COMPONENT_LATITUDE},${COMPONENT_LONGITUDE} | python -c "import json,sys;obj=json.load(sys.stdin);print obj['results'][0]['elevation'];" | awk '{printf("%.2f\n", $1)}') - COMPONENT_ALTITUDE_SOURCE="Google but should be increased to reflect your antennas height above ground level" + COMPONENT_ALTITUDE_SOURCE="Google; however should be increased to reflect your antennas height above ground level" fi if [[ -n "${COMPONENT_ALTITUDE_SOURCE}" ]] ; then COMPONENT_ALTITUDE_SOURCE_MESSAGE=", the value below is obtained from ${COMPONENT_ALTITUDE_SOURCE}" fi - COMPONENT_ALTITUDE=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --backtitle "${BACKTITLETEXT}" --title "${COMPONENT_ALTITUDE_TITLE}" --nocancel --inputbox "\nPlease confirm your receiver's altitude in meters${COMPONENT_ALTITUDE_SOURCE_MESSAGE}:\n" 10 78 -- "${COMPONENT_ALTITUDE}" 3>&1 1>&2 2>&3) + COMPONENT_ALTITUDE=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --backtitle "${BACKTITLETEXT}" --title "${COMPONENT_ALTITUDE_TITLE}" --nocancel --inputbox "\nPlease confirm your receiver's altitude in meters${COMPONENT_ALTITUDE_SOURCE_MESSAGE}:\n" 12 78 -- "${COMPONENT_ALTITUDE}" 3>&1 1>&2 2>&3) COMPONENT_ALTITUDE_TITLE="Receiver Altitude (REQUIRED)" done else @@ -571,7 +571,7 @@ fi if [[ "${RECEIVER_AUTOMATED_INSTALL}" = "false" ]] ; then COMPONENT_RECEIVER_NAME_TITLE="Receiver Name" while [[ -z "${COMPONENT_RECEIVER_NAME}" ]] || [[ `echo -n ${COMPONENT_RECEIVER_NAME} | wc -c` -gt 9 ]] ; do - COMPONENT_RECEIVER_NAME=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --backtitle "${BACKTITLETEXT}" --title "${COMPONENT_RECEIVER_NAME_TITLE}" --nocancel --inputbox "\nPlease confirm your receiver name, this should be between 3 and 9 alphanumeric charactors and contain no punctuation or special charactors:\n" 10 78 -- "${COMPONENT_RECEIVER_NAME}" 3>&1 1>&2 2>&3) + COMPONENT_RECEIVER_NAME=$(whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --backtitle "${BACKTITLETEXT}" --title "${COMPONENT_RECEIVER_NAME_TITLE}" --nocancel --inputbox "\nPlease confirm your receiver name, this should be between 3 and 9 alphanumeric charactors and contain no punctuation or special charactors:\n" 12 78 -- "${COMPONENT_RECEIVER_NAME}" 3>&1 1>&2 2>&3) COMPONENT_RECEIVER_NAME_TITLE="Receiver Name (REQUIRED)" done else