From c5fafc93672dd017af827c4def7f8c8a338368cb Mon Sep 17 00:00:00 2001
From: Shibby <shibby@openlinksys.info>
Date: Thu, 21 Feb 2013 09:18:28 +0100
Subject: [PATCH] 3G Modem: fix switch3g script

---
 release/src/router/others/switch3g | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/release/src/router/others/switch3g b/release/src/router/others/switch3g
index bca3230b26..46618875b2 100755
--- a/release/src/router/others/switch3g
+++ b/release/src/router/others/switch3g
@@ -4,7 +4,7 @@
 # Copyright (C) 2011 shibby
 #
 
-LOCK=`/tmp/switch3g.lock`
+LOCK="/tmp/switch3g.lock"
 if [ -f $LOCK ]; then #lock exist
     logger 3G MODEM - previous proces of switch3g still working
     exit 0
@@ -14,9 +14,6 @@ PIN=`nvram get modem_pin`
 IS_PIN=`nvram get modem_pin | wc -w`
 DEVNR=`nvram get modem_dev`
 
-#run process
-echo "1" > /tmp/switch3g.lock
-
 # is modem ready?
 DEV0=`cat /proc/bus/usb/devices | grep Driver | grep cdc_acm | wc -l`
 DEV1=`cat /proc/bus/usb/devices | grep Driver | grep option | wc -l`
@@ -29,7 +26,7 @@ if [ "$DEV0" -gt 0 ]; then
     if [ "$IS_PIN" == "1" ]; then
         echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
     fi
-    rm /tmp/switch3g.lock
+    rm $LOCK
     break;
 elif [ "$DEV1" -gt 0 ]; then
     logger 3G MODEM already found - using option module
@@ -37,7 +34,7 @@ elif [ "$DEV1" -gt 0 ]; then
     if [ "$IS_PIN" == "1" ]; then
         echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
     fi
-    rm /tmp/switch3g.lock
+    rm $LOCK
     break;
 elif [ "$DEV2" -gt 0 ]; then
     logger 3G MODEM already found - using sierra module
@@ -45,7 +42,7 @@ elif [ "$DEV2" -gt 0 ]; then
     if [ "$IS_PIN" == "1" ]; then
         echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
     fi
-    rm /tmp/switch3g.lock
+    rm $LOCK
     break;
 elif [ "$DEV3" -gt 0 ]; then
     logger 3G MODEM already found - using usbserial module
@@ -53,7 +50,7 @@ elif [ "$DEV3" -gt 0 ]; then
     if [ "$IS_PIN" == "1" ]; then
         echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
     fi
-    rm /tmp/switch3g.lock
+    rm $LOCK
     break;
 else
     #modem not found, try detect
@@ -99,7 +96,7 @@ else
         if [ "$IS_PIN" == "1" ]; then
             echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
         fi
-        rm /tmp/switch3g.lock
+        rm $LOCK
         break;
     elif [ "$DEV1" -gt 0 ]; then
         logger 3G MODEM ready - using option module
@@ -107,7 +104,7 @@ else
         if [ "$IS_PIN" == "1" ]; then
             echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
         fi
-        rm /tmp/switch3g.lock
+        rm $LOCK
         break;
     elif [ "$DEV2" -gt 0 ]; then
         logger 3G MODEM ready - using sierra module
@@ -115,7 +112,7 @@ else
         if [ "$IS_PIN" == "1" ]; then
             echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
         fi
-        rm /tmp/switch3g.lock
+        rm $LOCK
         break;
     else
         logger 3G MODEM not found by cdc-acm, option or sierra module. Trying usbserial ...
@@ -142,7 +139,7 @@ else
             if [ "$IS_PIN" == "1" ]; then
                 echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
             fi
-            rm /tmp/switch3g.lock
+            rm $LOCK
             break;
         elif [ -f /tmp/3g.detect ]; then
             VENDOR=`cat /tmp/3g.detect | cut -d ":" -f1`
@@ -158,7 +155,7 @@ else
                     if [ "$IS_PIN" == "1" ]; then
                         echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
                     fi
-                    rm /tmp/switch3g.lock
+                    rm $LOCK
                     break;
                 else
                     logger 3G MODEM - loading module
@@ -169,7 +166,7 @@ else
                     if [ "$IS_PIN" == "1" ]; then
                         echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
                     fi
-                    rm /tmp/switch3g.lock
+                    rm $LOCK
                     break;
                 fi
             fi
@@ -191,7 +188,7 @@ else
                         if [ "$IS_PIN" == "1" ]; then
                             echo -e "AT+CPIN=$PIN\r" > /dev/$DEVNR
                         fi
-                        rm /tmp/switch3g.lock
+                        rm $LOCK
                         break;
                     else
                         NO=1
@@ -209,4 +206,4 @@ fi
 fi
 
 #remove lock
-rm /tmp/switch3g.lock
+rm $LOCK
-- 
2.11.4.GIT