From 9648152ef96c6a86d2a735491d9be158fc7acd95 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 13 Jan 2014 16:07:52 +0100 Subject: [PATCH 1/4] alfred: added more information to send, reformatted location location is object with latitude and longitude added: * firmware * autoupdater status * hardware model * primary mac address * mesh IPv6 addresses --- .../files/lib/gluon/alfred/announce.sh | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh index 6b890a7..cd9bd59 100755 --- a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh +++ b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh @@ -9,14 +9,41 @@ else exit 1 fi +. /lib/gluon/functions/model.sh +. /lib/gluon/functions/sysconfig.sh + [ -z "$ALFRED_DATA_TYPE" ] && ALFRED_DATA_TYPE=158 +[ -z "$NET_IF" ] && NET_IF=br-client set -e json_init json_add_string "name" "$(uci get 'system.@system[0].hostname')" -if [ "$(uci get 'system.@system[0].share_location')" = 1 ]; then - json_add_string "location" "$(uci get 'system.@system[0].latitude') $(uci get 'system.@system[0].longitude')" +if [ "$(uci -q get 'system.@system[0].share_location')" = 1 ]; then + json_add_object "location" + json_add_double "latitude" "$(uci get 'system.@system[0].latitude')" + json_add_double "longitude" "$(uci get 'system.@system[0].longitude')" + json_close_object # location fi +json_add_object "software" + json_add_string "firmware" "gluon $(cat /lib/gluon/release)" + if [ -x /usr/sbin/autoupdater ]; then + json_add_object "autoupdater" + json_add_string "branch" "$(uci -q get autoupdater.settings.branch)" + json_add_boolean "enabled" "$(uci -q get autoupdater.settings.enabled)" + json_close_object # autoupdater + fi +json_close_object # software +json_add_object "hardware" + json_add_string "model" "$(get_model)" +json_close_object # hardware +json_add_object "network" + json_add_string "mac" "$(sysconfig primary_mac)" + json_add_array "addresses" + for addr in $(ip -o -6 addr show dev "$NET_IF" | grep -oE 'inet6 [0-9a-fA-F:]+' | cut -d' ' -f2); do + json_add_string "" "$addr" + done + json_close_array # adresses +json_close_object # network json_dump | tr -d '\n' | alfred -s "$ALFRED_DATA_TYPE" From 0cfb32ce951c11c0dd301de00a21ab08e75a4071 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 13 Jan 2014 17:06:47 +0100 Subject: [PATCH 2/4] alfred: split up firmware info, include fastd version+status --- gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh index cd9bd59..172c7c6 100755 --- a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh +++ b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh @@ -26,13 +26,22 @@ if [ "$(uci -q get 'system.@system[0].share_location')" = 1 ]; then json_close_object # location fi json_add_object "software" - json_add_string "firmware" "gluon $(cat /lib/gluon/release)" + json_add_object "firmware" + json_add_string "base" "gluon" + json_add_string "release" "$(cat /lib/gluon/release)" + json_close_object # firmware if [ -x /usr/sbin/autoupdater ]; then json_add_object "autoupdater" json_add_string "branch" "$(uci -q get autoupdater.settings.branch)" json_add_boolean "enabled" "$(uci -q get autoupdater.settings.enabled)" json_close_object # autoupdater fi + if [ -x /usr/bin/fastd ]; then + json_add_object "fastd" + json_add_string "version" "$(fastd -v | cut -d' ' -f2)" + json_add_boolean "enabled" "$(uci -q get fastd.mesh_vpn.enabled)" + json_close_object # fastd + fi json_close_object # software json_add_object "hardware" json_add_string "model" "$(get_model)" From f756a71de90304591fa27078163f7706cf1060b2 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 13 Jan 2014 17:09:15 +0100 Subject: [PATCH 3/4] alfred: improved readability --- .../files/lib/gluon/alfred/announce.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh index 172c7c6..41c9c8c 100755 --- a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh +++ b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh @@ -19,23 +19,27 @@ set -e json_init json_add_string "name" "$(uci get 'system.@system[0].hostname')" + if [ "$(uci -q get 'system.@system[0].share_location')" = 1 ]; then - json_add_object "location" - json_add_double "latitude" "$(uci get 'system.@system[0].latitude')" - json_add_double "longitude" "$(uci get 'system.@system[0].longitude')" - json_close_object # location +json_add_object "location" + json_add_double "latitude" "$(uci get 'system.@system[0].latitude')" + json_add_double "longitude" "$(uci get 'system.@system[0].longitude')" +json_close_object # location fi + json_add_object "software" json_add_object "firmware" json_add_string "base" "gluon" json_add_string "release" "$(cat /lib/gluon/release)" json_close_object # firmware + if [ -x /usr/sbin/autoupdater ]; then json_add_object "autoupdater" json_add_string "branch" "$(uci -q get autoupdater.settings.branch)" json_add_boolean "enabled" "$(uci -q get autoupdater.settings.enabled)" json_close_object # autoupdater fi + if [ -x /usr/bin/fastd ]; then json_add_object "fastd" json_add_string "version" "$(fastd -v | cut -d' ' -f2)" @@ -43,9 +47,11 @@ json_add_object "software" json_close_object # fastd fi json_close_object # software + json_add_object "hardware" json_add_string "model" "$(get_model)" json_close_object # hardware + json_add_object "network" json_add_string "mac" "$(sysconfig primary_mac)" json_add_array "addresses" From e38a0c9f11b126fa67c390e6325d991c72fa1d83 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 13 Jan 2014 17:11:41 +0100 Subject: [PATCH 4/4] alfred: name -> hostname --- gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh index 41c9c8c..54d30b5 100755 --- a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh +++ b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh @@ -18,7 +18,7 @@ fi set -e json_init -json_add_string "name" "$(uci get 'system.@system[0].hostname')" +json_add_string "hostname" "$(uci get 'system.@system[0].hostname')" if [ "$(uci -q get 'system.@system[0].share_location')" = 1 ]; then json_add_object "location"