From c7c14aaad36bb3d12dbcc826904154a1bc73c713 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 29 Aug 2017 11:10:48 +0200 Subject: [PATCH] wwan: Double quote to prevent globbing and word splitting Fix some shellcheck warnings. Signed-off-by: Florian Eckert [bump PKG_RELEASE] Signed-off-by: Jo-Philipp Wich --- package/network/utils/wwan/Makefile | 2 +- package/network/utils/wwan/files/wwan.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/network/utils/wwan/Makefile b/package/network/utils/wwan/Makefile index fddfe4054a..bb829b5e2c 100644 --- a/package/network/utils/wwan/Makefile +++ b/package/network/utils/wwan/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wwan PKG_VERSION:=2019-04-29 -PKG_RELEASE=3 +PKG_RELEASE=4 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:= diff --git a/package/network/utils/wwan/files/wwan.sh b/package/network/utils/wwan/files/wwan.sh index 4843b1dd47..1ffb94a92b 100755 --- a/package/network/utils/wwan/files/wwan.sh +++ b/package/network/utils/wwan/files/wwan.sh @@ -77,10 +77,10 @@ proto_wwan_setup() { json_set_namespace wwan old_cb json_init - json_load "$(cat $usb)" + json_load "$(cat "$usb")" json_select json_get_vars desc control data - json_set_namespace $old_cb + json_set_namespace "$old_cb" [ -n "$control" -a -n "$data" ] && { ttys=$(ls -d /sys/bus/usb/devices/$devicename/${devicename}*/tty?* /sys/bus/usb/devices/$devicename/${devicename}*/tty/tty?* | sed "s/.*\///g" | tr "\n" " ") @@ -115,9 +115,9 @@ proto_wwan_setup() { return 1 } - uci_set_state network $interface driver "$driver" - uci_set_state network $interface ctl_device "$ctl_device" - uci_set_state network $interface dat_device "$dat_device" + uci_set_state network "$interface" driver "$driver" + uci_set_state network "$interface" ctl_device "$ctl_device" + uci_set_state network "$interface" dat_device "$dat_device" case $driver in qmi_wwan) proto_qmi_setup $@ ;; @@ -130,9 +130,9 @@ proto_wwan_setup() { proto_wwan_teardown() { local interface=$1 - local driver=$(uci_get_state network $interface driver) - ctl_device=$(uci_get_state network $interface ctl_device) - dat_device=$(uci_get_state network $interface dat_device) + local driver=$(uci_get_state network "$interface" driver) + ctl_device=$(uci_get_state network "$interface" ctl_device) + dat_device=$(uci_get_state network "$interface" dat_device) case $driver in qmi_wwan) proto_qmi_teardown $@ ;; -- 2.25.1