getInfo 2.14.2

This commit is contained in:
kyodev 2017-10-23 09:58:56 +02:00
parent 3d2e0a58df
commit 2487a00ecf
2 changed files with 6 additions and 5 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
version=2.14.1
version=2.14.2
date="23/10/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
@ -932,7 +932,7 @@ fi_systeme(){ # 23/10/2017
[ "$(ps -ef | grep -c 'wayland')" -gt 1 ] && xorg="wayland" || xorg="indéterminé"
fi
shells="$(grep -Ev '^[[:blank:]]*#|^$' /etc/shells | sed 's/\/bin\///' | tr '\n' ' ')"
if [ -d /sys/class/power_supply/AC* ]; then
if [ $(grep -c 'AC' <<< $(ls /sys/class/power_supply/ 2>/dev/null)) -gt 0 ]; then
alim_total=$(grep -cs . <<< $(ls /sys/class/power_supply/AC*/online))
# alim_on=$(grep -cs '1' /sys/class/power_supply/AC*/online)
# alim_off=$(grep -cs '0' /sys/class/power_supply/AC*/online)
@ -1003,7 +1003,7 @@ fi_usb(){ # 22/10/2017
}
# informations batterie(s), assigne $fget_batt_nb $fget_batt
figet_batt(){ #v2 22/10/2017
figet_batt(){ #v2 23/10/2017
local batt_detail batt_nb batt_unit batt_capa_design batt_capa_full batt_capa_now batt_conso
local batt_volt_min batt_volt_now batt_status batt_cycle batt_sn alert_batt_alarm
local batt_sante batt_restant tempo batRep ibat uevent
@ -1014,7 +1014,7 @@ figet_batt(){ #v2 22/10/2017
batt_nb="-1"
return 1
fi
[ -d /sys/class/power_supply/BAT* ] || return 0
[ $(grep -c 'BAT' <<< $(ls /sys/class/power_supply/ 2>/dev/null)) -gt 0 ] || return 0
batt_nb="$(grep -i 'Battery' /sys/class/power_supply/*/type | grep -c .)"
[ -z "$batt_nb" ] && return
batRep="/sys/class/power_supply"

View File

@ -15,11 +15,12 @@
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
* f__cmd_exist f__sudo f__requis
## 2.14.1 23/10/2017
## 2.14.2 23/10/2017
* nouveau: nb alims total/branchée
* révision: figet_test_batt (upower)
* fix: fi_systeme, fi_graph: bug affichage gpu si 2 cartes graphiques
* fix: figet_batt, return meilleur si pas de batterie
## 2.14.0 22/10/2017