mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.59.3
This commit is contained in:
kyodev
parent
a6c4faaeb8
commit
ffe80951df
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.59.2
|
||||
version=2.59.3
|
||||
date="9/12/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -671,11 +671,11 @@ fi_audio(){ # 8/12/2017
|
|||
f_di cmd "$mod" "$cmd_mod" "$cmt_mod"
|
||||
}
|
||||
|
||||
fi_batt(){ # 1/12/2017
|
||||
fi_batt(){ # 9/12/2017
|
||||
local pluriel
|
||||
|
||||
[ "$fg_nb_batt" ] || figet_batt
|
||||
[[ "$fg_nb_batt" == "-1" || "$fg_nb_batt" -gt 0 ]] || return 0 # pas de batterie
|
||||
[ "$fg_batt" ] || figet_batt
|
||||
[[ "$fg_batt" || "$fg_nb_batt" -gt 0 ]] || return 0 # pas de batterie
|
||||
[ "$fg_nb_batt" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
###
|
||||
f_pr titre2 "batterie"$pluriel
|
||||
|
|
@ -1919,11 +1919,11 @@ fi_reseau(){ # 1/12/2017 ( configuration )
|
|||
f_pr flush
|
||||
}
|
||||
|
||||
fi_serial(){ #v2 1/12/2017
|
||||
fi_serial(){ #v9 1/12/2017
|
||||
local chassis_serial machineId text
|
||||
|
||||
[ "$fg_nb_disk" ] || figet_disk
|
||||
[ "$fg_nb_batt" ] || figet_batt
|
||||
[ "$fg_batt" ] || figet_batt
|
||||
chassis_serial=$( cat /sys/class/dmi/id/chassis_serial 2>/dev/null )
|
||||
[ "$chassis_serial" ] || chassis_serial="n/a"
|
||||
machineId=$( cat /etc/machine-id 2>/dev/null )
|
||||
|
|
@ -1966,7 +1966,7 @@ fi_system(){ # 9/12/2017
|
|||
local alimentation alim_total
|
||||
|
||||
# appels fonctions externes
|
||||
[ "$fg_nb_batt" ] || figet_batt
|
||||
[ "$fg_batt" ] || figet_batt
|
||||
[ "$fg_cpu" ] || figet_cpu
|
||||
[ "$fg_de" ] || figet_de
|
||||
[ "$fg_nb_disk" ] || figet_disk
|
||||
|
|
@ -2237,7 +2237,10 @@ figet_batt(){ #v2 9/12/2017
|
|||
fi
|
||||
[ "$(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 .)"
|
||||
[ "$batt_nb" ] || return
|
||||
if [ "$batt_nb" ]; then
|
||||
fg_nb_batt=0
|
||||
return
|
||||
fi
|
||||
batRep="/sys/class/power_supply"
|
||||
unset batt_detail
|
||||
for ibat in $(ls $batRep); do
|
||||
|
|
@ -2315,7 +2318,7 @@ figet_batt(){ #v2 9/12/2017
|
|||
batt_detail+="batterie très mal chargée (moins de 50%): mauvais état? "$'\n' #[ln 5]
|
||||
fi
|
||||
done
|
||||
fg_nb_batt=$(( "$batt_nb" ))
|
||||
fg_nb_batt=$(( "$batt_nb" )) # force en numérique
|
||||
[ "$batt_detail" ] && fg_batt=${batt_detail::-1} # suppression dernier $'\n'
|
||||
[ "$(xargs <<< $fg_batt_serial)" ] || fg_batt_serial+="n/a"
|
||||
}
|
||||
|
|
@ -2798,7 +2801,6 @@ figet_de(){ #v 7/12/2017 # thanks neofetch
|
|||
if [ -z "$de" ]; then
|
||||
de="$DESKTOP_SESSION"
|
||||
de=${DESKTOP_SESSION##*/} # suppression plus grande chaine au début jusqu'à /
|
||||
de=${DESKTOP_SESSION##*=} # suppression plus grande chaine au début jusqu'à =
|
||||
fi
|
||||
# fallback to using xprop
|
||||
if [[ "$wayland" && "$EUID" -eq 0 && -z "$de" ]]; then
|
||||
|
|
@ -3322,22 +3324,22 @@ figet_lspci(){ # 8/12/2017
|
|||
|
||||
# $1=mem|swap [total|notitle|nocoltitle], assigne $fg_mem ($2=debug all cols + free)
|
||||
# indépendant de procps, affichage plus clair que free, mais résultats identiques
|
||||
figet_mem(){ # 27/11/2017
|
||||
figet_mem(){ # 9/12/2017
|
||||
local freeDebug MemTotal MemFree MemAvailable Buffers Cached SReclaimable Shmem MemUsed
|
||||
local SwapTotal SwapFree SwapCached col a b
|
||||
[ "$2" == "debug" ] && freeDebug="$(free -hw | sed '3d')"
|
||||
IFS=':'
|
||||
while read a b; do
|
||||
[ "$a" == "MemTotal" ] && MemTotal="${b/kB}" #echo "$a $((${b/kB}/1024))" ! partie entière !
|
||||
[ "$a" == "MemAvailable" ] && MemAvailable="${b/kB}"
|
||||
[ "$a" == "MemFree" ] && MemFree="${b/kB}"
|
||||
[ "$a" == "Buffers" ] && Buffers="${b/kB}"
|
||||
[ "$a" == "Cached" ] && Cached="${b/kB}"
|
||||
[ "$a" == "SReclaimable" ] && SReclaimable="${b/kB}"
|
||||
[[ "$a" =~ Shmem$|MemShared$ ]] && Shmem="${b/kB}" # = free shared
|
||||
[ "$a" == "SwapTotal" ] && SwapTotal="${b/kB}"
|
||||
[ "$a" == "SwapFree" ] && SwapFree="${b/kB}"
|
||||
[ "$a" == "SwapCached" ] && SwapCached="${b/kB}"
|
||||
[ "$a" == "MemTotal" ] && MemTotal=$(( ${b/kB} )) #echo "$a $((${b/kB}/1024))" ! partie entière !
|
||||
[ "$a" == "MemAvailable" ] && MemAvailable=$(( ${b/kB} ))
|
||||
[ "$a" == "MemFree" ] && MemFree=$(( ${b/kB} ))
|
||||
[ "$a" == "Buffers" ] && Buffers=$(( ${b/kB} ))
|
||||
[ "$a" == "Cached" ] && Cached=$(( ${b/kB} ))
|
||||
[ "$a" == "SReclaimable" ] && SReclaimable=$(( ${b/kB} ))
|
||||
[[ "$a" =~ Shmem$|MemShared$ ]] && Shmem=$(( ${b/kB} )) # = free shared
|
||||
[ "$a" == "SwapTotal" ] && SwapTotal=$(( ${b/kB} ))
|
||||
[ "$a" == "SwapFree" ] && SwapFree=$(( ${b/kB} ))
|
||||
[ "$a" == "SwapCached" ] && SwapCached=$(( ${b/kB} ))
|
||||
done <<< $(< /proc/meminfo)
|
||||
IFS="$IFS_INI"
|
||||
MemUsed=$(( $MemTotal-($MemFree+$Buffers+$Cached+$SReclaimable) ))
|
||||
|
|
@ -3994,7 +3996,7 @@ for j in $options; do
|
|||
ORIGIN='test'
|
||||
prg_1 "$*"
|
||||
echo -n "•"
|
||||
fi_reseau
|
||||
fi_system
|
||||
echo; f_dspl_md "$fileOutput"
|
||||
exit ;; # test
|
||||
-c* | all )
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# changelog getInfo
|
||||
|
||||
## getInfo 2.59.2 9/12/2017
|
||||
## getInfo 2.59.3 9/12/2017
|
||||
|
||||
* révision: fi_system si plusieurs batteries
|
||||
* fix: figet_batt, protection format numérique
|
||||
* fix?: erreur num sur figet_mem
|
||||
|
||||
## getInfo 2.59.0 8/12/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue