mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.19.2
This commit is contained in:
kyodev
parent
050f57e11a
commit
98201e9ba9
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.19.1
|
||||
date="27/10/2017"
|
||||
version=2.19.2
|
||||
date="28/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
|
@ -774,11 +774,11 @@ fi_mem(){ # 25/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_nm(){ # 27/10/2017
|
||||
fi_nm(){ # 29/10/2017
|
||||
[ "$(f__cmd_exist nmcli)" ] || return 0
|
||||
local nm_etat nm_conf nm_wifis nm_connected text
|
||||
nm_etat=$(grep -Ev '#|^$' /var/lib/NetworkManager/NetworkManager.state)
|
||||
nm_conf=$(grep -Ev '#|^$' /etc/NetworkManager/NetworkManager.conf)
|
||||
nm_etat=$(grep -Esv '#|^$' /var/lib/NetworkManager/NetworkManager.state)
|
||||
nm_conf=$(grep -Esv '#|^$' /etc/NetworkManager/NetworkManager.conf)
|
||||
nm_wifis=$(nmcli -f SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY device wifi list | head -n15)
|
||||
nm_connected=$(LC_ALL=C nmcli -f SSID,ACTIVE,IN-USE device wifi list | gawk '/yes[[:space:]]+\*/ {print $1}')
|
||||
###
|
||||
|
|
@ -1287,21 +1287,26 @@ figet_de(){ # thanks neofetch, assigne $fget_de #22/10/2017
|
|||
# $fget_disk_part_fixe_nm, $fget_disk_part_amov_nm : liste partitions non montées, fixes ou amovibles
|
||||
figet_disk(){ #v2 19/10/2017
|
||||
local size type vendor_model serial_rev list_id idisk lsblk
|
||||
# détail disques, séquence disques fixes et amovibles
|
||||
unset fget_disk_fixe fget_disk_amov
|
||||
# $fget_disk_detail: tableau sommaire des disques
|
||||
# disk taille type vendeur modèle n° série révision
|
||||
# sda 149,1G Fixe ATA Hitachi HTS54321 090620FB02015CD5N3XA C40C
|
||||
fget_disk_detail="$(printf '%-5s %-8s %-6s %-24s %-26s' "disk" "taille" "type" "vendeur modèle" " n° série révision")"$'\n'
|
||||
for idisk in $(grep -v 'loop' <<< $(ls /sys/block/)); do
|
||||
size="$( lsblk -no SIZE -d /dev/$idisk | xargs )"
|
||||
type="$( sed -n '2p' <<< $(lsblk -no HOTPLUG /dev/$idisk) | xargs )"
|
||||
vendor_model="$( lsblk -no VENDOR,MODEL /dev/$idisk | xargs )"
|
||||
serial_rev="$( lsblk -no SERIAL,REV /dev/$idisk | xargs )"
|
||||
size="$( lsblk -no SIZE -d /dev/$idisk | xargs )" #149,1G
|
||||
type="$( sed -n '2p' <<< $(lsblk -no HOTPLUG /dev/$idisk) | xargs )" # 0 \n 0 \n ...
|
||||
[ "$type" == "0" ] && type="Fixe" || type="Amov"
|
||||
vendor_model="$( lsblk -no VENDOR,MODEL /dev/$idisk | xargs )" # sda ATA Hitachi HTS54321 \n \n \n ...
|
||||
if [ -z "$vendor_model" ]; then
|
||||
vendor_model=" na na "
|
||||
vendor_model=" na na"
|
||||
#$9=ata-MATSHITADVD-RAM_UJ-850S_HC71_186848 $11=../../sr0
|
||||
# sur arch: sr0 est reporté en wwn, $9,$11: wwn-0x5001480000000000 ../../sr0
|
||||
vendor_model="$(ls -l /dev/disk/by-id/ | gawk '{print $9,$11}' | sed '/-part/d' | grep $idisk)"
|
||||
vendor_model="$(sed -E 's/.*-(.*)_[0-9]+.*$/\1/;s/_/ /g' <<< $vendor_model)"
|
||||
fi
|
||||
serial_rev="$( lsblk -no SERIAL,REV /dev/$idisk | xargs )" # 090620FB02015CD5N3XA C40C \n \n \n ...
|
||||
fget_disk_detail+="$(printf '%-5s %-8s %-6s %-24s %-26s' "$idisk" "$size" "$type" "$vendor_model" "$serial_rev")"$'\n'
|
||||
# liste disques fixes ou amovibles
|
||||
if [ "$(lsblk -no HOTPLUG /dev/$idisk | xargs | cut -d' ' -f2)" == "0" ]; then
|
||||
fget_disk_fixe+="$idisk " # "sda sdb ..."
|
||||
else
|
||||
|
|
@ -1309,8 +1314,9 @@ figet_disk(){ #v2 19/10/2017
|
|||
fi
|
||||
done
|
||||
fget_disk_detail=${fget_disk_detail::-1} # suppression dernier $'\n'
|
||||
# nb de disques, peut servir d'indicateur fonction déja appelée
|
||||
fget_nb_disk="$(tr ' ' '\n' <<< "$fget_disk_fixe $fget_disk_amov" | grep -c .)"
|
||||
#echo "$fget_disk_detail"
|
||||
# nb de disques (fixe+amovible), peut servir d'indicateur fonction déja appelée
|
||||
fget_nb_disk="$(tr ' ' '\n' <<< "$fget_disk_fixe$fget_disk_amov" | grep -c .)"
|
||||
# séquences partitions fixes, montées (m) et non montées (nm)
|
||||
lsblk="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_fixe) 2>/dev/null)"
|
||||
fget_disk_part_fixe_m="$(echo "$lsblk" | gawk '/\// {print $1}' | tr '\n' ' ')"
|
||||
|
|
@ -1328,7 +1334,7 @@ figet_disk(){ #v2 19/10/2017
|
|||
[ "$fget_disk_part_fixe_nm" ] || fget_disk_part_fixe_nm="-"
|
||||
[ "$fget_disk_part_amov_m" ] || fget_disk_part_amov_m="-"
|
||||
[ "$fget_disk_part_amov_nm" ] || fget_disk_part_amov_nm="-"
|
||||
# total espaces partition fixes montées
|
||||
# total espaces partitions fixes montées
|
||||
fget_disk_part_fix_tot="espace des partitions fixes montées (total, utilisé, dispo): "
|
||||
fget_disk_part_fix_tot+="$(df -h --total --output=size,used,avail $(printf '/dev/%s ' $fget_disk_part_fixe_m) 2>/dev/null | tail -n-1 | xargs)"
|
||||
fget_disk_part_fix_tot="$(sed 's/G/Go/g; s/M/Mo/g; s/K/ko/g' <<< $fget_disk_part_fix_tot)"
|
||||
|
|
@ -1996,6 +2002,8 @@ prg_1(){ # début
|
|||
echo -e "$ligneRapport \n\n" >> "$fileOutput"
|
||||
}
|
||||
prg_2(){ # traitements principaux
|
||||
f__info "des erreurs$YELLOW No protocol specified, Can't open display :0$BLUE indiquerait un défaut de configuration système (Xorg, wayland?)" \
|
||||
"lancer le script en utilisateur pour avoir toutes les informations"
|
||||
printf " ."
|
||||
if [[ "$1" == all || "$1" =~ s ]]; then #systeme, matériel -cs
|
||||
echo -e "# Système et matériel \n\n" >> "$fileOutput"
|
||||
|
|
@ -2150,7 +2158,7 @@ for j in $options; do
|
|||
case $j in
|
||||
-t | --test )
|
||||
prg_1 "$*"
|
||||
fi_batt
|
||||
fi_disk
|
||||
prg_3
|
||||
exit ;; # test seulement
|
||||
-c* | all )
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@
|
|||
|
||||
## 2.19.1 27/10/2017
|
||||
|
||||
* avertissement erreur display :0 en root fedora beta ou buster
|
||||
* fi_nm: fix bug permission dans fedora NetworkManager.state
|
||||
|
||||
## 2.19.1 27/10/2017
|
||||
|
||||
* nouveau: option update spécial, script en place
|
||||
* fscript_update: update spécial, révision
|
||||
* révision: f__log: plus d'avertissement si filelog absent, création
|
||||
|
|
|
|||
Loading…
Reference in New Issue