Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #431 from rogerpueyo/p4u/luci-app-bmx7/refactory

Browse source 
Fix bmx7-info indentation and "$info" call
This commit is contained in:
Pau 2018-12-07 18:44:19 +01:00 committed by GitHub
commit 3264d15492
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
luci-app-bmx7/files/www/cgi-bin/bmx7-info
View file

@ -34,7 +34,6 @@ else
QUERY="${QUERY_STRING%%=*}" QUERY="${QUERY_STRING%%=*}"
echo "Content-type: application/json" echo "Content-type: application/json"
echo "" echo ""
fi fi
check_path() { check_path() {
@ -83,7 +82,7 @@ print_query() {
} }
# If the query is a file, just printing the file # If the query is a file, just printing the file
[ -f "$BMX7_DIR/$1" ] && cat "$BMX7_DIR/$1"; [ -f "$BMX7_DIR/$1" ] && [ -s "$BMX7_DIR/$1" ] && cat "$BMX7_DIR/$1" && return 0 || return 1
} }
if [ "${QUERY##*/}" == "all" ]; then if [ "${QUERY##*/}" == "all" ]; then
@ -95,10 +94,8 @@ if [ "$QUERY" == '$info' ]; then
echo '{ "info": [ ' echo '{ "info": [ '
print_query status print_query status
echo -n "," echo -n ","
print_query interfaces print_query interfaces && echo -n "," || echo -n '{ "interfaces": "" },'
echo -n "," print_query links && echo -n "," || echo -n '{ "links": "" },'
print_query links
echo -n ","
print_mem print_mem
echo "] }" echo "] }"
fi fi