Merge branch 'master' of github.com:tcatm/ffmap-d3
This commit is contained in:
commit
1effc65b00
18
mkmap.sh
18
mkmap.sh
|
@ -1,12 +1,24 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
DEST=$1
|
||||
|
||||
|
||||
GWS=`(/usr/sbin/batctl gwl -n | tail -n +2 | grep -v '^No' | sed 's/=>//' | awk '{ print $1 }') | while read a; do echo -n "-g $a "; done`
|
||||
[ "$DEST" ] || exit 1
|
||||
|
||||
/usr/sbin/batctl vd json | "$(dirname "$0")"/bat2nodes.py -a "$(dirname "$0")"/aliases.json $GWS - > $DEST/nodes.json.new
|
||||
/usr/sbin/batctl vd json | "$(dirname "$0")"/bat2geomap.py -a "$(dirname "$0")"/aliases.json - > $DEST/geomap.kml.new
|
||||
|
||||
GWL=`batctl gwl -n`
|
||||
|
||||
SELF=`echo "$GWL" | head -n 1 | sed -r -e 's@^.*MainIF/MAC: [^/]+/([0-9a-f:]+).*$@\1@'`
|
||||
GWS=`(echo "$GWL" | tail -n +2 | grep -v '^No' | sed 's/=>//' | awk '{ print $1 }') | while read a; do echo -n "-g $a "; done`
|
||||
|
||||
if [ `cat /sys/class/net/bat0/mesh/gw_mode` = server ]; then
|
||||
GWS="$GWS -g $SELF"
|
||||
fi
|
||||
|
||||
batctl vd json | "$(dirname "$0")"/bat2nodes.py -a "$(dirname "$0")"/aliases.json $GWS - > $DEST/nodes.json.new
|
||||
batctl vd json | "$(dirname "$0")"/bat2geomap.py -a "$(dirname "$0")"/aliases.json - > $DEST/geomap.kml.new
|
||||
|
||||
mv $DEST/nodes.json.new $DEST/nodes.json
|
||||
mv $DEST/geomap.kml.new $DEST/geomap.kml
|
||||
|
|
Loading…
Reference in a new issue