mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #4 from FreifunkBremen/master 

alfred: added more information to send, reformatted location
This commit is contained in:
Nils Schneider 2014-01-13 08:30:12 -08:00
parent 137a311e1e e38a0c9f11
commit 3e99152716
1 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh
View File

@ -9,14 +9,56 @@ 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')"
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"
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)"
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)"
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"