diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/package/community-profiles/files/etc/config/profile_berlin | 1 | ||||
| -rw-r--r-- | contrib/package/freifunk-common/Makefile | 2 | ||||
| -rwxr-xr-x | contrib/package/freifunk-common/files/usr/bin/neigh.sh | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index 7fff870d41..1bfc8ed7d7 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_berlin +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -8,6 +8,7 @@ config 'community' 'profile' option 'splash_prefix' '27' option 'latitude' '52.52075' option 'longitude' '13.40948' + option 'owm_api' 'http://util.berlin.freifunk.net' config 'defaults' 'wifi_device' option 'channel' '13' diff --git a/contrib/package/freifunk-common/Makefile b/contrib/package/freifunk-common/Makefile index c15f02dcf6..d9bbd994a1 100644 --- a/contrib/package/freifunk-common/Makefile +++ b/contrib/package/freifunk-common/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freifunk-common -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh index b1dc01a77e..468ed7a3e0 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 | sed -n '/^[}{ ]/p' )" # remove header/non-json + if json_is_a links array;then json_select links for v in ${VARS};do |