luci-app-bmx7: fix bmx7-info script's "$info" call

[feed/routing.git] / luci-app-bmx7 / files / www / cgi-bin / bmx7-info

diff --git a/luci-app-bmx7/files/www/cgi-bin/bmx7-info b/luci-app-bmx7/files/www/cgi-bin/bmx7-info
index c3f4418ac4b4bbce44446b04f4352ab1508a2b05..7388ed12c37e384fadab3e5a8c969d5e2ab78a51 100755 (executable)
--- a/luci-app-bmx7/files/www/cgi-bin/bmx7-info
+++ b/luci-app-bmx7/files/www/cgi-bin/bmx7-info
@@ -82,7 +82,7 @@ print_query() {
        }
 
        # 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
@@ -94,10 +94,8 @@ if [ "$QUERY" == '$info' ]; then
        echo '{ "info": [ '
        print_query status
        echo -n ","
-       print_query interfaces
-       echo -n ","
-       print_query links
-       echo -n ","
+       print_query interfaces && echo -n "," || echo -n '{ "interfaces": "" },'
+       print_query links && echo -n "," || echo -n '{ "links": "" },'
        print_mem
        echo "] }"
 fi