ar71xx: base-files: cleanups in etc/diag.sh

This includes:

- code style fixes
- use of local 'board' variable in LED names, wherever possible

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 6ce49b0e9bbf7b574400106e2e9e7e87b47916ae..5c43443139200bc34b8a6fddaab74cbd86c8726b 100644 (file)
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -5,7 +5,9 @@
 . /lib/ar71xx.sh
 
 get_status_led() {
-       case $(ar71xx_board_name) in
+       local board=$(ar71xx_board_name)
+
+       case $board in
        alfa-nx)
                status_led="alfa:green:led_8"
                ;;
@@ -13,16 +15,16 @@ get_status_led() {
                status_led="eap7660d:green:ds4"
                ;;
        antminer-s1)
-               status_led="antminer-s1:green:system"
+               status_led="$board:green:system"
                ;;
        antminer-s3)
-               status_led="antminer-s3:green:system"
+               status_led="$board:green:system"
                ;;
        antminer-r1)
-               status_led="antminer-r1:green:system"
+               status_led="$board:green:system"
                ;;
        ap132)
-               status_led="ap132:green:status"
+               status_led="$board:green:status"
                ;;
        ap136-010|\
        ap136-020)
@@ -35,21 +37,27 @@ get_status_led() {
                status_led="ap135:green:status"
                ;;
        ap81)
-               status_led="ap81:green:status"
+               status_led="$board:green:status"
                ;;
        ap83)
-               status_led="ap83:green:power"
+               status_led="$board:green:power"
                ;;
        ap96)
-               status_led="ap96:green:led2"
+               status_led="$board:green:led2"
                ;;
        aw-nr580)
-               status_led="aw-nr580:green:ready"
+               status_led="$board:green:ready"
                ;;
        bsb)
-               status_led="bsb:red:sys"
-               ;;
-       bullet-m | rocket-m | rocket-m-xw | nano-m | nanostation-m | nanostation-m-xw | loco-m-xw)
+               status_led="$board:red:sys"
+               ;;
+       bullet-m|\
+       rocket-m|\
+       rocket-m-xw|\
+       nano-m|\
+       nanostation-m|\
+       nanostation-m-xw|\
+       loco-m-xw)
                status_led="ubnt:green:link4"
                ;;
        rocket-m-ti)
@@ -62,13 +70,13 @@ get_status_led() {
                status_led="pcs:green:power"
                ;;
        c-55)
-               status_led="c-55:green:pwr"
+               status_led="$board:green:pwr"
                ;;
        cap4200ag)
                status_led="senao:green:pwr"
                ;;
        cf-e316n-v2)
-               status_led="$(ar71xx_board_name):blue:wan"
+               status_led="$board:blue:wan"
                ;;
        cpe510)
                status_led="tp-link:green:link4"
@@ -80,14 +88,14 @@ get_status_led() {
                status_led="pcs:amber:power"
                ;;
        db120)
-               status_led="db120:green:status"
+               status_led="$board:green:status"
                ;;
-       dgl-5500-a1 |\
+       dgl-5500-a1|\
        dhp-1565-a1|\
-       dir-505-a1 |\
-       dir-600-a1 |\
-       dir-615-e1 |\
-       dir-615-i1 |\
+       dir-505-a1|\
+       dir-600-a1|\
+       dir-615-e1|\
+       dir-615-i1|\
        dir-615-e4)
                status_led="d-link:green:power"
                ;;
@@ -97,7 +105,7 @@ get_status_led() {
        dir-825-b1)
                status_led="d-link:orange:power"
                ;;
-       dir-825-c1 |\
+       dir-825-c1|\
        dir-835-a1)
                status_led="d-link:amber:power"
                ;;
@@ -111,25 +119,26 @@ get_status_led() {
                status_led="devolo:status:wlan"
                ;;
        dr344)
-               status_led="dr344:green:status"
+               status_led="$board:green:status"
                ;;
        dr531)
-               status_led="dr531:green:sig4"
+               status_led="$board:green:sig4"
                ;;
        dragino2)
-               status_led="dragino2:red:system"
+               status_led="$board:red:system"
                ;;
        eap300v2)
                status_led="engenius:blue:power"
                ;;
        eap7660d)
-               status_led="eap7660d:green:ds4"
+               status_led="$board:green:ds4"
                ;;
-       el-mini | \
+       el-mini|\
        el-m150)
                status_led="easylink:green:system"
                ;;
-       ew-dorin | ew-dorin-router)
+       ew-dorin|\
+       ew-dorin-router)
                status_led="dorin:green:status"
                ;;
        f9k1115v2)
@@ -139,10 +148,10 @@ get_status_led() {
                status_led="gl-connect:green:lan"
                ;;
        epg5000)
-               status_led="epg5000:amber:power"
+               status_led="$board:amber:power"
                ;;
        esr1750)
-               status_led="esr1750:amber:power"
+               status_led="$board:amber:power"
                ;;
        esr900)
                status_led="engenius:amber:power"
@@ -150,16 +159,16 @@ get_status_led() {
        hiwifi-hc6361)
                status_led="hiwifi:blue:system"
                ;;
