From 049c69f9c5d93bcc57d99238ddb652827d573cbb Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 5 Nov 2015 14:03:48 -0800 Subject: [PATCH 1/2] Regex for original piaware config storage --- piaware_setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/piaware_setup.sh b/piaware_setup.sh index da21b6e..b7016cc 100644 --- a/piaware_setup.sh +++ b/piaware_setup.sh @@ -32,8 +32,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo -e "\033[33m" echo "Adding the ADS-B Exchange feed to PiAware's configuration..." echo -e "\033[37m" -MLATRESULTFORMAT=`sudo piaware-config -show | grep mlatResultsFormat` -ORIGINALFORMAT=`sed 's/mlatResultsFormat //g' <<< $MLATRESULTFORMAT` +ORIGINALFORMAT=`sudo piaware-config -show | sed -n 's/.*{\(.*\)}.*/\1/p'` CLEANFORMAT=`sed 's/ beast,connect,feed.adsbexchange.com:30005//g' <<< $ORIGINALFORMAT` CLEANFORMAT=`sed 's/[{}]//g' <<< $CLEANFORMAT` COMMAND=`sudo piaware-config -mlatResultsFormat "${CLEANFORMAT} beast,connect,feed.adsbexchange.com:30005"` From 62fc400643ce626ea84d3e1e87052dbabfcec323 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 5 Nov 2015 14:06:31 -0800 Subject: [PATCH 2/2] Remove now unnecessary cleaning. --- piaware_setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/piaware_setup.sh b/piaware_setup.sh index b7016cc..8835b21 100644 --- a/piaware_setup.sh +++ b/piaware_setup.sh @@ -34,7 +34,6 @@ echo "Adding the ADS-B Exchange feed to PiAware's configuration..." echo -e "\033[37m" ORIGINALFORMAT=`sudo piaware-config -show | sed -n 's/.*{\(.*\)}.*/\1/p'` CLEANFORMAT=`sed 's/ beast,connect,feed.adsbexchange.com:30005//g' <<< $ORIGINALFORMAT` -CLEANFORMAT=`sed 's/[{}]//g' <<< $CLEANFORMAT` COMMAND=`sudo piaware-config -mlatResultsFormat "${CLEANFORMAT} beast,connect,feed.adsbexchange.com:30005"` $COMMAND sudo piaware-config -restart