freifunk-common: neigh.sh: work also with unprettyfied JSON output 879/head
authorBastian Bittorf <bb@npl.de>
Tue, 13 Dec 2016 20:38:29 +0000 (21:38 +0100)
committerBastian Bittorf <bb@npl.de>
Tue, 13 Dec 2016 20:38:29 +0000 (21:38 +0100)
Older OLSRd-version outputs JSON humanreadable over multiple lines.
The introduced change in 524439cd1647e5d6d7b48f9c75ec5800a5444109 broke
the output for those users. Fix that be a finer filter regex.
Thanks to Thomas Huehn <thomas@net.t-labs.tu-berlin.de> for spotting that.

contrib/package/freifunk-common/files/usr/bin/neigh.sh

index 59ea8f914fe3f31a007c9a36de80679807707c98..468ed7a3e07b532725b78ead574336f525ceeb33 100755 (executable)
@@ -66,7 +66,7 @@ VARS="$VARS neighborLinkQuality:NLQ linkCost:Cost remoteHostname:Host"
 
 for HOST in '127.0.0.1' '::1';do
        json_init
-       json_load "$( echo /links | nc $HOST 9090 | grep ^'{' )"        # remove header/non-json
+       json_load "$( echo /links | nc $HOST 9090 | sed -n '/^[}{ ]/p' )"       # remove header/non-json
 
        if json_is_a links array;then
                json_select links