summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-12-12 09:03:47 +0100
committerGitHub <noreply@github.com>2016-12-12 09:03:47 +0100
commit0895fb41e9e58e23664d7785a6e93f18e8f4ac66 (patch)
tree7d7ce58ac3489123002004fa3228b0be75b098a3
parentac5bd8c2f1b74f7a6e0c09629c4ba96e3a8da037 (diff)
parent524439cd1647e5d6d7b48f9c75ec5800a5444109 (diff)
Merge pull request #874 from bittorf/master
freifunk-common: neigh.sh: fix for new olsrd 0.9.5
-rwxr-xr-xcontrib/package/freifunk-common/files/usr/bin/neigh.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
index b1dc01a77..59ea8f914 100755
--- a/contrib/package/freifunk-common/files/usr/bin/neigh.sh
+++ b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
@@ -66,7 +66,8 @@ 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)"
+ json_load "$( echo /links | nc $HOST 9090 | grep ^'{' )" # remove header/non-json
+
if json_is_a links array;then
json_select links
for v in ${VARS};do