@@ -4,15 +4,16 @@ HOODDIR=/etc/hoods
. /usr/share/libubox/jshn.sh
-myGeo=$(uci get 'system.@system[0].geo')
+myLat=$(uci get 'system.@system[0].latitude')
+myLon=$(uci get 'system.@system[0].longitude')
-if [ -z "$myGeo" ]; then
+if [ -z "$myLat" ] || [ -z "$myLon" ]; then
nearestHood=trainstation
else
- for hood in $HOODDIR/*.hood; do
+ for filename in $HOODDIR/*.hood; do
+ hood=$(basename "$filename")
echo "Parsing $hood"
- filename=$(basename "$hood" .hood)
- json_load "$(cat $hood)"
+ json_load "$(cat $filename)"
json_get_var ret version
if [ "$ret" -ne "1" ]; then
echo "Wrong version for $hood"
@@ -39,7 +40,7 @@ else
json_get_var lat lat
json_get_var lon lon
- d=$(echo "$lat $lon $myGeo" | awk '
+ d=$(echo "$lat $lon $myLat $myLon" | awk '
function rad(deg) { # degrees to radians
return deg * (3.1415926 / 180.)
}
@@ -68,7 +69,7 @@ fi
echo "Found Hood: $nearestHood in $nearestDistance m"
-json_load "$(cat $HOODDIR/$nearestHood.hood)"
+json_load "$(cat $nearestHood)"
json_select hood
json_get_var hood name
@@ -117,16 +118,16 @@ wifi
json_select ..
json_select network
-echo "Setting prefix: $prefix"
json_get_var prefix ula_prefix
+echo "Setting prefix: $prefix"
suffix=$(awk -F: '{ print $1$2":"$3$4":"$5$6 }' /sys/class/net/br-mesh/address)
addr=$(echo $prefix | sed -e 's/\//'$suffix'\//')
uci -q batch <<-EOF >/dev/null
del network.globals
- add network.globals
- set network.globals.ula_prefix=$prefix
- set network.mesh.ip6addr=$addr
+ set network.globals=globals
+ set network.globals.ula_prefix="$prefix"
+ set network.mesh.ip6addr="$addr"
commit network
EOF
Signed-off-by: Jan Kraus <mayosemmel@gmail.com> --- .../fff/fff-hoods/files/usr/sbin/configurehood | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)