diff --git a/system-info/system-info-Linux.sh b/system-info/system-info-Linux.sh index 91a142e..d77abeb 100755 --- a/system-info/system-info-Linux.sh +++ b/system-info/system-info-Linux.sh @@ -35,11 +35,11 @@ if upower -e | grep 'BAT' 2> /dev/null; then local percentage=$(echo $output | awk '{ print $4 }') if [ "$charging" = "Charging," ];then echo $percentage | awk '$battery ~ /.*/ { - printf " %d%% %s\n", $battery, substr("󰢟󰢜󰂆󰂇󰂈󰢝󰂉󰢞󰂊󰂋󰂅", int($battery / 9), 1) + printf " %d%% %s\n", $battery, substr("󰢟󰢜󰂆󰂇󰂈󰢝󰂉󰢞󰂊󰂋󰂅", int($battery / 100 * 11), 1) }' else echo $percentage | awk '$battery ~ /.*/ { - printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 9), 1) + printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 100 * 11), 1) }' fi } @@ -57,7 +57,7 @@ while true; do # Parse the current CPU load on all cores/threads. cpu_load=" `mpstat -P ALL -n 1 -u 1 -o JSON | \ jq '.sysstat.hosts[0].statistics[0]["cpu-load"][1:]|.[].idle' | \ - awk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 11), 1) }'`" + awk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 100 * 9), 1) }'`" # Parse the current CPU package temperature. cpu_temp=$(get_cpu_temp) diff --git a/system-info/system-info-WSL.sh b/system-info/system-info-WSL.sh index 4f26f61..74f3b56 100755 --- a/system-info/system-info-WSL.sh +++ b/system-info/system-info-WSL.sh @@ -32,14 +32,14 @@ while true; do cpu_load=" `mpstat -P ALL -n 1 -u 1 -o JSON | \ jq '.sysstat.hosts[0].statistics[0]["cpu-load"][1:]|.[].idle' | \ - awk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 11), 1) }'`" + awk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 100 * 9), 1) }'`" raw_battery=$($powershell -NoProfile \ "(Get-WmiObject win32_battery).EstimatedChargeRemaining" \ | sed 's/\r//') if [ "" != "$raw_battery" ]; then battery="$(echo $raw_battery | awk '$battery ~ /.*/ { - printf " %d%% %s\n", $battery, substr("", int($battery / 9), 1) + printf " %d%% %s\n", $battery, substr("", int($battery / 100 * 11), 1) }')" fi diff --git a/system-info/system-info-macOS.sh b/system-info/system-info-macOS.sh index c555fdf..5f2d8fb 100755 --- a/system-info/system-info-macOS.sh +++ b/system-info/system-info-macOS.sh @@ -85,9 +85,9 @@ while true; do cpu_load=$(sudo powermetrics --format text \ --sample-rate 1200 --sample-count 1 --samplers cpu_power | - grep --color=never -E 'CPU \d idle residency:' | - grep --color=never -Eo '\d+\.\d+' | - gawk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 10), 1) }' + grep --color=never -E 'CPU \d active residency:' | + gawk '{print $5}' | + gawk '$idle ~ /[-.0-9]*/ { printf "%s", substr(" ▁▂▃▄▅▆▇█", int($idle / 100 * 9), 1) }' ) # Parse the current battery charge percentage. @@ -97,7 +97,7 @@ while true; do grep --color=never -Eo '\d+%' | \ grep --color=never -Eo '\d+')" battery="$(echo $raw_battery | gawk '$battery ~ /.*/ { - printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 9), 1) + printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 100 * 11), 1) }')" fi