-       hornet-ub | \
+       hornet-ub|\
        hornet-ub-x2)
                status_led="alfa:blue:wps"
                ;;
-       ja76pf | \
+       ja76pf|\
        ja76pf2)
                status_led="jjplus:green:led1"
                ;;
        jwap230)
-               status_led="jwap230:green:led1"
+               status_led="$board:green:led1"
                ;;
        ls-sr71)
                status_led="ubnt:green:d22"
@@ -168,36 +177,36 @@ get_status_led() {
                status_led="mercury:green:system"
                ;;
        mr12)
-               status_led="mr12:green:power"
+               status_led="$board:green:power"
                ;;
        mr16)
-               status_led="mr16:green:power"
+               status_led="$board:green:power"
                ;;
        mr18)
-               status_led="mr18:green:tricolor0"
+               status_led="$board:green:tricolor0"
                ;;
        mr600)
-               status_led="mr600:orange:power"
+               status_led="$board:orange:power"
                ;;
        mr600v2)
                status_led="mr600:blue:power"
                ;;
-       mr1750 | \
+       mr1750|\
        mr1750v2)
                status_led="mr1750:blue:power"
                ;;
-       mr900 | \
+       mr900|\
        mr900v2)
                status_led="mr900:blue:power"
                ;;
-       mynet-n600 | \
+       mynet-n600|\
        mynet-n750)
                status_led="wd:blue:power"
                ;;
        mynet-rext)
                status_led="wd:blue:power"
                ;;
-       mzk-w04nu | \
+       mzk-w04nu|\
        mzk-w300nh)
                status_led="planex:green:status"
                ;;
@@ -205,24 +214,24 @@ get_status_led() {
                status_led="nbg460n:green:power"
                ;;
        nbg6616)
-               status_led="nbg6616:green:power"
+               status_led="$board:green:power"
                ;;
        nbg6716)
-               status_led="nbg6716:white:power"
+               status_led="$board:white:power"
                ;;
-       om2p | \
-       om2pv2 | \
-       om2p-hs | \
-       om2p-hsv2 | \
-       om2p-hsv3 | \
+       om2p|\
+       om2pv2|\
+       om2p-hs|\
+       om2p-hsv2|\
+       om2p-hsv3|\
        om2p-lc)
                status_led="om2p:blue:power"
                ;;
-       om5p | \
+       om5p|\
        om5p-an)
                status_led="om5p:blue:power"
                ;;
-       om5p-ac | \
+       om5p-ac|\
        om5p-acv2)
                status_led="om5pac:blue:power"
                ;;
@@ -236,14 +245,20 @@ get_status_led() {
                status_led="onion:amber:system"
                ;;
        pb44)
-               status_led="pb44:amber:jump1"
+               status_led="$board:amber:jump1"
                ;;
        rb-2011l|\
        rb-2011uas|\
        rb-2011uas-2hnd)
                status_led="rb:green:usr"
                ;;
-       rb-411 | rb-411u | rb-433 | rb-433u | rb-450 | rb-450g | rb-493)
+       rb-411|\
+       rb-411u|\
+       rb-433|\
+       rb-433u|\
+       rb-450|\
+       rb-450g|\
+       rb-493)
                status_led="rb4xx:yellow:user"
                ;;
        rb-750)
@@ -263,20 +278,21 @@ get_status_led() {
        rb-sxt5n)
                status_led="rb:green:power"
                ;;
-       routerstation | routerstation-pro)
+       routerstation|\
+       routerstation-pro)
                status_led="ubnt:green:rf"
                ;;
        rw2458n)
-               status_led="rw2458n:green:d3"
+               status_led="$board:green:d3"
                ;;
        smart-300)
                status_led="nc-link:green:system"
                ;;
        minibox-v1)
-               status_led="minibox-v1:green:system"
+               status_led="$board:green:system"
                ;;
        oolite)
-               status_led="oolite:red:system"
+               status_led="$board:red:system"
                ;;
        qihoo-c301)
                status_led="qihoo:green:status"
@@ -285,10 +301,10 @@ get_status_led() {
                status_led="tellstick:white:system"
                ;;
        som9331)
-               status_led="som9331:green:system"
+               status_led="$board:green:system"
                ;;
        tew-632brp)
-               status_led="tew-632brp:green:status"
+               status_led="$board:green:status"
                ;;
        tew-673gru)
                status_led="trendnet:blue:wps"
@@ -310,45 +326,45 @@ get_status_led() {
        tl-wa860re)
                status_led="tp-link:green:power"
                ;;
