getInfo 2.21.4

This commit is contained in:
kyodev 2017-10-31 09:10:14 +01:00
parent ba9d7b2ae2
commit 26ebe12258
2 changed files with 86 additions and 82 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash
version=2.2.3
date="30/10/2017"
version=2.2.4
date="31/10/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
script="getInfo"
@ -397,11 +397,11 @@ fi_cpu(){ # 25/10/2017
#manuellement: lscpu (util-linux)
local cpu_flags text pluriel
cpu_flags="$(sed -n 's/^flags.*: \(.*\)$/\1/p;' /proc/cpuinfo | sed -n '1p')"
[ "$fget_cpu" ] || figet_cpu
[ "$fg_cpu" ] || figet_cpu
###
[ ${fget_cpu:0:1} -gt 1 ] && pluriel="s" || unset pluriel
[ ${fg_cpu:0:1} -gt 1 ] && pluriel="s" || unset pluriel
text="## processeur$pluriel \n\n"
f_display "fget_cpu" "sans"
f_display "fg_cpu" "sans"
f_display "cpu_flags" "var" "flags cpu:"
printf "$text\n" >> "$fileOutput"
unset text
@ -642,8 +642,8 @@ fi_hw(){ # 25/10/2017
figet_hw
###
text="## hardware monitor ACPI \n\n"
if [ "$fget_hw" ]; then
f_display "fget_hw" "sans"
if [ "$fg_hw" ]; then
f_display "fg_hw" "sans"
else
text+="**pas d'informations détectées** \n\n"
fi
@ -793,9 +793,9 @@ fi_mem(){ # 25/10/2017
local swappiness text var_temp
swappiness="$(cat /proc/sys/vm/swappiness 2>/dev/null)"
figet_mem "mem" #options possibles mem swap total notitle nocoltitle
var_temp="$fget_mem \n\n"
var_temp="$fg_mem \n\n"
figet_mem "swap" "notitle"
var_temp+="$fget_mem \n\n"
var_temp+="$fg_mem \n\n"
var_temp+="swappiness: $swappiness"
###
text="## mémoire \n\n"
@ -914,8 +914,8 @@ fi_reseau(){ # 30/10/2017
fi
# modules réseau
text+="### modules réseau \n\n"
[ "$fget_mod_net" ] && f_display "fget_mod_net" "var" "liste non garantie complète"
[ "$fget_mod_net" ] || text+="**Modules chargés non reconnus**"
[ "$fg_mod_net" ] && f_display "fg_mod_net" "var" "liste non garantie complète"
[ "$fg_mod_net" ] || text+="**Modules chargés non reconnus**"
printf "$text\n" >> "$fileOutput"
unset text
}
@ -1055,8 +1055,13 @@ fi_systeme(){ # 30/10/2017
fi
# lastboot="$(last -n 1 --time-format iso reboot | gawk 'FNR==1 {sub(/T/," ",$5);print $5}')" # remis à jours en début de mois ?!!
lastboot="$(date -r /var/run/utmp '+%d/%m/%Y %H:%M %z')"
uptime="$(uptime -p | sed 's/up/depuis/; s/week/semaine/; s/weeks/semaines/; s/days/jours/; s/day/jour/; s/hour[s]*/h/; s/minute[s]*/mn/')"
charge="$(uptime | sed -En 's/.*load average: (.*), (.*), (.*)/\1 \2 \3/; s/,/./gp')"
uptime=$(uptime) # uptime tempo pour charge
charge=${uptime/*average: } # suppression jusqu'à average:
charge=${charge//, / } # remplacement global ', ' par ' '
charge=${charge//,/.} # remplacement global , par .
uptime=${uptime%%,[[:blank:]]*} # uptime -p parfois inexistant (alpine), suppression depuis ,[blancs]* (fin)
uptime="$( sed 's/up/depuis/; s/week/semaine/; s/weeks/semaines/; s/days/jours/; s/day/jour/;
s/hour[s]*/h/; s/minute[s]*/mn/' <<< $uptime )"
figet_batt
figet_cpu
figet_de
@ -1071,9 +1076,9 @@ fi_systeme(){ # 30/10/2017
f__architecture || f__info "Architecture non supportée" "vous pouvez contacter $projet, $contact " \
"pour aider à parfaire le script"
text="## système \n\n"
text+="> **$fget_dmi** \n\n"
text+="> **$fg_dmi** \n\n"
text+="* CPU \n"
text+=" * **$(sed -n '1p' <<< $fget_cpu)** \n"
text+=" * **$(sed -n '1p' <<< $fg_cpu)** \n"
text+="* GPU \n"
[ "$fg_gpu" ] && text+="$(sed -E 's/(.*)/ \* \*\*\1\*\*/' <<<$fg_gpu) \n" || text+="* **n/a** \n"
text+="* boot **$mbr** \n"
@ -1087,11 +1092,11 @@ fi_systeme(){ # 30/10/2017
text+="serveur d'affichage: $xorg \n"
text+="nombre d'écrans: $fg_nb_screen \n"
text+="résolution: $fg_resolution \n"
text+="desktop (DE): $fget_de \n"
text+="window manager: $fget_wm \n"
text+="shell actif: $fget_shell \n"
text+="desktop (DE): $fg_de \n"
text+="window manager: $fg_wm \n"
text+="shell actif: $fg_shell \n"
text+="shells installés: $shells \n"
text+="$fg_disk_part_fix_tot \n"
[ "$fg_disk_part_fix_tot" ] && text+="$fg_disk_part_fix_tot \n"
[ "$alimentation" ] && text+="$alimentation \n"
if [ "$fg_batt" ]; then
[ "$fg_nb_batt" -gt "1" ] && pluriel="s" || unset pluriel
@ -1099,7 +1104,7 @@ fi_systeme(){ # 30/10/2017
text+="$(sed -En 's/^BAT(.*)$/ BAT\1/p' <<< $fg_batt) \n"
fi
text+="dernier boot: $lastboot, uptime: $uptime \n"
text+="charge système depuis les 1, 5 et 15 dernières minutes: $charge \n"
text+="charge système depuis les 1, 5 et 15 dernières minutes: $charge ($fg_nb_threads threads) \n"
text+='``` \n\n'
printf "$text\n" >> "$fileOutput"
unset text
@ -1136,7 +1141,7 @@ fi_vrms(){ # 30/09/2017
}
# informations batterie(s), assigne $fg_nb_batt $fg_batt
figet_batt(){ #v2 29/10/2017
figet_batt(){ #v2 30/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
@ -1199,7 +1204,7 @@ figet_batt(){ #v2 29/10/2017
fi
# sortie
batt_detail+="$ibat: $(cat $batRep/$ibat/manufacturer 2>/dev/null) "
batt_detail+="($(cat $batRep/$ibat/model_name 2>/dev/null)) $(cat $batRep/$ibat/technology 2>/dev/null) "
batt_detail+="($(cat $batRep/$ibat/model_name 2>/dev/null)) $(cat $batRep/$ibat/technology 2>/dev/null), "
batt_detail+="$batt_capa_design$batt_unit - $batt_volt_min""V / $batt_volt_now""V (mini/actuel) "
[ "$(xargs <<< $batt_sn)" ] && batt_detail+="n° série: $batt_sn"
[ "$batt_cycle" != "0" ] && batt_detail+="$batt_cycle cycles"$'\n' || batt_detail+=$'\n' #ln 1fin
@ -1230,8 +1235,8 @@ figet_batt(){ #v2 29/10/2017
fg_batt=${batt_detail::-1} # suppression dernier $'\n'
}
# assigne $fget_cpu (3 lignes description cpu)
figet_cpu(){ #v2 25/10/2017
# assigne $fg_cpu (3 lignes description cpu), fg_nb_threads
figet_cpu(){ #v2 30/10/2017
local cpuinfo speedNom speedMax speedMin speedCpu cpu1 cpu2 cpu3
cpuinfo="$(cat /proc/cpuinfo)"
# speed
@ -1271,14 +1276,14 @@ figet_cpu(){ #v2 25/10/2017
END { print add ", bogomips: " bogomips ", cache: " cache }
' <<< "$cpuinfo"
)
fget_cpu=$(echo -e "$cpu1\n$cpu2\n$cpu3")
fg_cpu=$(echo -e "$cpu1\n$cpu2\n$cpu3")
fg_nb_threads=$(grep -c '^processor' <<< $cpuinfo)
}
figet_de(){ # thanks neofetch, assigne $fget_de #30/10/2017
if [ "$ENV_SSH" ]; then
fget_de="n/a (ssh)"
return 0
fi
figet_de(){ # thanks neofetch, assigne $fg_de #30/10/2017
fg_de="n/a (ssh)"
[ "$ENV_SSH" ] && return 0 || fg_de="n/a"
[ "$(f__cmd_exist xprop)" ] || return 0
local de="n/a"
de="$XDG_CURRENT_DESKTOP"
de="${de/'X-'}"
@ -1303,8 +1308,8 @@ figet_de(){ # thanks neofetch, assigne $fget_de #30/10/2017
de="xfce" # suppression xfce4 ou xfce5 (la version ne sort pas dans xprop ou $XDG_
;;
esac
fget_de="${de,,}" # minuscule
fget_de="${fget_de^}" # car1 en majuscule
fg_de="${de,,}" # minuscule
fg_de="${fg_de^}" # car 1 en majuscule
}
# $fg_nb_disk : nb disk fixe & amovible, $fg_disk_table : tableau sommaire
@ -1314,7 +1319,7 @@ figet_de(){ # thanks neofetch, assigne $fget_de #30/10/2017
# $fg_disk_part_fixe_m, $fg_disk_part_amov_m : liste partitions montées, fixes ou amovibles
# $fg_disk_part_swap : liste partitions swap
# $fg_disk_part_fixe_nm, $fg_disk_part_amov_nm : liste partitions non montées, fixes ou amovibles
figet_disk(){ #v2 29/10/2017
figet_disk(){ #v2 30/10/2017
local size type vendor_model serial_rev list_id idisk lsblk
unset fg_disk_fixe fg_disk_amov
# $fg_disk_table: tableau sommaire des disques
@ -1364,6 +1369,7 @@ figet_disk(){ #v2 29/10/2017
fg_disk_part_fix_tot="espace des partitions fixes montées (total, utilisé, dispo): "
fg_disk_part_fix_tot+="$(df -h --total --output=size,used,avail $(printf '/dev/%s ' $fg_disk_part_fixe_m) 2>/dev/null | tail -n-1 | xargs)"
fg_disk_part_fix_tot="$(sed 's/G/Go/g; s/M/Mo/g; s/K/ko/g' <<< $fg_disk_part_fix_tot)"
[ "$fg_disk_part_fix_tot" ] || fg_disk_part_fix_tot="n/a"
# liste des disques par type
list_id="$(ls -l /dev/disk/by-id/ | gawk '{print $9,$11}')"
fg_disk_ata="$(sed '/^ata/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
@ -1411,8 +1417,8 @@ figet_distrib(){ # 29/10/2017
[ "$fg_distrib" ] || fg_distrib="${OS^} (indéterminé)"
}
# informations DMI, assigne $fget_dmi
figet_dmi(){ # 29/10/2017
# informations DMI, (firmware partie matériel), assigne $fg_dmi
figet_dmi(){ # 30/10/2017
# lors révision tester $(grep -s . /sys/class/dmi/id/*)
# ex: /sys/class/dmi/id/bios_vendor:American Megatrends Inc.
local product board bios tempo idmi indic1 indic2
@ -1442,9 +1448,9 @@ figet_dmi(){ # 29/10/2017
tempo=$(sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs)
bios+="$tempo "
done
fget_dmi=$(printf '%7s: %s' "produit" "$product")$'\n'
[ "$indic1" != "$indic2" ] && fget_dmi+=$(printf '%7s: %s' "board" "$board")$'\n'
fget_dmi+=$(printf '%7s: %s' "bios" "$bios")
fg_dmi=$(printf '%7s: %s' "produit" "$product")$'\n'
[ "$indic1" != "$indic2" ] && fg_dmi+=$(printf '%7s: %s' "board" "$board")$'\n'
fg_dmi+=$(printf '%7s: %s' "bios" "$bios")
# chassis, pas utilisé
# for idmi in chassis_vendor chassis_version chassis_type; do
# tempo=$(cat /sys/class/dmi/id/$idmi 2>/dev/null)
@ -1465,11 +1471,11 @@ figet_gpu(){ # 30/10/2017
fg_nb_cpu=$(echo "$fg_gpu" | wc -l)
}
# infos température et fan via acpi, assigne $fget_hw
figet_hw(){ #v2 14/10/2017
# infos température et fan via acpi, assigne $fg_hw
figet_hw(){ #v2 30/10/2017
local name labelF inputF labelT inputT critT hystT maxiT fan temp ihw
if [ ! -d /sys/class/hwmon/ ]; then
fget_hw="gestion acpi hwmon non accessible"
fg_hw="gestion acpi hwmon non accessible"
return 1
fi
unset fan temp
@ -1523,8 +1529,8 @@ figet_hw(){ #v2 14/10/2017
fi
fi
done
fget_hw="$temp$fan"
[ "$fget_hw" ] && fget_hw=${fget_hw::-1}
fg_hw="$temp$fan"
[ "$fg_hw" ] && fg_hw=${fg_hw::-1}
}
# assigne $fg_ip, $fg_ip_tp, $fg_gws, $fg_gws_tp, $fg_ifn_prior, $fg_ifn, $fg_mac, fg_mac_tp
@ -1640,8 +1646,8 @@ figet_ip_pub(){ # 27/10/2017
fi
}
# $1=mem|swap [total|notitle|nocoltitle], assigne $fget_mem ($2=debug all cols + free)
figet_mem(){ # 13/10/2017
# $1=mem|swap [total|notitle|nocoltitle], assigne $fg_mem ($2=debug all cols + free)
figet_mem(){ # 30/10/2017
local freeDebug MemTotal MemFree MemAvailable Buffers Cached SReclaimable Shmem MemUsed
local SwapTotal SwapFree SwapCached col
[ "$2" == "debug" ] && freeDebug="$(free -hw | sed '3d')"
@ -1677,39 +1683,39 @@ figet_mem(){ # 13/10/2017
totalTotal=$( printf '%10s' $(f__unit_human $totalTotal) )
totalUsed=$( printf '%10s' $(f__unit_human $totalUsed) )
totalAvailable=$( printf '%10s' $(f__unit_human $totalAvailable) )
unset fget_mem
unset fg_mem
if [[ ! "$*" =~ notitle ]]; then
[[ "$*" =~ nocoltitle ]] || col="mém.:"
fget_mem="$col totale utilisée disponible"$'\n'
fg_mem="$col totale utilisée disponible"$'\n'
fi
if [[ "$*" =~ mem ]]; then
[[ "$*" =~ nocoltitle ]] || col="ram :"
fget_mem+="$col$MemTotal$MemUsed$MemAvailable"$'\n'
fg_mem+="$col$MemTotal$MemUsed$MemAvailable"$'\n'
fi
if [[ "$*" =~ swap ]]; then
[[ "$*" =~ nocoltitle ]] || col="swap:"
fget_mem+="$col$SwapTotal$SwapUsed$SwapFree"$'\n'
fg_mem+="$col$SwapTotal$SwapUsed$SwapFree"$'\n'
fi
if [[ "$*" =~ total ]]; then
[[ "$*" =~ nocoltitle ]] || col="tot.:"
fget_mem+="$col$totalTotal$totalUsed$totalAvailable"$'\n'
fg_mem+="$col$totalTotal$totalUsed$totalAvailable"$'\n'
fi
if [ "$2" == "debug" ]; then
local espace=$(printf '% 6s')
fget_mem="$espace""mém.: totale utilisée libre shared buffers cache disponible"$'\n'
fget_mem+="$espace""ram :$MemTotal$MemUsed$MemFree$Shmem$Buffers$Cached$MemAvailable"$'\n'
fget_mem=${fget_mem::-1} # suppression dernier $'\n'
echo "$fget_mem"
fg_mem="$espace""mém.: totale utilisée libre shared buffers cache disponible"$'\n'
fg_mem+="$espace""ram :$MemTotal$MemUsed$MemFree$Shmem$Buffers$Cached$MemAvailable"$'\n'
fg_mem=${fg_mem::-1} # suppression dernier $'\n'
echo "$fg_mem"
echo "$freeDebug"
fi
fget_mem=${fget_mem::-1} # suppression dernier $'\n'
fg_mem=${fg_mem::-1} # suppression dernier $'\n'
}
figet_mod_net(){ # thanks wireless-info, assigne $fget_mod_net # 01/10/2017
figet_mod_net(){ # thanks wireless-info, assigne $fg_mod_net # 30/10/2017
local MODMATCHES LSMODMATCHES
MODMATCHES="(air|ar5|at7|ath[^3]?|b43|bcma|brcm|carl|ipw|iwl|ndis|r(818|8192[eu]|871|92su)|8(188|189|192|723|812)[acde][esu]|rt[23567]|rtl|ssb|wl|(cfg|mac)80211)"
LSMODMATCHES="(wmi|(dell|ideapad)[-_]laptop)"
fget_mod_net="$(lsmod | grep -E "(^|[[:punct:] ])($MODMATCHES|$LSMODMATCHES)[^[:punct:] ]*([[:punct:] ]|$)")"
fg_mod_net="$(lsmod | grep -E "(^|[[:punct:] ])($MODMATCHES|$LSMODMATCHES)[^[:punct:] ]*([[:punct:] ]|$)")"
}
# assigne $fg_nb_screen, $fg_resolution. return fg_resolution=n/a[ (ssh)] & fg_nb_screen=n/a ou valeurs
@ -1729,7 +1735,7 @@ figet_screen(){ #v2 30/10/2017
[ "$fg_resolution" != "n/a" ] && fg_nb_screen=$( grep -o 'pixels' <<< $fg_resolution | grep -c . )
}
figet_shell(){ # thanks neofetch, assigne $fget_shell # 04/10/2017
figet_shell(){ # thanks neofetch, assigne $fg_shell # 30/10/2017
local shell
shell="${SHELL##*/}"
case "${SHELL##*/}" in
@ -1748,7 +1754,7 @@ figet_shell(){ # thanks neofetch, assigne $fget_shell # 04/10/2017
"fish")
shell+="$(fish -c 'printf "%s" "$FISH_VERSION"')" ;;
esac
fget_shell="$shell"
fg_shell="$shell"
}
figet_test_batt(){ # 23/10/2017
@ -1757,7 +1763,7 @@ figet_test_batt(){ # 23/10/2017
figet_dmi
figet_batt
###
f_display "fget_dmi" "sans"
f_display "fg_dmi" "sans"
text="--- \n\n"
text+="## batterie test \n\n"
# acpi éventuel
@ -1784,7 +1790,7 @@ figet_test_distrib(){ # 29/10/2017
lsb=$(lsb_release -a 2>/dev/null)
###
figet_dmi
f_display "fget_dmi" "var" "distrib test"
f_display "fg_dmi" "var" "distrib test"
f_display "etc" "cmd" "grep -Hs . /etc/*release /etc/*version"
f_display "lsb" "cmd" "lsb_release -a"
figet_distrib
@ -1799,13 +1805,13 @@ figet_test_dmi(){ # 21/10/2017
f_display_scandir "$var_temp" 1
# fonction script
figet_dmi
f_display "fget_dmi" "var" "figet_dmi"
f_display "fg_dmi" "var" "figet_dmi"
}
figet_test_gpu(){ # 30/10/2017
local lspci="$(lspci -mm)"
figet_dmi
f_display "fget_dmi" "var" "gpu test"
f_display "fg_dmi" "var" "gpu test"
f_display "lspci" "cmd" "lspci -mm"
figet_gpu
f_display "fg_gpu" "var" "fg_gpu"
@ -1815,7 +1821,7 @@ figet_test_hw(){ # 22/10/2017
local text var_temp
# matériel
figet_dmi
f_display "fget_dmi" "sans"
f_display "fg_dmi" "sans"
text="--- \n\n"
###
text+="## hwmon test \n\n"
@ -1848,27 +1854,26 @@ figet_test_hw(){ # 22/10/2017
f_display "var_temp" "var" "hwmon0/temp1_input ala neofetch"
# fonction script
figet_hw
f_display "fget_hw" "var" "figet_hw"
f_display "fg_hw" "var" "figet_hw"
}
figet_wm(){ # thanks neofetch, assigne $fget_wm # 22/10/2017
if [ "$ENV_SSH" ]; then
fget_wm="n/a (ssh)"
return 0
fi
figet_wm(){ # thanks neofetch, assigne $fg_wm # 30/10/2017
fg_wm="n/a (ssh)"
[ "$ENV_SSH" ] && return 0 || fg_wm="n/a"
[ "$(f__cmd_exist xprop)" ] || return 0
local id wm
if [ -n "$DISPLAY" ]; then
id="$(xprop -root -notype | gawk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}')"
wm="$(xprop -id "$id" -notype -f _NET_WM_NAME 8t)"
id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK | cut -d' ' -f5)"
wm="$(xprop -id "$id" -notype -f _NET_WM_NAME 8t) "
wm="${wm/*_NET_WM_NAME = }"
wm="${wm/\"}"
wm="${wm/\"*}"
# Fallback for Wayland wms
[[ "$wm" == "xwlc" ]] && wm="$(ps -e | grep -m 1 -o -F -e "sway" -e "orbment" -e "velox" -e "orbital")"
else
wm="pas de windows manager détecté"
wm="indéterminé"
fi
fget_wm="$wm"
fg_wm="$wm"
}
# aiguillage export paste

View File

@ -13,19 +13,19 @@
https://wiki.gentoo.org/wiki/Comparison_of_init_systems
* réviser tous les comptages grep -c ! :(
* durcir term?
* alpine:
démon d'initialisation:
window manager: pas de windows manager détecté
espace des partitions fixes montées (total, utilisé, dispo): FILTRER
charge système
dernier boot: 29/10/2017 20:59 +0100, uptime: 21:24:08 depuis 24 min, load average: 0.08, 0.02, 0.00
charge système depuis les 1, 5 et 15 dernières minutes:
* démon d'initialisation, durcir?
---
* f__wcv
## 2.21.4 31/10/2017
* fix: alpine linux, FIN!
* renommage de tous les variables publiques des fonctions partageables
## 2.21.3 30/10/2017
* nouveau: figet_gpu
@ -33,7 +33,6 @@ https://wiki.gentoo.org/wiki/Comparison_of_init_systems
* révision: fi_graph, lspci, cmd & affichage cmd selon nb gpu
* fix: affichage/contournement alpine linux
* fix: fi_vrms
* fix: alpine linux, figet_screen, figet_gpu
## 2.20.3 29/10/2017