fixes
This commit is contained in:
@@ -6,6 +6,10 @@ function get_time_ms {
|
||||
|
||||
icons=("" "" "" "" "")
|
||||
|
||||
function get_wifi_interface() {
|
||||
awk 'NR > 2 { gsub(":", "", $1); print $1; exit }' /proc/net/wireless
|
||||
}
|
||||
|
||||
function toggle() {
|
||||
status=$(rfkill | grep wlan | awk '{print $4}')
|
||||
|
||||
@@ -17,7 +21,8 @@ function toggle() {
|
||||
}
|
||||
|
||||
function gen_wifi() {
|
||||
signal=$(cat /proc/net/wireless | head -n3 | tail -n1 | awk '{print $3}')
|
||||
wifi_iface=$(get_wifi_interface)
|
||||
signal=$(awk -v iface="$wifi_iface" '$1 == iface ":" { print $3; exit }' /proc/net/wireless)
|
||||
level=$(awk -v n="$signal" 'BEGIN{print int((n-1)/20)}')
|
||||
if [ "$level" -gt 4 ]; then
|
||||
level=4
|
||||
@@ -26,8 +31,8 @@ function gen_wifi() {
|
||||
icon=${icons[$level]}
|
||||
ip="-"
|
||||
class="net-connected"
|
||||
name_raw=$(wpa_cli status | grep \^ssid= | sed 's/ssid=//g')
|
||||
name=$(printf "%s" $name_raw)
|
||||
name_raw=$(wpa_cli -g "/run/wpa_supplicant/$wifi_iface" status | grep \^ssid= | sed 's/ssid=//g')
|
||||
name=$(printf "%s" "$name_raw")
|
||||
}
|
||||
|
||||
function gen_ethernet() {
|
||||
@@ -38,9 +43,12 @@ function gen_ethernet() {
|
||||
}
|
||||
|
||||
function make_content() {
|
||||
local ethernet wifi
|
||||
local ethernet wifi wifi_iface
|
||||
ethernet=$(ip link | rg "^[0-9]+: en[po]+" | head -n1 | sed 's/[a-zA-Z0-9_,><:\ -]*state //g' | sed 's/ mode [a-zA-Z0-9 ]*//g')
|
||||
wifi=$(wpa_cli status | rg "^wpa_state=" | sed 's/wpa_state=//g')
|
||||
wifi_iface=$(get_wifi_interface)
|
||||
if [ -n "$wifi_iface" ]; then
|
||||
wifi=$(wpa_cli -g "/run/wpa_supplicant/$wifi_iface" status | rg "^wpa_state=" | sed 's/wpa_state=//g')
|
||||
fi
|
||||
|
||||
# test ethernet first
|
||||
if [[ $ethernet == "UP" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user