diff --git a/initrd/etc/functions b/initrd/etc/functions index 2b0eeb45..b49bd99f 100644 --- a/initrd/etc/functions +++ b/initrd/etc/functions @@ -1220,22 +1220,11 @@ fromhex_plain() { fold -w 60 | xxd -p -r } -print_battery_health() { - for battery in /sys/class/power_supply/BAT*; do - if [[ -d "${battery}" ]]; then - battery_health=$(awk "BEGIN {printf \"%d\", ($(cat "${battery}/charge_full")/$(cat "${battery}/charge_full_design")*100)}") - echo "$(basename "${battery}") ${battery_health}" - fi - done -} - -print_battery_charge() { - for battery in /sys/class/power_supply/BAT*; do - if [[ -d "${battery}" ]]; then - battery_charge=$(awk "BEGIN {printf \"%d\", ($(cat "${battery}/charge_now")/$(cat "${battery}/charge_full")*100)}") - echo "$(basename "${battery}") ${battery_charge}" - fi - done +print_battery_state() { + battery="$1" + battery_charge=$(awk "BEGIN {printf \"%d\", ($(cat "${battery}/charge_now")/$(cat "${battery}/charge_full")*100)}") + battery_health=$(awk "BEGIN {printf \"%d\", ($(cat "${battery}/charge_full")/$(cat "${battery}/charge_full_design")*100)}") + echo "$(basename "${battery}") ${battery_charge} ${battery_health}" } generate_random_mac_address() { diff --git a/initrd/etc/gui_functions b/initrd/etc/gui_functions index 5b6fc520..32a11a1e 100755 --- a/initrd/etc/gui_functions +++ b/initrd/etc/gui_functions @@ -164,8 +164,13 @@ file_selector() { } show_system_info() { - TRACE_FUNC - battery_status=$(paste <(print_battery_charge) <(print_battery_health) | awk '{printf "\\nBattery %s charge: %s%\\nBattery %s health: %s%", substr($1,4), $2, substr($3,4), $4}; END { if (NR!=0) printf "\\n"}') + battery_status="" + for battery in /sys/class/power_supply/BAT*; do + if [[ -d "${battery}" ]]; then + battery_status+="$(awk '{printf "\\nBattery %s charge: %s%\\nBattery %s health: %s%", substr($1,4), $2, substr($1,4), $3}' <<< "$(print_battery_state "${battery}")")" + fi + done + battery_status="${battery_status:+${battery_status}\n}" memtotal=$(cat /proc/meminfo | grep 'MemTotal' | tr -s ' ' | cut -f2 -d ' ') memtotal=$((${memtotal} / 1024 / 1024 + 1))