diff --git a/scripts/adsbexchange-feed.sh b/scripts/adsbexchange-feed.sh index 2fe9188..848e5b7 100755 --- a/scripts/adsbexchange-feed.sh +++ b/scripts/adsbexchange-feed.sh @@ -3,8 +3,8 @@ while sleep 30 do if ping -q -c 2 -W 5 feed.adsbexchange.com >/dev/null 2>&1 then - echo Connected to feed.adsbexchange.com:$RECEIVERPORT - /usr/bin/socat -u TCP:$INPUT TCP:feed.adsbexchange.com:$RECEIVERPORT + echo Connected to feed.adsbexchange.com:$SERVERPORT + /usr/bin/socat -u TCP:$INPUT TCP:feed.adsbexchange.com:$SERVERPORT echo Disconnected else echo Unable to connect to feed.adsbexchange.com, trying again in 30 seconds! diff --git a/setup.sh b/setup.sh index 3835f76..4f4dd5d 100755 --- a/setup.sh +++ b/setup.sh @@ -81,7 +81,7 @@ if [ $CONTINUESETUP = 1 ]; then exit 0 fi -ADSBEXCHANGEUSERNAME=$(whiptail --backtitle "$BACKTITLETEXT" --title "Feeder MLAT Name" --nocancel --inputbox "\nPlease enter a unique name for the feeder to be shown on MLAT matrix.\n\nThis name MUST be unique.\nText and Numbers only - everything else will be removed.\nExample: \"william-london-01\", \"william-jersey-02\", etc." 12 78 3>&1 1>&2 2>&3) +ADSBEXCHANGEUSERNAME=$(whiptail --backtitle "$BACKTITLETEXT" --title "Feeder MLAT Name" --nocancel --inputbox "\nPlease enter a unique name for the feeder to be shown on the MLAT matrix (http://adsbx.org/sync)\n\nThis name MUST be unique, for this reason a random number is automatically added at the end.\nText and Numbers only - everything else will be removed.\nExample: \"william34-london\", \"william34-jersey\", etc." 12 78 3>&1 1>&2 2>&3) whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" \ --msgbox "For MLAT the precise location of your antenna is required.\ @@ -103,9 +103,9 @@ until [ $LON_OK -eq 1 ]; do LON_OK=`awk -v LAT="$RECEIVERLONGITUDE" 'BEGIN {printf (LAT<180 && LAT>-180 ? "1" : "0")}'` done -RECEIVERALTITUDE=$(whiptail --backtitle "$BACKTITLETEXT" --title "Receiver Altitude above sea level (antenna position)" --nocancel --inputbox "\nEnter your receivers altitude in meters above sea level\n(optional suffix m for meters or ft for feet)\n(negative altitudes need to be entered in meters without a suffix)." 12 78 3>&1 1>&2 2>&3) +RECEIVERALTITUDE=$(whiptail --backtitle "$BACKTITLETEXT" --title "Altitude above sea level (at the antenna):" --nocancel --inputbox "\nEnter your antennas altitude above sea level in ft or m like this: 255ft or 78m (no space!))\n(negative altitudes need to be entered in meters without a suffix)." 12 78 3>&1 1>&2 2>&3) -RECEIVERPORT=$(whiptail --backtitle "$BACKTITLETEXT" --title "Receiver Feed Port" --nocancel --inputbox "\nChange only if you were assigned a custom feed port.\nFor most all users it is required this port remain set to port 30005." 10 78 "30005" 3>&1 1>&2 2>&3) +#RECEIVERPORT=$(whiptail --backtitle "$BACKTITLETEXT" --title "Receiver Feed Port" --nocancel --inputbox "\nChange only if you were assigned a custom feed port.\nFor most all users it is required this port remain set to port 30005." 10 78 "30005" 3>&1 1>&2 2>&3) whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "We are now ready to begin setting up your receiver to feed ADS-B Exchange.\n\nDo you wish to proceed?" 9 78 @@ -230,15 +230,15 @@ fi sudo cp $PWD/scripts/adsbexchange-feed.service /lib/systemd/system sudo tee /etc/default/adsbexchange > /dev/null <