diff options
Diffstat (limited to 'src/wireless.subr')
| -rw-r--r-- | src/wireless.subr | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/wireless.subr b/src/wireless.subr index 69550bc..373b22f 100644 --- a/src/wireless.subr +++ b/src/wireless.subr @@ -6,11 +6,11 @@ wpa_check() { INTERFACE=$1; TIMEOUT=$2 - [ -z $TIMEOUT ] && TIMEOUT=15 + [[ -z "$TIMEOUT" ]] && TIMEOUT=15 let timeout=0 - while [ $timeout -ne $TIMEOUT ]; do + while [[ $timeout -ne $TIMEOUT ]; do eval `wpa_cli status|grep wpa_state` - [ "$wpa_state" = "COMPLETED" ] && return 0 + [[ "$wpa_state" = "COMPLETED" ]] && return 0 sleep 1 let timeout++ done @@ -26,11 +26,11 @@ wep_check() { INTERFACE=$1; TIMEOUT=$2 - [ -z $TIMEOUT ] && TIMEOUT=15 + [[ -z "$TIMEOUT" ]] && TIMEOUT=15 let timeout=0 - while [ $timeout -ne $TIMEOUT ]; do + while [[ $timeout -ne $TIMEOUT ]; do bssid=`iwgetid $INTERFACE -ra` - [ ! "$bssid" = "00:00:00:00:00:00" ] && return 0 + [[ ! "$bssid" = "00:00:00:00:00:00" ]] && return 0 sleep 1 let timeout++ done @@ -45,7 +45,7 @@ find_essid() { INTERFACE=$1; ESSID=$2; RETRIES=4 try=0; - while [ $try -ne $RETRIES ]; do + while [[ $try -ne $RETRIES ]; do if iwlist $INTERFACE scan|sed "s/ESSID://g"|grep -q "\"$ESSID\""; then return 0 # network found fi @@ -85,12 +85,12 @@ start_wpa() { INTERFACE=$1; WPA_CONF=$2; WPA_OPTS=$3 - [ "$WPA_OPTS" == "" ] && WPA_OPTS="-Dwext" + [[ "$WPA_OPTS" == "" ]] && WPA_OPTS="-Dwext" wpa_supplicant -wB -P/var/run/wpa_supplicant_${INTERFACE}.pid -i${INTERFACE} -c $WPA_CONF $WPA_OPTS sleep 1 - if [ ! -f /var/run/wpa_supplicant_${INTERFACE}.pid ]; then + if [[ ! -f /var/run/wpa_supplicant_${INTERFACE}.pid ]; then err_append "wpa_supplicant did not start, possible configuration error" return 1 fi @@ -100,7 +100,7 @@ wireless_up() { load_profile $1 - if [ ! -d /sys/class/net/$INTERFACE/wireless ]; then + if [[ ! -d /sys/class/net/$INTERFACE/wireless ]; then err_append "Interface $INTERFACE is not a wireless interface" return 1 fi @@ -115,7 +115,7 @@ wireless_up() { eval "iwconfig $INTERFACE mode managed essid \"$ESSID\"" # Kill any lingering wpa_supplicants. - if [ -f /var/run/wpa_supplicant_$INTERFACE.pid ]; then + if [[ -f /var/run/wpa_supplicant_$INTERFACE.pid ]; then kill $(cat /var/run/wpa_supplicant_$INTERFACE.pid) fi @@ -130,9 +130,9 @@ wireless_up() { wep|none) # 'none' security uses iwconfig, like wep, so use same code, minus keysetting. # Use sane default if no alternative is specified - if [ "$SECURITY" = "wep" -a "$WEP_OPTS" = "" ]; then + if [[ "$SECURITY" = "wep" -a "$WEP_OPTS" = "" ]; then WEP_OPTS="mode managed essid \"$ESSID\" key open $KEY" - elif [ "$SECURITY" = "none" -a "$WEP_OPTS" = "" ]; then + elif [[ "$SECURITY" = "none" -a "$WEP_OPTS" = "" ]; then WEP_OPTS="mode managed essid \"$ESSID\"" fi @@ -169,7 +169,7 @@ wireless_up() { ;; wpa-config) # If user hasnt defined one, use stock config. - [ -z "$WPA_CONF" ] && WPA_CONF="/etc/wpa_supplicant.conf" + [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" start_wpa $INTERFACE $WPA_CONF $WPA_OPTS || return 1 wpa_check $INTERFACE $TIMEOUT || return 1 ;; |