mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.10.1
This commit is contained in:
kyodev
parent
3284963827
commit
0140691e0d
|
|
@ -357,7 +357,7 @@ fi_cpu(){ # 17/10/2017
|
|||
echo -e "$text" >> "$fileOutput"
|
||||
}
|
||||
|
||||
fi_disk(){ # 18/10/2017
|
||||
fi_disk(){ # 19/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)"
|
||||
|
|
@ -393,12 +393,25 @@ fi_disk(){ # 18/10/2017
|
|||
###
|
||||
text="## disque(s) \n\n"
|
||||
text+='``` \n'
|
||||
text+="$fget_disk_part_fix_tot \n\n" # espaces des partitions fixes montées
|
||||
# espace des partitions fixes montées
|
||||
text+="$fget_disk_part_fix_tot \n\n"
|
||||
# disques fixes et amovibles
|
||||
[ "$(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
|
||||
text+="$(printf '%-17s: %s' "disque$pluriel fixe$pluriel" "$fget_disk_fixe") \n"
|
||||
[ "$(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+="$(printf '%-17s: %s' "disque$pluriel amovible$pluriel" "$fget_disk_amov") \n\n"
|
||||
# partitions fixes montées / non montées
|
||||
[ "$(wc -w <<< $fget_disk_part_fixe_m)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-17s: %s' "partition$pluriel fixe$pluriel montée$pluriel" "$fget_disk_part_fixe_m") \n"
|
||||
[ "$(wc -w <<< $fget_disk_part_fixe_nm)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-17s: %s' "partition$pluriel fixe$pluriel non montée$pluriel" "$fget_disk_part_fixe_nm") \n\n"
|
||||
# partitions amovibles montées / non montées
|
||||
[ "$(wc -w <<< $fget_disk_part_amov_m)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-17s: %s' "partition$pluriel amovible$pluriel montée$pluriel" "$fget_disk_part_amov_m") \n"
|
||||
[ "$(wc -w <<< $fget_disk_part_amov_nm)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-17s: %s' "partition$pluriel amovible$pluriel non montée$pluriel" "$fget_disk_part_amov_nm") \n\n"
|
||||
# détails des disques
|
||||
text+="$fget_disk_detail \n"
|
||||
text+='``` \n\n'
|
||||
text+="**types de disque** \n\n"
|
||||
text+="| ata | usb | mmc | nvme | \n"
|
||||
|
|
@ -1254,9 +1267,9 @@ figet_de(){ # thanks neofetch, assigne $fget_de #14/10/2017
|
|||
# $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_nm, $fget_disk_part_amov_nm : liste 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
|
||||
figet_disk(){ # v2 19/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
|
||||
|
|
@ -1283,11 +1296,11 @@ figet_disk(){ # v2 18/10/2017
|
|||
# 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}')"
|
||||
fget_disk_part_fixe_m="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_fixe) 2>/dev/null | gawk '/\// {print $1}' | tr '\n' ' ')"
|
||||
fget_disk_part_fixe_nm="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_fixe) 2>/dev/null | gawk '!/\// && /[0-9]+/ {print $1}' | tr '\n' ' ')"
|
||||
# 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_part_amov_m="$(lsblk -o KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_amov) 2>/dev/null | gawk '/\// {print $1}' | tr '\n' ' ')"
|
||||
fget_disk_part_amov_nm="$(lsblk -o KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_amov) 2>/dev/null | gawk '!/\// && /[0-9]+/ {print $1}' | tr '\n' ' ')"
|
||||
[ "$fget_disk_fixe" ] || fget_disk_fixe="-"
|
||||
[ "$fget_disk_amov" ] || fget_disk_amov="-"
|
||||
[ "$fget_disk_part_fixe_m" ] || fget_disk_part_fixe_m="-"
|
||||
|
|
@ -2053,7 +2066,7 @@ for j in $options; do
|
|||
case $j in
|
||||
-t | --test )
|
||||
prg_1 "$*"
|
||||
fi_journal
|
||||
fi_disk
|
||||
prg_3
|
||||
exit ;; # test seulement
|
||||
-c* | all )
|
||||
|
|
|
|||
|
|
@ -12,14 +12,16 @@
|
|||
|
||||
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
|
||||
|
||||
## 2.10.0 19/10/2017
|
||||
## 2.10.1 19/10/2017
|
||||
|
||||
* nouveau: fi_journal, journaux kernel et non-kernel via journalctl, dmesg en fallback
|
||||
* nouveau: fi_disk, ajout listes partitions fixes/amovibles, montées/non montées
|
||||
* révision: fi_dmesg
|
||||
* révision: suppression option --dmesg, journaux via option -ca (fi_system_analyse fi_log_xorg fi_journal)
|
||||
+ option -j
|
||||
* fi_nonFree passsé en catégorie configuration (-cc), option équivalente -j
|
||||
* fix: fi_dmesg, niveau emergency & alerte oublié
|
||||
* fix: partitions en liste
|
||||
|
||||
## 2.9.1 18/10/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue