[pisa-src] r918 - trunk/tools

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Wed, 02 Sep 2009 18:36:52 +0200

Author: biurrun
Date: Wed Sep  2 18:36:52 2009
New Revision: 918

Log:
Fix incorrectly converted bashism: '((i=i+2))' does a variable assignment so
it should not be converted to '$((i=i+2))' but to 'i=$(($i+2))'.

Modified:
   trunk/tools/switch-ip
   trunk/tools/switch-ip.bareasus
   trunk/tools/switch-ip.owrtasus

Modified: trunk/tools/switch-ip
==============================================================================
--- trunk/tools/switch-ip       Wed Sep  2 17:23:03 2009        (r917)
+++ trunk/tools/switch-ip       Wed Sep  2 18:36:52 2009        (r918)
@@ -135,50 +135,50 @@
     -i )
       echo "my wireless interface = ${optarr[$(($i+1))]}"
       IFWLAN=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --myip1 )
       echo "my IP address for the 1st AP = ${optarr[$(($i+1))]}"
       MYIP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --myip2 )
       echo "my IP address for the 2nd AP = ${optarr[$(($i+1))]}"
       MYIP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apip1 )
       echo "1st AP's IP address = ${optarr[$(($i+1))]}"
       APIP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apip2 )
       echo "2nd AP's IP address = ${optarr[$(($i+1))]}"
       APIP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apmac1 )
       echo "1st AP's MAC address = ${optarr[$(($i+1))]}"
       MAC_ADDR_AP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apmac2 )
       echo "2nd AP's MAC address = ${optarr[$(($i+1))]}"
       MAC_ADDR_AP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apssid1 )
       echo "1st AP's SSID = ${optarr[$(($i+1))]}"
       APSSID1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apssid2 )
       echo "2nd AP's SSID = ${optarr[$(($i+1))]}"
       APSSID2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
-    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; $((i=$i+1));;
-    -- ) $(($i+1)); break;;
+    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; i=$(($i+1));;
+    -- ) i=$(($i+1)); echo $i; break;;
     * ) usage; exit 1;;
   esac
 done

Modified: trunk/tools/switch-ip.bareasus
==============================================================================
--- trunk/tools/switch-ip.bareasus      Wed Sep  2 17:23:03 2009        (r917)
+++ trunk/tools/switch-ip.bareasus      Wed Sep  2 18:36:52 2009        (r918)
@@ -129,50 +129,50 @@
     -i )
       echo "my wireless interface = ${optarr[$(($i+1))]}"
       IFWLAN=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --myip1 )
       echo "my IP address for the 1st AP = ${optarr[$(($i+1))]}"
       MYIP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --myip2 )
       echo "my IP address for the 2nd AP = ${optarr[$(($i+1))]}"
       MYIP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apip1 )
       echo "1st AP's IP address = ${optarr[$(($i+1))]}"
       APIP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apip2 )
       echo "2nd AP's IP address = ${optarr[$(($i+1))]}"
       APIP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apmac1 )
       echo "1st AP's MAC address = ${optarr[$(($i+1))]}"
       MAC_ADDR_AP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apmac2 )
       echo "2nd AP's MAC address = ${optarr[$(($i+1))]}"
       MAC_ADDR_AP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apssid1 )
       echo "1st AP's SSID = ${optarr[$(($i+1))]}"
       APSSID1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apssid2 )
       echo "2nd AP's SSID = ${optarr[$(($i+1))]}"
       APSSID2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
-    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; $((i=$i+1));;
-    -- ) $(($i+1)); break;;
+    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; i=$(($i+1));;
+    -- ) i=$(($i+1)); break;;
     * ) usage; exit 1;;
   esac
 done

Modified: trunk/tools/switch-ip.owrtasus
==============================================================================
--- trunk/tools/switch-ip.owrtasus      Wed Sep  2 17:23:03 2009        (r917)
+++ trunk/tools/switch-ip.owrtasus      Wed Sep  2 18:36:52 2009        (r918)
@@ -129,50 +129,50 @@
     -i )
       echo "my wireless interface = ${optarr[$(($i+1))]}"
       IFWLAN=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --myip1 )
       echo "my IP address for the 1st AP = ${optarr[$(($i+1))]}"
       MYIP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --myip2 )
       echo "my IP address for the 2nd AP = ${optarr[$(($i+1))]}"
       MYIP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apip1 )
       echo "1st AP's IP address = ${optarr[$(($i+1))]}"
       APIP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apip2 )
       echo "2nd AP's IP address = ${optarr[$(($i+1))]}"
       APIP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apmac1 )
       echo "1st AP's MAC address = ${optarr[$(($i+1))]}"
       MAC_ADDR_AP1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apmac2 )
       echo "2nd AP's MAC address = ${optarr[$(($i+1))]}"
       MAC_ADDR_AP2=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apssid1 )
       echo "1st AP's SSID = ${optarr[$(($i+1))]}"
       APSSID1=${optarr[$(($i+1))]}
-      $((i=$i+2))
+      i=$(($i+2))
       ;;
     --apssid2 )
       echo "2nd AP's SSID = ${optarr[$(($i+1))]}"
       APSSID2=${optarr[$(($i+1))]}
-      $((i=i+2))
+      i=$((i+2))
       ;;
-    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; $((i=$i+1));;
-    -- ) $(($i+1)); break;;
+    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; i=$(($i+1));;
+    -- ) i=$(($i+1)); break;;
     * ) usage; exit 1;;
   esac
 done

Other related posts:

  • » [pisa-src] r918 - trunk/tools - Diego Biurrun