ar71xx: avoid AR71XX_MODEL ending with a space on some TP-LINK-like devices
authorJohn Crispin <john@openwrt.org>
Fri, 1 Apr 2016 07:11:56 +0000 (07:11 +0000)
committerJohn Crispin <john@openwrt.org>
Fri, 1 Apr 2016 07:11:56 +0000 (07:11 +0000)
Instead of adding the space when combining $model and $hwver, add the space
to the beginning of $hwver, so the resulting string won't end with a space
when $hwver is set to the empty string.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 49106

target/linux/ar71xx/base-files/lib/ar71xx.sh

index 0d1405a..1822998 100755 (executable)
@@ -99,7 +99,7 @@ tplink_board_detect() {
        hwid=$(tplink_get_hwid)
        mid=$(tplink_get_mid)
        hwver=${hwid:6:2}
-       hwver="v${hwver#0}"
+       hwver=" v${hwver#0}"
 
        case "$hwid" in
        "015000"*)
@@ -171,8 +171,8 @@ tplink_board_detect() {
        "083000"*)
                model="TP-Link TL-WA830RE"
 
-               if [ "$hwver" = 'v10' ]; then
-                       hwver='v1'
+               if [ "$hwver" = ' v10' ]; then
+                       hwver=' v1'
                fi
                ;;
        "084100"*)
@@ -277,7 +277,7 @@ tplink_board_detect() {
                ;;
        esac
 
-       AR71XX_MODEL="$model $hwver"
+       AR71XX_MODEL="$model$hwver"
 }
 
 tplink_pharos_get_model_string() {