diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2013-07-21 00:51:34 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2013-07-21 00:51:34 +0200 |
| commit | cbd00d5652700792a7833617d947f8a78bb34ccc (patch) | |
| tree | f561f0d5b4ebd0ea45b02d54214d24054791d70b | |
| parent | 30ea4c009e9ba095eb6ac94655715cc9531d4594 (diff) | |
| download | netctl-cbd00d5652700792a7833617d947f8a78bb34ccc.tar.gz netctl-cbd00d5652700792a7833617d947f8a78bb34ccc.tar.xz | |
Introduce sed
Instead of filtering results from grep, we can also just use sed.
Installations having grep can be expected to have sed as well.
| -rw-r--r-- | src/lib/connections/wireless | 2 | ||||
| -rw-r--r-- | src/lib/wpa | 3 | ||||
| -rwxr-xr-x | src/wifi-menu | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/connections/wireless b/src/lib/connections/wireless index fe01b90..870af51 100644 --- a/src/lib/connections/wireless +++ b/src/lib/connections/wireless @@ -17,7 +17,7 @@ wireless_up() { : ${Security:=none} : ${WPADriver:=nl80211,wext} : ${TimeoutWPA:=15} - + if [[ $RFKill ]]; then enable_rf "$Interface" "$RFKill" || return 1 fi diff --git a/src/lib/wpa b/src/lib/wpa index 65ef8f9..b80c54d 100644 --- a/src/lib/wpa +++ b/src/lib/wpa @@ -12,8 +12,7 @@ wpa_call() { if [[ $WPA_CTRL_DIR ]]; then args+=("-p" "$WPA_CTRL_DIR") elif [[ $WPAConfigFile ]] && grep -q "^[[:space:]]*ctrl_interface=" "$WPAConfigFile"; then - WPA_CTRL_DIR=$(grep -m1 "^[[:space:]]*ctrl_interface=" "$WPAConfigFile") - WPA_CTRL_DIR=${WPA_CTRL_DIR#*ctrl_interface=} + WPA_CTRL_DIR=$(sed -n "0,/^[[:space:]]*ctrl_interface=/s///p" "$WPAConfigFile") if [[ $WPA_CTRL_DIR == DIR=* ]]; then WPA_CTRL_DIR=${WPA_CTRL_DIR:4} WPA_CTRL_DIR=${WPA_CTRL_DIR%% GROUP=*} diff --git a/src/wifi-menu b/src/wifi-menu index d0903aa..a62881e 100755 --- a/src/wifi-menu +++ b/src/wifi-menu @@ -111,8 +111,7 @@ create_profile() key=$(dialog $box "$msg" 10 40 --stdout) || return $? if [[ "${#key}" -ge 8 && "${#key}" -le 63 ]]; then if [[ "$OBSCURE" ]]; then - key=$(wpa_passphrase "$1" "$key" | grep -m 1 "^[[:space:]]*psk=") - key=${key#*psk=} + key=$(wpa_passphrase "$1" "$key" | sed -n "s/^[[:space:]]*psk=//p") else key=$(printf "%q" "$key") fi @@ -210,8 +209,7 @@ if [[ ! -d "/sys/class/net/$INTERFACE" ]]; then fi echo -n "Scanning for networks... " -CONNECTION=$(wpa_call "$INTERFACE" status 2> /dev/null | grep -m 1 "^ssid=") -CONNECTION=${CONNECTION#ssid=} +CONNECTION=$(wpa_call "$INTERFACE" status 2> /dev/null | sed -n "s/^ssid=//p") NETWORKS=$(wpa_supplicant_scan "$INTERFACE" 3,4,5) if [[ $? -eq 0 ]]; then trap 'rm -f "$NETWORKS"' EXIT |