Merge pull request #435 from rogerpueyo/bmx6-graph-tunnels

luci-app-bmx6: Fix corner case in bmx6-info?tunnels
This commit is contained in:
Pau 2018-12-08 22:26:04 +01:00 committed by GitHub
commit a7c447903c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions

View File

@ -43,7 +43,7 @@ print_query() {
i=$(( $i + 1 ))
done
echo -n " ] }"
# If /all has been specified, printing all the files together
} || {
comma=""
@ -77,7 +77,7 @@ if [ "$QUERY" == 'myself' ]; then
echo -n "{\"myself\":{\"hostname\":\"$hostname\",\"ip6\":\"$ip6\",\"ip4\":\"$ip4\",\"net6\":\"$cidr6\",\"net4\":\"$cidr4\"}}"
exit 0
fi
if [ "$QUERY" == 'info' ]; then
echo -n '{ "info": [ '
print_query status
@ -100,7 +100,12 @@ if [ "$QUERY" == 'neighbours' ]; then
fi
if [ "$QUERY" == 'tunnels' ]; then
bmx6 -c --jshow tunnels /r=0
tunnels=$(bmx6 -c --jshow tunnels /r=0)
if [ -z $tunnels ]; then
echo '{ "tunnels" : [] }'
else
echo $tunnels
fi
exit 0
fi