network fix parameter passing when using ""

[people/stevee/network.git] / src / hooks / zones / wireless

diff --git a/src/hooks/zones/wireless b/src/hooks/zones/wireless
index 402a159d5f66daad2d2f58b8f647100848f2691a..0bb4aa81a17e35fcefccb7804d2579fefb07e3f0 100644 (file)
--- a/src/hooks/zones/wireless
+++ b/src/hooks/zones/wireless
@@ -48,19 +48,19 @@ hook_parse_cmdline() {
        while [ $# -gt 0 ]; do
                case "${1}" in
                        --phy=*|--parent-device=*)
-                               PHY=$(cli_get_val ${1})
+                               PHY=$(cli_get_val "${1}")
                                ;;
                        --encryption-mode=*)
-                               ENCRYPTION_MODE=$(cli_get_val ${1})
+                               ENCRYPTION_MODE=$(cli_get_val "${1}")
                                ;;
                        --address=*)
-                               ADDRESS=$(cli_get_val ${1})
+                               ADDRESS=$(cli_get_val "${1}")
                                ;;
                        --ssid=*)
-                               SSID=$(cli_get_val ${1})
+                               SSID=$(cli_get_val "${1}")
                                ;;
                        --key=*)
-                               KEY=$(cli_get_val ${1})
+                               KEY=$(cli_get_val "${1}")
                                ;;
                        *)
                                warning "Unrecognized option: ${1}"
@@ -137,13 +137,13 @@ hook_status() {
        local bssid=$(wpa_cli_status_get ${zone} bssid)
        assert isset bssid
 
+       local frequency=$(wpa_cli_bss_get_frequency "${zone}" "${bssid}")
+       cli_print_fmt1 3 "Channel" "$(wireless_frequency_to_channel ${frequency}) (${frequency} MHz)"
        cli_print_fmt1 3 "BSSID" "${bssid}"
-       cli_print_fmt1 3 "Frequency" \
-               "$(wpa_cli_bss_get_frequency ${zone} ${bssid}) MHz"
        cli_print_fmt1 3 "Noise" \
                "$(wpa_cli_bss_get_noise ${zone} ${bssid})"
        cli_print_fmt1 3 "Quality" \
-               "$(wpa_cli_bss_get_quality ${zone} ${bssid})"
+               "$(wpa_cli_bss_get_quality ${zone} ${bssid})%%"
        cli_print_fmt1 3 "Flags" \
                "$(wpa_cli_bss_get_flags ${zone} ${bssid})"
        cli_space