[pisa-src] r909 - trunk/tools

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Wed, 02 Sep 2009 16:01:19 +0200

Author: biurrun
Date: Wed Sep  2 16:01:19 2009
New Revision: 909

Log:
Use POSIX-compatible '$(( ))' instead of bash-specific '(( ))'
constructs for arithmetic operations.

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 15:57:20 2009        (r908)
+++ trunk/tools/switch-ip       Wed Sep  2 16:01:19 2009        (r909)
@@ -133,52 +133,52 @@
   case ${optarr[$i]} in
     -h | --help ) usage; exit 0;;
     -i )
-      echo "my wireless interface = ${optarr[$((i+1))]}"
-      IFWLAN=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my wireless interface = ${optarr[$(($i+1))]}"
+      IFWLAN=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --myip1 )
-      echo "my IP address for the 1st AP = ${optarr[$((i+1))]}"
-      MYIP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my IP address for the 1st AP = ${optarr[$(($i+1))]}"
+      MYIP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --myip2 )
-      echo "my IP address for the 2nd AP = ${optarr[$((i+1))]}"
-      MYIP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my IP address for the 2nd AP = ${optarr[$(($i+1))]}"
+      MYIP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apip1 )
-      echo "1st AP's IP address = ${optarr[$((i+1))]}"
-      APIP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's IP address = ${optarr[$(($i+1))]}"
+      APIP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apip2 )
-      echo "2nd AP's IP address = ${optarr[$((i+1))]}"
-      APIP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's IP address = ${optarr[$(($i+1))]}"
+      APIP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apmac1 )
-      echo "1st AP's MAC address = ${optarr[$((i+1))]}"
-      MAC_ADDR_AP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's MAC address = ${optarr[$(($i+1))]}"
+      MAC_ADDR_AP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apmac2 )
-      echo "2nd AP's MAC address = ${optarr[$((i+1))]}"
-      MAC_ADDR_AP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's MAC address = ${optarr[$(($i+1))]}"
+      MAC_ADDR_AP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apssid1 )
-      echo "1st AP's SSID = ${optarr[$((i+1))]}"
-      APSSID1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's SSID = ${optarr[$(($i+1))]}"
+      APSSID1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apssid2 )
-      echo "2nd AP's SSID = ${optarr[$((i+1))]}"
-      APSSID2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's SSID = ${optarr[$(($i+1))]}"
+      APSSID2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
-    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; ((i=i+1));;
-    -- ) ((i++)); break;;
+    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; $((i=$i+1));;
+    -- ) $(($i+1)); break;;
     * ) usage; exit 1;;
   esac
 done

Modified: trunk/tools/switch-ip.bareasus
==============================================================================
--- trunk/tools/switch-ip.bareasus      Wed Sep  2 15:57:20 2009        (r908)
+++ trunk/tools/switch-ip.bareasus      Wed Sep  2 16:01:19 2009        (r909)
@@ -127,52 +127,52 @@
   case ${optarr[$i]} in
     -h | --help ) usage; exit 0;;
     -i )
