Do not make device checks when firmware SKU # is specified

1 files changed, 26 insertions, 17 deletions

diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.1/mlinux-switch-apn b/recipes-core/mlinux-scripts/mlinux-scripts-1.1/mlinux-switch-apn
index b73c699..8a70036 100755
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.1/mlinux-switch-apn
+++ b/recipes-core/mlinux-scripts/mlinux-scripts-1.1/mlinux-switch-apn
@@ -20,40 +20,49 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+lna3_chat_file=/etc/ppp/peers/lna3_chat
 function usage {
     echo "$(basename $0) [firmware image SKU]"
     echo "The firmware image SKU is optional."
-    echo "If not specified, the image SKU is queried."
+    echo "If not specified, the image SKU is queried (recommended)."
     echo "Current valid SKU's are 0 and 1"
     echo "Only LE910-NA1 is supported"
     exit 1
 }
-((query=0))
-lna3_chat_file=/etc/ppp/peers/lna3_chat
-model=$(radio-query --model 2>/dev/null)
-if [[ $model != "LE910-NA1" ]] ; then
-  # Nothing to do
-  exit 0
-fi
 
-fw="$1"
+if (($# > 0)) ; then
+    fw="$1"
 
-if [[ fw =~ ^[0-9]+$ ]] ; then
-    if ((fw < 0)) || ((fw > 1)) ; then
-        usage
+    if [[ fw =~ ^[0-9]+$ ]] ; then
+        if ((fw < 0)) || ((fw > 1)) ; then
+            usage
+        fi
+    else
+        if ((fw > 1))  || ((fw < 0)) ; then
+            echo "Invalid firmware SKU value"
+            usage
+        fi
     fi
 else
-    if ((${#fw} > 0)) ; then
-       echo "Invalid SKU character"
-       usage
+
+    ((query=0))
+    lna3_chat_file=/etc/ppp/peers/lna3_chat
+    model=$(radio-query --model 2>/dev/null)
+    if [[ $model != "LE910-NA1" ]] ; then
+    # Nothing to do
+        exit 0
+    fi
+    fw=$(radio-query --active-firmware 2>/dev/null) || ((fw=-1))
+    if ((fw == -1)) ; then
+        echo Active firmware query failed.
+        echo Assuming firmware 1
     fi
-    fw=$(radio-query --active-fw 2>/dev/null) || ((fw=-1))
 fi
 
 if (( fw == 1 )) ; then
     # Verizon is active, so comment out the APN
     echo "Temporarily commenting out APN, since Verizon is active and no APN is allowed in a Verizon chat file."
-    sed -r -i "s/^(OK\s+'AT\+CGDCONT=3,\"IPV4V6\",\"[^\"]*\"'$)/#comment by mlinux-set-apn \1/" $lna3_chat_file
+    sed -r -i "s/^(OK\s+'AT\+CGDCONT=3,\"[^\"]*\",\"[^\"]*\"'$)/#comment by mlinux-set-apn \1/" $lna3_chat_file
 else
     # Set non-Verizon APN in chat file
     # if sed -r -i "s/^(#comment by mlinux-set-apn )* OK\s+'AT\+CGDCONT=3,\"IPV4V6\",\"[^\"]*\"'$/OK 'AT\+CGDCONT=3,\"IPV4V6\",\"${apn}\"'/" $lna3_chat_file ; then