mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.8.5
This commit is contained in:
kyodev
parent
2b62293e89
commit
9a78d68eb6
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.8.4
|
||||
version=2.8.5
|
||||
date="17/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -359,7 +359,7 @@ fi_cpu(){ # 17/10/2017
|
|||
|
||||
fi_disk(){ # 17/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
|
||||
local dd_temp dd_temp_alert dd_temp_alert_text dd_temp idisk
|
||||
disk_lsblk="$(lsblk -o NAME,FSTYPE,SIZE,LABEL,MOUNTPOINT,UUID)"
|
||||
disk_df="$(df -h --output=source,target,fstype,size,used,avail,pcent --exclude=tmpfs --exclude=devtmpfs | grep -Ev 'devpts|none|proc|sys|tmpfs|udev')"
|
||||
disk_df_i="$(df -i --exclude=tmpfs --exclude=devtmpfs | grep -Ev 'devpts|none|proc|sys|tmpfs|udev')"
|
||||
|
|
@ -387,49 +387,62 @@ fi_disk(){ # 17/10/2017
|
|||
done
|
||||
dd_temp=${dd_temp::-1} # suppression dernier $'\n'
|
||||
dd_temp_alert=${dd_temp_alert::-1} # suppression dernier $'\n'
|
||||
[ "$(wc -w <<< $dd_temp_alert)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
dd_temp_alert_text="disque$pluriel dépassant 50°C: \n"
|
||||
dd_temp_alert_text+="$dd_temp_alert \n"
|
||||
fi
|
||||
###
|
||||
text="## disque(s) \n\n"
|
||||
text+='```\n'
|
||||
text+="$part_fix_tot \n" # espaces des partitions montées
|
||||
text="## disque(s) \n\n"
|
||||
text+='``` \n'
|
||||
text+="$part_fix_tot \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
|
||||
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+='```\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"
|
||||
# df, espaces des partitions montées seules
|
||||
text+='`df -h --output=source,target,fstype,size,used,avail,pcent --exclude=tmpfs --exclude=devtmpfs` (utilisation disques) \n'
|
||||
text+='```\n'
|
||||
text+="$disk_df \n"
|
||||
text+='```\n\n'
|
||||
# df -i, inoeuds
|
||||
text+='`df -i --exclude=tmpfs --exclude=devtmpfs` (utilisation inoeuds) \n'
|
||||
text+='```\n'
|
||||
text+="$disk_df_i \n"
|
||||
text+='```\n\n'
|
||||
text+='`'"lsblk -o NAME,FSTYPE,SIZE,LABEL,MOUNTPOINT,UUID"'` (disques) \n' # lsblk
|
||||
text+='```\n'
|
||||
text+="$disk_lsblk \n"
|
||||
text+='```\n\n'
|
||||
text+='`'"grep -Ev '^[[:blank:]]*#|^$' /etc/fstab"'` (fstab) \n' # fstab
|
||||
text+='```\n'
|
||||
text+="$fstab \n"
|
||||
text+='```\n\n'
|
||||
text+='`'"grep -Evs '^[[:blank:]]*#|^$' /etc/initramfs-tools/conf.d/resume"'` (resume) \n' # resume
|
||||
text+='```\n'
|
||||
if [ "$resume" ]; then
|
||||
text+="$resume \n"
|
||||
else
|
||||
text+="$alert_resume \n"
|
||||
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+='``` \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"
|
||||
# éventuellement hddtemp
|
||||
text+='`hddtemp /dev/sd?` (température disques) \n'
|
||||
text+='``` \n'
|
||||
text+="$dd_temp \n"
|
||||
text+='``` \n'
|
||||
if [ "$dd_temp_alert" ]; then
|
||||
text+="$dd_temp_alert \n"
|
||||
text+="$dd_temp_alert_text \n"
|
||||
fi
|
||||
text+='```\n\n'
|
||||
text+='\n'
|
||||
# df, espaces des partitions montées seules
|
||||
text+='`df -h --output=source,target,fstype,size,used,avail,pcent --exclude=tmpfs --exclude=devtmpfs` (utilisation disques) \n'
|
||||
text+='``` \n'
|
||||
text+="$disk_df \n"
|
||||
text+='``` \n\n'
|
||||
# df -i, inoeuds
|
||||
text+='`df -i --exclude=tmpfs --exclude=devtmpfs` (utilisation inoeuds) \n'
|
||||
text+='``` \n'
|
||||
text+="$disk_df_i \n"
|
||||
text+='``` \n\n'
|
||||
text+='`'"lsblk -o NAME,FSTYPE,SIZE,LABEL,MOUNTPOINT,UUID"'` (disques) \n' # lsblk
|
||||
text+='``` \n'
|
||||
text+="$disk_lsblk \n"
|
||||
text+='``` \n\n'
|
||||
text+='`'"grep -Ev '^[[:blank:]]*#|^$' /etc/fstab"'` (fstab) \n' # fstab
|
||||
text+='``` \n'
|
||||
text+="$fstab \n"
|
||||
text+='``` \n\n'
|
||||
text+='`'"grep -Evs '^[[:blank:]]*#|^$' /etc/initramfs-tools/conf.d/resume"'` (resume) \n' # resume
|
||||
text+='``` \n'
|
||||
if [ "$resume" ]; then
|
||||
text+="$resume \n"
|
||||
else
|
||||
text+="$alert_resume \n"
|
||||
fi
|
||||
text+='``` \n\n'
|
||||
if [ "$alert_uuidResume" ]; then
|
||||
text+="$alert_uuidResume \n\n"
|
||||
text+="$alert_uuidResume \n\n"
|
||||
fi
|
||||
echo -e "$text" >> "$fileOutput"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
|
||||
|
||||
## 2.8.4 17/10/2017
|
||||
## 2.8.5 17/10/2017
|
||||
|
||||
* nouveau: figet_hw_test, acpi -V si disponible, tests (temporaires) sur
|
||||
/sys/class/thermal/ & /sys/devices/virtual/thermal/ & hwmon0(méthode neofetch)
|
||||
|
|
|
|||
Loading…
Reference in New Issue