mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.19.3
This commit is contained in:
kyodev
parent
98201e9ba9
commit
e4aeef9b0e
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.19.2
|
||||
version=2.19.3
|
||||
date="28/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -12,7 +12,7 @@ script="getInfo"
|
|||
#####
|
||||
|
||||
# assigne $affichage_text
|
||||
f__affichage(){ # 08/10/2017
|
||||
f__affichage(){ # 29/10/2017
|
||||
f__color
|
||||
affichage_text=" _ ___ __
|
||||
__ _ ___| |_|_ _|_ __ / _| ___
|
||||
|
|
@ -21,7 +21,7 @@ f__affichage(){ # 08/10/2017
|
|||
\__, |\___|\__|___|_| |_|_| \___/
|
||||
|___/ "
|
||||
clear
|
||||
echo -e "$BLUE$affichage_text\n$YELLOW version $version - $date$STD\n"
|
||||
echo -e "$BLUE$affichage_text\n$YELLOW version $version - $date$STD\n"
|
||||
}
|
||||
|
||||
# detect system architecture, assign $architecture : 32bits, i686 | 64bits, amd64, return 1 on unknown architecture
|
||||
|
|
@ -402,7 +402,7 @@ fi_cpu(){ # 25/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_disk(){ # 25/10/2017
|
||||
fi_disk(){ # 29/10/2017
|
||||
local disk_lsblk disk_df disk_df_i fstab resume idResume idSwap alert_uuidResume text pluriel
|
||||
local dd_temp dd_temp_alert dd_temp idisk tempodd
|
||||
disk_lsblk="$(lsblk -o NAME,FSTYPE,SIZE,LABEL,MOUNTPOINT,UUID)"
|
||||
|
|
@ -412,10 +412,9 @@ fi_disk(){ # 25/10/2017
|
|||
resume="$(grep -Evs '^[[:blank:]]*#|^$' /etc/initramfs-tools/conf.d/resume)"
|
||||
if [ -z "$resume" ]; then
|
||||
# alert resume absent
|
||||
resume="pas de fichier _resume_ dans /etc/initramfs-tools/conf.d/ \n"
|
||||
resume+="ce n'est pas forcément une erreur et n'a pas d'incidence si l'hibernation n'est pas utilisée \n"
|
||||
resume+="cela pourrait générer des erreurs en cas d'hibernation et de multiples partitions swap. \n"
|
||||
resume+="il vaudrait peut-être mieux créer alors ce fichier. \n"
|
||||
resume="Pas de fichier _resume_ dans /etc/initramfs-tools/conf.d/ \n"
|
||||
resume+="Ce n'est pas (forcément) une erreur. La plus grosse partition swap est choisie dans ce cas. "
|
||||
resume+="À investiguer si erreur au boot ou boot très long."
|
||||
fi
|
||||
idResume="$(grep -Evs '^[[:blank:]]*#|^$' /etc/initramfs-tools/conf.d/resume | sed -En 's/.*UUID=([0-9a-Z-]*).*$/\1/p')"
|
||||
idSwap="$(grep -Ev '^[[:blank:]]*#|^$' /etc/fstab | sed -En 's/UUID=([0-9a-Z-]*).*swap.*$/\1/p')"
|
||||
|
|
@ -1297,11 +1296,14 @@ figet_disk(){ #v2 19/10/2017
|
|||
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
|
||||
# if [ -z "$vendor_model" ]; then
|
||||
if [ "$vendor_model" ]; then
|
||||
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)"
|
||||
# sur arch: sr0 est reporté en wwn(pas ata), $9,$11: wwn-0x5001480000000000 ../../sr0
|
||||
# vendor_model="$(ls -l /dev/disk/by-id/ | gawk '{print $9,$11}' | sed '/-part/d' | grep $idisk)"
|
||||
vendor_model="$(ls -l /dev/disk/by-id/ | gawk ' !/-part/ {print $9,$11}' | grep $idisk)"
|
||||
echo "$vendor_model"
|
||||
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 ...
|
||||
|
|
@ -1373,30 +1375,35 @@ figet_distro(){ # thanks neofetch, assigne $fget_distro # 09/10/2017
|
|||
}
|
||||
|
||||
# informations DMI, assigne $fget_dmi
|
||||
figet_dmi(){ # 23/10/2017
|
||||
figet_dmi(){ # 29/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
|
||||
unset indic1 indic2
|
||||
# ligne1 Pc/produit
|
||||
for idmi in sys_vendor product_name product_version chassis_type; do
|
||||
tempo=$(cat /sys/class/dmi/id/$idmi 2>/dev/null)
|
||||
tempo=$(sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs)
|
||||
if [ "$idmi" == "chassis_type" ]; then
|
||||
[ "$tempo" == "10" ] && tempo="(Notebook)" || tempo="($tempo)"
|
||||
fi
|
||||
# indic1 pour tester égalité avec board
|
||||
[[ "$idmi" == "sys_vendor" || "$idmi" == "product_name" ]] && indic1+="$tempo "
|
||||
product+="$tempo "
|
||||
product+="$tempo "
|
||||
done
|
||||
# ligne2 carte mère
|
||||
for idmi in board_vendor board_name board_version; do
|
||||
tempo=$(cat /sys/class/dmi/id/$idmi 2>/dev/null)
|
||||
tempo=$(sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs)
|
||||
# indic2 pour tester égalité avec product
|
||||
[[ "$idmi" == "board_vendor" || "$idmi" == "board_name" ]] && indic2+="$tempo "
|
||||
board+="$tempo "
|
||||
board+="$tempo "
|
||||
done
|
||||
# ligne3 bios
|
||||
for idmi in bios_vendor bios_version bios_date; do
|
||||
tempo=$(cat /sys/class/dmi/id/$idmi 2>/dev/null)
|
||||
tempo=$(sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs)
|
||||
bios+="$tempo "
|
||||
bios+="$tempo "
|
||||
done
|
||||
fget_dmi=$(printf '%7s: %s' "produit" "$product")$'\n'
|
||||
[ "$indic1" != "$indic2" ] && fget_dmi+=$(printf '%7s: %s' "board" "$board")$'\n'
|
||||
|
|
|
|||
|
|
@ -10,10 +10,12 @@
|
|||
|
||||
---
|
||||
|
||||
## 2.19.1 27/10/2017
|
||||
## 2.19.3 28/10/2017
|
||||
|
||||
* avertissement erreur display :0 en root fedora beta ou buster
|
||||
* nouveaux: avertissement erreur display :0 en root fedora beta ou buster
|
||||
* révision: message resume
|
||||
* fi_nm: fix bug permission dans fedora NetworkManager.state
|
||||
* fix: figet_dmi, markdown
|
||||
|
||||
## 2.19.1 27/10/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue