uqmi: replace legacy command invoke with newer type

[openwrt/openwrt.git] / package / network / utils / uqmi / files / lib / netifd / proto / qmi.sh

diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
index 35de6c5ad5eb6059336eaf436cf7ba67b2415e68..6f11933a9e510ca18b9339528a561e2e75819fda 100755 (executable)
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -69,7 +69,7 @@ proto_qmi_setup() {
        done
 
        [ -n "$pincode" ] && {
-               uqmi -s -d "$device" --verify-pin1 "$pincode" || {
+               uqmi -s -d "$device" --verify-pin1 "$pincode" || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" || {
                        echo "Unable to verify PIN"
                        proto_notify_error "$interface" PIN_FAILED
                        proto_block_restart "$interface"
@@ -109,7 +109,7 @@ proto_qmi_setup() {
 
        echo "Starting network $interface"
 
-       pdptype=`echo "$pdptype" | awk '{print tolower($0)}'`
+       pdptype=$(echo "$pdptype" | awk '{print tolower($0)}')
        [ "$pdptype" = "ip" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] || pdptype="ip"
 
        if [ "$pdptype" = "ip" ]; then
@@ -120,7 +120,7 @@ proto_qmi_setup() {
        fi
 
        [ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && {
-               cid_4=`uqmi -s -d "$device" --get-client-id wds`
+               cid_4=$(uqmi -s -d "$device" --get-client-id wds)
                [ $? -ne 0 ] && {
                        echo "Unable to obtain client ID"
                        proto_notify_error "$interface" NO_CID
@@ -134,14 +134,14 @@ proto_qmi_setup() {
                        --stop-network 0xffffffff \
                        --autoconnect > /dev/null
 
-               pdh_4=`uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
+               pdh_4=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
                        --start-network \
                        ${apn:+--apn $apn} \
                        ${profile:+--profile $profile} \
                        ${auth:+--auth-type $auth} \
                        ${username:+--username $username} \
                        ${password:+--password $password} \
-                       ${autoconnect:+--autoconnect}`
+                       ${autoconnect:+--autoconnect})
                [ $? -ne 0 ] && {
                        echo "Unable to connect IPv4"
                        uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds
@@ -151,7 +151,7 @@ proto_qmi_setup() {
        }
 
        [ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && {
-               cid_6=`uqmi -s -d "$device" --get-client-id wds`
+               cid_6=$(uqmi -s -d "$device" --get-client-id wds)
                [ $? -ne 0 ] && {
                        echo "Unable to obtain client ID"
                        proto_notify_error "$interface" NO_CID
@@ -165,14 +165,14 @@ proto_qmi_setup() {
                        --stop-network 0xffffffff \
                        --autoconnect > /dev/null
 
-               pdh_6=`uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
+               pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
                        --start-network \
                        ${apn:+--apn $apn} \
                        ${profile:+--profile $profile} \
                        ${auth:+--auth-type $auth} \
                        ${username:+--username $username} \
                        ${password:+--password $password} \
-                       ${autoconnect:+--autoconnect}`
+                       ${autoconnect:+--autoconnect})
                [ $? -ne 0 ] && {
                        echo "Unable to connect IPv6"
                        uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds