Robot
/
kyopages
mirror of https://framagit.org/kyodev/kyopages.git
2
0
Fork 0
Code Issues Releases Wiki Activity

getInfo 2.9.0

This commit is contained in:
kyodev 2017-10-19 01:02:41 +02:00
parent 17a1bfd0cf
commit 923b692e38
2 changed files with 89 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
scripts/getInfo
View File

@ -357,7 +357,7 @@ fi_cpu(){ # 17/10/2017
echo -e "$text" >> "$fileOutput"
}
fi_disk(){ # 17/10/2017
fi_disk(){ # 18/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)"
@ -378,10 +378,10 @@ fi_disk(){ # 17/10/2017
alert_uuidResume+="**vérifier la config resume**, l'UUID ne correspond pas à celui du swap. \n"
alert_uuidResume+="vous pouvez utiliser _RESUME=auto_ ou _RESUME=/dev/sdx_, voir supprimer ce fichier"
fi
[ "$part_fix_tot" ] || figet_disk # appel figet_disk si pas déjà fait par fi_systeme
[ "$fget_nb_disk" ] || figet_disk # appel figet_disk si pas déjà fait par fi_systeme
if [ "$(which hddtemp)" ]; then
unset dd_temp dd_temp_alert
for idisk in $disk_fix; do
for idisk in $fget_disk_fixe; do
[ -r "/dev/$idisk" ] || continue
tempodd="$(LC_ALL=C hddtemp /dev/$idisk | cut -d ':' -f3 | sed 's/[^0-9]*//g; /not available/d')"
dd_temp+="$idisk: $tempodd °C"$' \n'
@ -393,17 +393,17 @@ fi_disk(){ # 17/10/2017
###
text="## disque(s) \n\n"
text+='``` \n'
text+="$part_fix_tot \n\n" # espaces des partitions montées
[ "$(wc -w <<< $disk_fix)" -gt 1 ] && pluriel="s" || unset pluriel
text+="$(printf '%-17s: %s' "disque$pluriel fixe$pluriel" "$disk_fix") \n" # devices fixes
[ "$(wc -w <<< $disk_hotplug)" -gt 1 ] && pluriel="s" || unset pluriel
text+="$(printf '%-17s: %s' "disque$pluriel amovible$pluriel" "$disk_hotplug") \n\n" # devices hotplug
text+="$disk_detail \n" # caractéristiques des disques trouvés
text+="$fget_disk_part_fix_tot \n\n" # espaces des partitions fixes montées
[ "$(wc -w <<< $fget_disk_fixe)" -gt 1 ] && pluriel="s" || unset pluriel
text+="$(printf '%-17s: %s' "disque$pluriel fixe$pluriel" "$fget_disk_fixe") \n" # devices fixes
[ "$(wc -w <<< $fget_disk_amov)" -gt 1 ] && pluriel="s" || unset pluriel
text+="$(printf '%-17s: %s' "disque$pluriel amovible$pluriel" "$fget_disk_amov") \n\n" # devices hotplug
text+="$fget_disk_detail \n" # caractéristiques des disques trouvés
text+='``` \n\n'
text+="**types de disque** \n\n"
text+="| ata | usb | mmc | nvme | \n"
text+="| :---: | :---: | :---: | :---: | \n"
text+="| $disk_ata | $disk_usb | $disk_mmc | $disk_nvme | \n\n"
text+="| $fget_disk_ata | $fget_disk_usb | $fget_disk_mmc | $fget_disk_nvme | \n\n"
# éventuellement hddtemp
if [ "$dd_temp" ]; then
text+='`hddtemp /dev/sd?` (température disques) \n'
@ -448,8 +448,8 @@ fi_disk(){ # 17/10/2017
echo -e "$text" >> "$fileOutput"
}
fi_dmesg(){ # 10/10/2017
local dmesg_err dmesg_warn dmesg_crit text
fi_dmesg(){ # 18/10/2017
local dmesg_err dmesg_warn dmesg_crit file text
file="/tmp/$$-$RANDOM-dmesg"
[ "$EUID" -eq 0 ] || echo
f__sudo "dmesg -Hk --nopager -l err > $file-err ; \
@ -952,7 +952,7 @@ fi_systeme(){ # 14/10/2017
text+="window manager: $fget_wm \n"
text+="shell actif: $fget_shell \n"
text+="shells installés: $shells \n"
text+="$part_fix_tot \n"
text+="$fget_disk_part_fix_tot \n"
if [ "$fget_batt" ]; then
[ "$fget_batt_nb" -gt "1" ] && pluriel="s" || unset pluriel
text+="$fget_batt_nb batterie$pluriel présente$pluriel: \n"
@ -982,7 +982,7 @@ fi_usb(){ # 25/09/2017
}
# informations batterie(s), assigne $fget_batt_nb $fget_batt
figet_batt(){ # 17/10/2017
figet_batt(){ # v2 17/10/2017
local batt_detail batt_nb batt_alim 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
@ -1170,55 +1170,65 @@ figet_de(){ # thanks neofetch, assigne $fget_de #14/10/2017
fget_de="${fget_de^}"
}
# assigne $disk_detail $disk_hotplug $disk_fix $part_fix $part_hotplug $part_fix_tot
# $disk_ata $disk_usb $disk_mmc $disk_nvme
figet_disk(){ # 17/10/2017
local vendor_model idisk list_id
# détails disques et séquences disques fixes et amovibles, $disk_detail, $disk_fix, $disk_hotplug
unset disk_hotplug disk_fix part_fix part_hotplug
disk_detail="$(printf '%6s %8s %-24s %-s' "disque" "taille" "vendeur modèle" "n° serie révision")"$'\n'
# $fget_nb_disk : nb disk fixe & amovible, $fget_disk_detail : tableau sommaire
# $fget_disk_fixe : liste devices block fixes, $fget_disk_amov : liste devices block amovibles
# $fget_disk_part_fix_tot : espace des partitions fixes montées
# $fget_disk_ata, $fget_disk_usb, $fget_disk_mmc, $fget_disk_nvme : liste disk ata, usb...
# $fget_disk_part_fixe_nm, $fget_disk_part_amov_nm : partitions non montées, fixes ou amovibles
# $fget_disk_part_fixe_m, $fget_disk_part_amov_m : liste partitions montées, fixes ou amovibles
figet_disk(){ # v2 18/10/2017
local size type vendor_model serial_rev list_id idisk
# détail disques, séquence disques fixes et amovibles
unset fget_disk_fixe fget_disk_amov
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
vendor_model="$(lsblk -no VENDOR,MODEL /dev/$idisk | xargs )"
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 )"
[ "$type" == "0" ] && type="Fixe" || type="Amov"
if [ -z "$vendor_model" ]; then
vendor_model=" na na "
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
disk_detail+="$(printf '%6s %8s ' $idisk $(lsblk -no SIZE -d /dev/$idisk))"
disk_detail+="$(printf '%-24s %-s' "$vendor_model" "$(lsblk -no SERIAL,REV /dev/$idisk | xargs)")"$'\n'
fget_disk_detail+="$(printf '%-5s %-8s %-6s %-24s %-26s' "$idisk" "$size" "$type" "$vendor_model" "$serial_rev")"$'\n'
if [ "$(lsblk -no HOTPLUG /dev/$idisk | xargs | cut -d' ' -f2)" == "0" ]; then
disk_fix+="$idisk "
fget_disk_fixe+="$idisk " # "sda sdb ..."
else
disk_hotplug+="$idisk "
fget_disk_amov+="$idisk "
fi
done
disk_detail=${disk_detail::-1} # suppression dernier $'\n'
# séquences partitions fixes, $part_fix, $(printf '/dev/%s ' $part_fix), "sda1 sda2 sda3"
part_fix="$(lsblk -o KNAME,MOUNTPOINT $(printf '/dev/%s ' $disk_fix) 2>/dev/null | grep '/')"
part_fix="$(gawk '{print $1}' <<< $part_fix | tr '\n' ' ')"
# séquences partitions amovibles, $part_hotplug
part_hotplug="$(lsblk -o KNAME,MOUNTPOINT $(printf '/dev/%s ' $disk_hotplug) 2>/dev/null | grep '/')"
part_hotplug="$(gawk '{print $1}' <<< $part_hotplug | tr '\n' ' ')"
[ "$disk_fix" ] || disk_fix="-"
[ "$part_fix" ] || part_fix="-"
[ "$disk_hotplug" ] || disk_hotplug="-"
[ "$part_hotplug" ] || part_hotplug="-"
# total espaces partition montées et fixes
part_fix_tot="espace disque des partitions fixes montées (total, utilisé, dispo): "
part_fix_tot+="$(df -h --total --output=size,used,avail $(printf '/dev/%s ' $part_fix) | tail -n-1 | xargs)"
part_fix_tot="$(sed 's/G/Go/g; s/M/Mo/g; s/K/ko/g' <<< $part_fix_tot)"
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 .)"
# séquences partitions fixes, montées (m) et non montées (nm)
fget_disk_part_fixe_m="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_fixe) 2>/dev/null | gawk '/\// {print $1}')"
fget_disk_part_fixe_nm="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_fixe) 2>/dev/null | gawk '!/\// && /[0-9]+/ {print $1}')"
# séquences partitions amovibles, montées (m) et non montées (nm)
fget_disk_part_amov_m="$(lsblk -o KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_amov) 2>/dev/null | gawk '/\// {print $1}')"
fget_disk_part_amov_nm="$(lsblk -o KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_amov) 2>/dev/null | gawk '!/\// && /[0-9]+/ {print $1}')"
[ "$fget_disk_fixe" ] || fget_disk_fixe="-"
[ "$fget_disk_amov" ] || fget_disk_amov="-"
[ "$fget_disk_part_fixe_m" ] || fget_disk_part_fixe_m="-"
[ "$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
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)"
# liste des disques par type
list_id="$(ls -l /dev/disk/by-id/ | gawk '{print $9,$11}')"
disk_ata="$(sed '/^ata/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
disk_usb="$(sed '/^usb/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
# disk_mmc="$(sed '/^mmc/!d; /part/d; /\/mmcblk/!d; s/^.*\(mmcblk..*\)$/\1/' <<< $list_id | tr '\n' ' ')"
disk_mmc="$(sed '/^mmc/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
# disk_nvme="$(sed '/^nvme/!d; /part/d; /\/nvme/!d; s/^.*\(nvme...*\)$/\1/' <<< $list_id | tr '\n' ' ')"
disk_nvme="$(sed '/^nvme/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
# disk_nvme="$(sed '/^nvme/!d; /part/d' <<< $list_id | awk -F '/' '{if ($0=""){print "-"} else {print $NF}}' | tr '\n' ' ')"
[ "$disk_ata" ] || disk_ata="-"
[ "$disk_usb" ] || disk_usb="-"
[ "$disk_mmc" ] || disk_mmc="-"
[ "$disk_nvme" ] || disk_nvme="-"
fget_disk_ata="$(sed '/^ata/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
fget_disk_usb="$(sed -n '/part/d; /^usb/p' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
# fget_disk_mmc="$(sed '/^mmc/!d; /part/d; /\/mmcblk/!d; s/^.*\(mmcblk..*\)$/\1/' <<< $list_id | tr '\n' ' ')"
fget_disk_mmc="$(sed '/^mmc/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
fget_disk_nvme="$(sed '/^nvme/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
[ "$fget_disk_ata" ] || fget_disk_ata="-"
[ "$fget_disk_usb" ] || fget_disk_usb="-"
[ "$fget_disk_mmc" ] || fget_disk_mmc="-"
[ "$fget_disk_nvme" ] || fget_disk_nvme="-"
}
figet_distro(){ # thanks neofetch, assigne $fget_distro # 09/10/2017
@ -1361,7 +1371,7 @@ figet_hw(){ # 14/10/2017
fget_hw=${fget_hw::-1} # suppression dernier $'\n'
}
figet_hw_test(){ # 17/10/2017
figet_hw_test(){ # 18/10/2017
local text temp
text+="## hwmon test \n\n"
text+="\`/sys/class/hwmon/ 1\` \n"
@ -1370,9 +1380,9 @@ figet_hw_test(){ # 17/10/2017
f__scandir "/sys/class/hwmon/" 1
text='``` \n'
if [ "$(which sensors)" ]; then
text+="\`sensors\` \n"
text+="\`sensors -u\` \n"
text+='``` \n'
text+="$(sensors) \n"
text+="$(sensors -u) \n"
text+='``` \n'
fi
if [ "$(which acpi)" ]; then
@ -1826,10 +1836,8 @@ prg_1(){ # début
echo > "$fileOutput"
chown $user_: "$fileOutput" &>/dev/null
chmod 666 "$fileOutput" &>/dev/null # rw-rw-rw-, si root permet écriture & effacement à tous
hote="$(uname -n)"
dateRapport="$(date '+%d/%m/%Y %H:%M %z')"
echo -e "# $script sur $hote \n" > "$fileOutput"
echo -e "Rapport du $dateRapport - [$script $version]($urlNotice) \n" >> "$fileOutput"
echo -e "# $script sur $(uname -n) \n" > "$fileOutput"
echo -e "$ligneRapport \n" >> "$fileOutput"
}
prg_2(){ # traitements principaux
printf " ."
@ -1863,8 +1871,8 @@ prg_2(){ # traitements principaux
fi
}
prg_3(){ # fin de traitements
echo -e "--- \n" >> "$fileOutput"
echo -e "[$script $version]($urlNotice) - $dateRapport\n" >> "$fileOutput"
echo -e "--- \n" >> "$fileOutput"
echo -e "$ligneRapport \n" >> "$fileOutput"
f__dialog_oui_non "non" "\n\n exporter sur le pastebin par défaut?" && fipaste
f__info "le rapport est disponible en local, fichier:$YELLOW $fileOutput" \
"vous pouvez le visualiser ultérieurement avec $GREEN$script -l" \
@ -1908,6 +1916,7 @@ prg_alert_crit(){ # 11/10/2017
# initialisation
PATH='/usr/sbin:/usr/bin:/sbin:/bin'; TERM=xterm ; IFS=$' \t\n'
export PATH TERM IFS
ligneRapport="Rapport du $(date '+%d/%m/%Y %H:%M %z') - $0 $* - [$script $version]($urlNotice)"
f__affichage
@ -1923,7 +1932,6 @@ fi
[ "$(grep -o 'version 4' <<< $(bash --version) | sed 's/version //')" -ge "4" ] || f__error "bash version 4"
f__requis "gawk wget ip>iproute2 lspci>pciutils" # requis pour fonctionnement programme
prg_alert_crit
options=$@
# traitement option
for j in $options; do
@ -1964,13 +1972,14 @@ unset k
for j in $options; do
case $j in
-t | --test )
prg_1
fi_disk
# prg_3
prg_1 "$*"
# fi_dmesg
fi_batt
prg_3
exit ;; # test seulement
-c* | all )
[ "$j" == "-c" ] && exec $0 "menu"
prg_1
prg_1 "$*"
j=$(sed -E 's/-c//' <<< $j)
prg_2 "$j"
prg_3
@ -1987,29 +1996,29 @@ for j in $options; do
f_help
exit ;; # affichage help
--debug-all )
prg_1
prg_1 "$*"
figet_batt_test
figet_dmi_test
figet_hw_test
prg_3
exit ;; # test batterie, dmi, hwmon
--debug-batt )
prg_1
prg_1 "$*"
figet_batt_test
prg_3
exit ;; # test batterie avec scan /sys/class/power_supply/
--debug-dmi )
prg_1
prg_1 "$*"
figet_dmi_test
prg_3
exit ;; # test dmi avec affichage /sys/class/dmi/id/
--debug-hw )
prg_1
prg_1 "$*"
figet_hw_test
prg_3
exit ;; # test hwmon avec affichage /sys/class/hwmon/
--dmesg )
prg_1
prg_1 "$*"
fi_log_xorg
fi_dmesg "dmesg"
prg_3
@ -2047,7 +2056,7 @@ for j in $options; do
fscript_get_version
exit ;; # version du script, en ligne et exécuté
menu | * )
prg_1
prg_1 "$*"
prg_menu
exit ;; # affichage help
esac
@ -2055,7 +2064,7 @@ done
unset j
exit 0
wget -O getInfo https://frama.link/getinfo
wget -nv -O getInfo https://frama.link/getinfo
chmod +x getInfo && ./getInfo
wget -O getInfo https://framagit.org/kyodev/kyopages/raw/master/scripts/getInfo
wget -nv -O getInfo https://framagit.org/kyodev/kyopages/raw/master/scripts/getInfo

16
scripts/getInfo_changelog.md
View File

@ -4,24 +4,20 @@
## todo
* placer ln dans /usr/local/bin au lieu de /usr/bin ?
* disk: renommage variables publiques, révision, fin de lignes
* réseau réviser
* figet_cpu, refaire
* bug temp cpu (neofetch)
* sys/class/thermal/thermal_zone0/ valable?
ls -l /sys/class/thermal/
cooling_device0 -> ../../devices/virtual/thermal/cooling_device0
cooling_device1 -> ../../devices/virtual/thermal/cooling_device1
thermal_zone0 -> ../../devices/virtual/thermal/thermal_zone0
* smartmontools/smartctl (root,temp?)
* batterie souris? /sys/class/input/input19/ , 20
* filtrer temperature 0 (sur i5: 6temp!)
* revoir test $EUID: [ "$EUID" -eq 0 ] || [ "$SUDO_UID" ]
---
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
## 2.9.0 18/10/2017
* révision: réécriture figet_disk, renommage variables publiques
* fix: dmesg, variable locale
## 2.8.8 17/10/2017
* nouveau: figet_hw_test, acpi -V si disponible, tests (temporaires) sur
@ -34,7 +30,7 @@
* révision: figet_ip_public, fscript_get_version, f__wget_test, fscript_update, suppression option tries
personnalisée
* révision: figet_cpu, suppression affichage température core en attendant mieux
* fix: sr0 compté en disque hotplug et non fixe
* fix: sr0 compté en disque hotplug (et non fixe)
## 2.7.0 16/10/2017