ar71xx: avoid AR71XX_MODEL ending with a space on some TP-LINK-like devices

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
This commit is contained in:
John Crispin 2016-04-01 07:11:56 +00:00
parent dfed41d3d8
commit 85c540b94e

View file

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