-      echo "my wireless interface = ${optarr[$((i+1))]}"
-      IFWLAN=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my wireless interface = ${optarr[$(($i+1))]}"
+      IFWLAN=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --myip1 )
-      echo "my IP address for the 1st AP = ${optarr[$((i+1))]}"
-      MYIP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my IP address for the 1st AP = ${optarr[$(($i+1))]}"
+      MYIP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --myip2 )
-      echo "my IP address for the 2nd AP = ${optarr[$((i+1))]}"
-      MYIP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my IP address for the 2nd AP = ${optarr[$(($i+1))]}"
+      MYIP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apip1 )
-      echo "1st AP's IP address = ${optarr[$((i+1))]}"
-      APIP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's IP address = ${optarr[$(($i+1))]}"
+      APIP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apip2 )
-      echo "2nd AP's IP address = ${optarr[$((i+1))]}"
-      APIP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's IP address = ${optarr[$(($i+1))]}"
+      APIP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apmac1 )
-      echo "1st AP's MAC address = ${optarr[$((i+1))]}"
-      MAC_ADDR_AP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's MAC address = ${optarr[$(($i+1))]}"
+      MAC_ADDR_AP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apmac2 )
-      echo "2nd AP's MAC address = ${optarr[$((i+1))]}"
-      MAC_ADDR_AP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's MAC address = ${optarr[$(($i+1))]}"
+      MAC_ADDR_AP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apssid1 )
-      echo "1st AP's SSID = ${optarr[$((i+1))]}"
-      APSSID1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's SSID = ${optarr[$(($i+1))]}"
+      APSSID1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apssid2 )
-      echo "2nd AP's SSID = ${optarr[$((i+1))]}"
-      APSSID2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's SSID = ${optarr[$(($i+1))]}"
+      APSSID2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
-    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; ((i=i+1));;
-    -- ) ((i++)); break;;
+    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; $((i=$i+1));;
+    -- ) $(($i+1)); break;;
     * ) usage; exit 1;;
   esac
 done

Modified: trunk/tools/switch-ip.owrtasus
==============================================================================
--- trunk/tools/switch-ip.owrtasus      Wed Sep  2 15:57:20 2009        (r908)
+++ trunk/tools/switch-ip.owrtasus      Wed Sep  2 16:01:19 2009        (r909)
@@ -127,52 +127,52 @@
   case ${optarr[$i]} in
     -h | --help ) usage; exit 0;;
     -i )
-      echo "my wireless interface = ${optarr[$((i+1))]}"
-      IFWLAN=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my wireless interface = ${optarr[$(($i+1))]}"
+      IFWLAN=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --myip1 )
-      echo "my IP address for the 1st AP = ${optarr[$((i+1))]}"
-      MYIP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my IP address for the 1st AP = ${optarr[$(($i+1))]}"
+      MYIP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --myip2 )
-      echo "my IP address for the 2nd AP = ${optarr[$((i+1))]}"
-      MYIP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "my IP address for the 2nd AP = ${optarr[$(($i+1))]}"
+      MYIP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apip1 )
-      echo "1st AP's IP address = ${optarr[$((i+1))]}"
-      APIP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's IP address = ${optarr[$(($i+1))]}"
+      APIP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apip2 )
-      echo "2nd AP's IP address = ${optarr[$((i+1))]}"
-      APIP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's IP address = ${optarr[$(($i+1))]}"
+      APIP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apmac1 )
-      echo "1st AP's MAC address = ${optarr[$((i+1))]}"
-      MAC_ADDR_AP1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's MAC address = ${optarr[$(($i+1))]}"
+      MAC_ADDR_AP1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apmac2 )
-      echo "2nd AP's MAC address = ${optarr[$((i+1))]}"
-      MAC_ADDR_AP2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's MAC address = ${optarr[$(($i+1))]}"
+      MAC_ADDR_AP2=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apssid1 )
-      echo "1st AP's SSID = ${optarr[$((i+1))]}"
-      APSSID1=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "1st AP's SSID = ${optarr[$(($i+1))]}"
+      APSSID1=${optarr[$(($i+1))]}
+      $((i=$i+2))
       ;;
     --apssid2 )
-      echo "2nd AP's SSID = ${optarr[$((i+1))]}"
-      APSSID2=${optarr[$((i+1))]}
-      ((i=i+2))
+      echo "2nd AP's SSID = ${optarr[$(($i+1))]}"
+      APSSID2=${optarr[$(($i+1))]}
+      $((i=i+2))
       ;;
-    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; ((i=i+1));;
-    -- ) ((i++)); break;;
+    --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; $((i=$i+1));;
+    -- ) $(($i+1)); break;;
     * ) usage; exit 1;;
   esac
 done

Other related posts:

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