-       tl-mr3220 | \
-       tl-mr3220-v2 | \
-       tl-mr3420 | \
-       tl-mr3420-v2 | \
-       tl-wa701nd-v2 | \
-       tl-wa801nd-v2 | \
-       tl-wa901nd | \
-       tl-wa901nd-v2 | \
-       tl-wa901nd-v3 | \
-       tl-wa901nd-v4 | \
-       tl-wdr3320-v2 | \
-       tl-wdr3500 | \
-       tl-wr1041n-v2 | \
-       tl-wr1043nd | \
-       tl-wr1043nd-v2 | \
-       tl-wr741nd | \
-       tl-wr741nd-v4 | \
-       tl-wr841n-v1 | \
-       tl-wr841n-v7 | \
-       tl-wr841n-v8 | \
-       tl-wr841n-v11 | \
-       tl-wa830re-v2 | \
-       tl-wr842n-v2 | \
-       tl-wr842n-v3 | \
-       tl-wr941nd | \
+       tl-mr3220|\
+       tl-mr3220-v2|\
+       tl-mr3420|\
+       tl-mr3420-v2|\
+       tl-wa701nd-v2|\
+       tl-wa801nd-v2|\
+       tl-wa901nd|\
+       tl-wa901nd-v2|\
+       tl-wa901nd-v3|\
+       tl-wa901nd-v4|\
+       tl-wdr3320-v2|\
+       tl-wdr3500|\
+       tl-wr1041n-v2|\
+       tl-wr1043nd|\
+       tl-wr1043nd-v2|\
+       tl-wr741nd|\
+       tl-wr741nd-v4|\
+       tl-wr841n-v1|\
+       tl-wr841n-v7|\
+       tl-wr841n-v8|\
+       tl-wr841n-v11|\
+       tl-wa830re-v2|\
+       tl-wr842n-v2|\
+       tl-wr842n-v3|\
+       tl-wr941nd|\
        tl-wr941nd-v5)
                status_led="tp-link:green:system"
                ;;
-       archer-c5 | \
-       archer-c7 | \
-       tl-wdr4900-v2 | \
-       tl-mr10u | \
-       tl-mr12u | \
-       tl-mr13u | \
-       tl-wdr4300 | \
-       tl-wr703n | \
-       tl-wr710n | \
-       tl-wr720n-v3 | \
-       tl-wr810n | \
+       archer-c5|\
+       archer-c7|\
+       tl-wdr4900-v2|\
+       tl-mr10u|\
+       tl-mr12u|\
+       tl-mr13u|\
+       tl-wdr4300|\
+       tl-wr703n|\
+       tl-wr710n|\
+       tl-wr720n-v3|\
+       tl-wr810n|\
        tl-wr941nd-v6)
                status_led="tp-link:blue:system"
                ;;
@@ -367,72 +383,73 @@ get_status_led() {
        unifi)
                status_led="ubnt:green:dome"
                ;;
-       uap-pro | \
-       unifiac-lite | \
+       uap-pro|\
+       unifiac-lite|\
        unifiac-pro)
                status_led="ubnt:white:dome"
                ;;
        unifi-outdoor-plus)
                status_led="ubnt:white:front"
                ;;
-       airgateway | \
+       airgateway|\
        airgatewaypro)
                status_led="ubnt:white:status"
                ;;
-       whr-g301n | \
-       whr-hp-g300n | \
-       whr-hp-gn | \
+       whr-g301n|\
+       whr-hp-g300n|\
+       whr-hp-gn|\
        wzr-hp-g300nh)
                status_led="buffalo:green:router"
                ;;
        wlae-ag300n)
                status_led="buffalo:green:status"
                ;;
-       wzr-hp-ag300h | \
+       wzr-hp-ag300h|\
        wzr-hp-g300nh2)
                status_led="buffalo:red:diag"
                ;;
-       r6100 | \
-       wndap360 | \
-       wndr3700 | \
-       wndr3700v4 | \
-       wndr4300 | \
-       wnr2000 | \
-       wnr2000-v3 |\
-       wnr2200 |\
-       wnr612-v2 |\
-       wnr1000-v2 |\
+       r6100|\
+       wndap360|\
+       wndr3700|\
+       wndr3700v4|\
+       wndr4300|\
+       wnr2000|\
+       wnr2000-v3|\
+       wnr2200|\
+       wnr612-v2|\
+       wnr1000-v2|\
        wpn824n)
                status_led="netgear:green:power"
                ;;
        wp543)
-               status_led="wp543:green:diag"
+               status_led="$board:green:diag"
                ;;
        wpj342)
-               status_led="wpj342:green:sig3"
+               status_led="$board:green:sig3"
                ;;
        wpj344)
-               status_led="wpj344:green:status"
+               status_led="$board:green:status"
                ;;
        wpj531)
-               status_led="wpj531:green:sig3"
+               status_led="$board:green:sig3"
                ;;
        wpj558)
-               status_led="wpj558:green:sig3"
+               status_led="$board:green:sig3"
                ;;
        wrt400n)
-               status_led="wrt400n:blue:wps"
+               status_led="$board:blue:wps"
                ;;
        wrt160nl)
-               status_led="wrt160nl:blue:wps"
+               status_led="$board:blue:wps"
                ;;
        z1)
-               status_led="z1:green:tricolor0"
+               status_led="$board:green:tricolor0"
                ;;
        zbt-we1526)
-               status_led="zbt-we1526:green:status"
+               status_led="$board:green:status"
                ;;
-       zcn-1523h-2 | zcn-1523h-5)
+       zcn-1523h-2|\
+       zcn-1523h-5)
                status_led="zcn-1523h:amber:init"
                ;;
        wlr8100)