mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.20.2
This commit is contained in:
kyodev
parent
a89e1d8486
commit
06ff414849
149
scripts/getInfo
149
scripts/getInfo
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.20.1
|
||||
version=2.20.2
|
||||
date="29/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -424,10 +424,10 @@ fi_disk(){ # 29/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
|
||||
[ "$fget_nb_disk" ] || figet_disk # appel figet_disk si pas déjà fait par fi_systeme
|
||||
[ "$fg_nb_disk" ] || figet_disk # appel figet_disk si pas déjà fait par fi_systeme
|
||||
if [ "$(f__cmd_exist hddtemp)" ]; then
|
||||
unset dd_temp dd_temp_alert
|
||||
for idisk in $fget_disk_fixe; do
|
||||
for idisk in $fg_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'
|
||||
|
|
@ -437,35 +437,35 @@ fi_disk(){ # 29/10/2017
|
|||
dd_temp_alert=${dd_temp_alert::-1} # suppression dernier $'\n'
|
||||
fi
|
||||
###
|
||||
[ "$fget_nb_disk" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
[ "$fg_nb_disk" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text="## disque$pluriel \n\n"
|
||||
text+='``` \n'
|
||||
# espace des partitions fixes montées
|
||||
text+="$fget_disk_part_fix_tot \n\n"
|
||||
text+="$fg_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"
|
||||
[ "$(wc -w <<< $fget_disk_amov)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-17s: %s' "disque$pluriel amovible$pluriel" "$fget_disk_amov") \n\n"
|
||||
[ "$(wc -w <<< $fg_disk_fixe)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-17s: %s' "disque$pluriel fixe$pluriel" "$fg_disk_fixe") \n"
|
||||
[ "$(wc -w <<< $fg_disk_amov)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-17s: %s' "disque$pluriel amovible$pluriel" "$fg_disk_amov") \n\n"
|
||||
# partitions fixes montées / swap / non montées
|
||||
[ "$(wc -w <<< $fget_disk_part_fixe_m)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-24s: %s' "partition$pluriel fixe$pluriel montée$pluriel" "$fget_disk_part_fixe_m") \n"
|
||||
[ "$(wc -w <<< $fget_disk_part_swap)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-24s: %s' "partition$pluriel swap$pluriel" "$fget_disk_part_swap") \n"
|
||||
[ "$(wc -w <<< $fget_disk_part_fixe_nm)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-28s: %s' "partition$pluriel fixe$pluriel non montée$pluriel" "$fget_disk_part_fixe_nm") \n\n"
|
||||
[ "$(wc -w <<< $fg_disk_part_fixe_m)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-24s: %s' "partition$pluriel fixe$pluriel montée$pluriel" "$fg_disk_part_fixe_m") \n"
|
||||
[ "$(wc -w <<< $fg_disk_part_swap)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-24s: %s' "partition$pluriel swap$pluriel" "$fg_disk_part_swap") \n"
|
||||
[ "$(wc -w <<< $fg_disk_part_fixe_nm)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-28s: %s' "partition$pluriel fixe$pluriel non montée$pluriel" "$fg_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 '%-32s: %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 '%-32s: %s' "partition$pluriel amovible$pluriel non montée$pluriel" "$fget_disk_part_amov_nm") \n\n"
|
||||
[ "$(wc -w <<< $fg_disk_part_amov_m)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-32s: %s' "partition$pluriel amovible$pluriel montée$pluriel" "$fg_disk_part_amov_m") \n"
|
||||
[ "$(wc -w <<< $fg_disk_part_amov_nm)" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text+="$(printf '%-32s: %s' "partition$pluriel amovible$pluriel non montée$pluriel" "$fg_disk_part_amov_nm") \n\n"
|
||||
# détails des disques
|
||||
text+="$fget_disk_detail \n"
|
||||
text+="$fg_disk_table \n"
|
||||
text+='``` \n\n'
|
||||
text+="**types de disque** \n\n"
|
||||
text+="| sata | usb | mmc | nvme | \n"
|
||||
text+="| :---: | :---: | :---: | :---: | \n"
|
||||
text+="| $fget_disk_ata | $fget_disk_usb | $fget_disk_mmc | $fget_disk_nvme | \n\n"
|
||||
text+="| $fg_disk_ata | $fg_disk_usb | $fg_disk_mmc | $fg_disk_nvme | \n\n"
|
||||
# éventuellement hddtemp
|
||||
[ "$dd_temp" ] && f_display "dd_temp" "cmd" "hddtemp /dev/sd?" "(température disques)"
|
||||
if [ "$dd_temp_alert" ]; then
|
||||
|
|
@ -624,8 +624,8 @@ fi_hw(){ # 25/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_journal(){ # 25/10/2017
|
||||
local jctl_boot jctl_alert_k jctl_crit_k jctl_err_k jctl_warn_k jctl_warn_nok file text nb_lignes=25
|
||||
fi_journal(){ # 29/10/2017
|
||||
local jctl_boot jctl_alert_k jctl_crit_k jctl_err_k jctl_warn_k jctl_warn_nok jctl_size file text nb_lignes=25
|
||||
[ "$(f__cmd_exist journalctl)" ] || fi_dmesg # pas systemd, appel dmesg
|
||||
file="/tmp/$$-$RANDOM-journalctl"
|
||||
[ "$EUID" -eq 0 ] || echo
|
||||
|
|
@ -634,6 +634,7 @@ fi_journal(){ # 25/10/2017
|
|||
LC_ALL=C journalctl --no-hostname --boot 0 -k -p 2..2 > $file-crit ; \
|
||||
LC_ALL=C journalctl --no-hostname --boot 0 -p 3..3 > $file-err ; \
|
||||
LC_ALL=C journalctl --no-hostname --boot 0 -p 4..4 > $file-warn ; \
|
||||
LC_ALL=C journalctl --disk-usage > $file-size ; \
|
||||
chown $user_: $file-*"
|
||||
if [ "$?" != "0" ]; then
|
||||
f__info "\n les commandes$GREEN journalctl$RED ont échoué $BLUE(droits root requis, échec authentification?)" \
|
||||
|
|
@ -649,6 +650,7 @@ fi_journal(){ # 25/10/2017
|
|||
jctl_crit_k=$(sed '/kernel:/!d' $file-crit | sed -n 1,"$nb_lignes"p)
|
||||
jctl_err_k=$(sed '/kernel:/!d' $file-err | sed -n 1,"$nb_lignes"p)
|
||||
jctl_warn_k=$(sed '/kernel:/!d' $file-warn | sed -n 1,"$nb_lignes"p)
|
||||
jctl_size=$(grep -Eo '[0-9]*\.[0-9]*[[:alpha:]]{1,2}' $file-size | sed 's/M/ Mo/' )
|
||||
[ "$jctl_alert_k" ] || jctl_alert_k=" <vide>"
|
||||
[ "$jctl_crit_k" ] || jctl_crit_k=" <vide>"
|
||||
[ "$jctl_err_k" ] || jctl_err_k=" <vide>"
|
||||
|
|
@ -682,6 +684,7 @@ fi_journal(){ # 25/10/2017
|
|||
f_display "jctl_warn_nok" "cmd" "journalctl --no-hostname --boot 0 -p 4..4 | grep -v kernel" \
|
||||
"(hors kernel, warning, $nb_lignes premières lignes)"
|
||||
text+="**les $nb_lignes premières lignes commencent à la date du dernier boot** \n\n"
|
||||
f_display "jctl_size" "cmd" "journalctl --disk-usage " "taille des journaux"
|
||||
printf "$text\n" >> "$fileOutput"
|
||||
unset text
|
||||
}
|
||||
|
|
@ -1034,8 +1037,6 @@ fi_systeme(){ # 29/10/2017
|
|||
shells="$(grep -Ev '^[[:blank:]]*#|^$' /etc/shells | sed 's/\/bin\///' | tr '\n' ' ')"
|
||||
if [ $(grep -c 'AC' <<< $(ls /sys/class/power_supply/ 2>/dev/null)) -gt 0 ]; then
|
||||
alim_total=$(grep -cs . <<< $(ls /sys/class/power_supply/AC*/online))
|
||||
# alim_on=$(grep -cs '1' /sys/class/power_supply/AC*/online)
|
||||
# alim_off=$(grep -cs '0' /sys/class/power_supply/AC*/online)
|
||||
alimentation=$( awk -v "alim_total=$alim_total" '
|
||||
{ alim_on=sprintf("%d", $1); if (alim_on>1) pllo="s" }
|
||||
END { if ( alim_total > 1 ) pllt="s"; printf alim_total " alimentation" pllt
|
||||
|
|
@ -1080,7 +1081,7 @@ fi_systeme(){ # 29/10/2017
|
|||
text+="window manager: $fget_wm \n"
|
||||
text+="shell actif: $fget_shell \n"
|
||||
text+="shells installés: $shells \n"
|
||||
text+="$fget_disk_part_fix_tot \n"
|
||||
text+="$fg_disk_part_fix_tot \n"
|
||||
[ "$alimentation" ] && text+="$alimentation \n"
|
||||
if [ "$fg_batt" ]; then
|
||||
[ "$fg_nb_batt" -gt "1" ] && pluriel="s" || unset pluriel
|
||||
|
|
@ -1278,80 +1279,74 @@ figet_de(){ # thanks neofetch, assigne $fget_de #22/10/2017
|
|||
fget_de="${fget_de^}"
|
||||
}
|
||||
|
||||
# $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_m, $fget_disk_part_amov_m : liste partitions montées, fixes ou amovibles
|
||||
# $fget_disk_part_swap : liste partitions swap
|
||||
# $fget_disk_part_fixe_nm, $fget_disk_part_amov_nm : liste partitions non montées, fixes ou amovibles
|
||||
figet_disk(){ #v2 19/10/2017
|
||||
# $fg_nb_disk : nb disk fixe & amovible, $fg_disk_table : tableau sommaire
|
||||
# $fg_disk_fixe : liste devices block fixes, $fg_disk_amov : liste devices block amovibles
|
||||
# $fg_disk_part_fix_tot : espace des partitions fixes montées
|
||||
# $fg_disk_ata, $fg_disk_usb, $fg_disk_mmc, $fg_disk_nvme : liste disk ata, usb...
|
||||
# $fg_disk_part_fixe_m, $fg_disk_part_amov_m : liste partitions montées, fixes ou amovibles
|
||||
# $fg_disk_part_swap : liste partitions swap
|
||||
# $fg_disk_part_fixe_nm, $fg_disk_part_amov_nm : liste partitions non montées, fixes ou amovibles
|
||||
figet_disk(){ #v2 29/10/2017
|
||||
local size type vendor_model serial_rev list_id idisk lsblk
|
||||
unset fget_disk_fixe fget_disk_amov
|
||||
# $fget_disk_detail: tableau sommaire des disques
|
||||
unset fg_disk_fixe fg_disk_amov
|
||||
# $fg_disk_table: 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'
|
||||
fg_disk_table="$(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 )" #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
|
||||
if [ "$vendor_model" ]; then
|
||||
if [ -z "$vendor_model" ]; then
|
||||
vendor_model=" na na"
|
||||
#$9=ata-MATSHITADVD-RAM_UJ-850S_HC71_186848 $11=../../sr0
|
||||
# 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="$(ls -l /dev/disk/by-id/ | gawk ' !/-part/ && !/wwn-/ {print $9,$11}' | xargs )"
|
||||
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'
|
||||
fg_disk_table+="$(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 ..."
|
||||
fg_disk_fixe+="$idisk " # "sda sdb ..."
|
||||
else
|
||||
fget_disk_amov+="$idisk "
|
||||
fg_disk_amov+="$idisk "
|
||||
fi
|
||||
done
|
||||
fget_disk_detail=${fget_disk_detail::-1} # suppression dernier $'\n'
|
||||
#echo "$fget_disk_detail"
|
||||
fg_disk_table=${fg_disk_table::-1} # suppression dernier $'\n'
|
||||
# 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 .)"
|
||||
fg_nb_disk="$(tr ' ' '\n' <<< "$fg_disk_fixe$fg_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' ' ')"
|
||||
fget_disk_part_fixe_nm="$(echo "$lsblk" | gawk '!/\// && /[0-9]+/ && !/\[SWAP\]/{print $1}' | tr '\n' ' ')"
|
||||
lsblk="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fg_disk_fixe) 2>/dev/null)"
|
||||
fg_disk_part_fixe_m="$(echo "$lsblk" | gawk '/\// {print $1}' | tr '\n' ' ')"
|
||||
fg_disk_part_fixe_nm="$(echo "$lsblk" | gawk '!/\// && /[0-9]+/ && !/\[SWAP\]/{print $1}' | tr '\n' ' ')"
|
||||
# séquences partitions amovibles, montées (m) et non montées (nm)
|
||||
lsblk="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fget_disk_amov) 2>/dev/null)"
|
||||
fget_disk_part_amov_m="$(echo "$lsblk" | gawk '/\// {print $1}' | tr '\n' ' ')"
|
||||
fget_disk_part_amov_nm="$(echo "$lsblk" | gawk '!/\// && /[0-9]+/ && !/\[SWAP\]/{print $1}' | tr '\n' ' ')"
|
||||
lsblk="$(lsblk -no KNAME,MOUNTPOINT $(printf '/dev/%s ' $fg_disk_amov) 2>/dev/null)"
|
||||
fg_disk_part_amov_m="$(echo "$lsblk" | gawk '/\// {print $1}' | tr '\n' ' ')"
|
||||
fg_disk_part_amov_nm="$(echo "$lsblk" | gawk '!/\// && /[0-9]+/ && !/\[SWAP\]/{print $1}' | tr '\n' ' ')"
|
||||
# partitions swap
|
||||
fget_disk_part_swap="$(echo "$(lsblk -no KNAME,MOUNTPOINT)" | gawk '/\[SWAP\]/ {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="-"
|
||||
[ "$fget_disk_part_swap" ] || fget_disk_part_swap="-"
|
||||
[ "$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="-"
|
||||
fg_disk_part_swap="$(echo "$(lsblk -no KNAME,MOUNTPOINT)" | gawk '/\[SWAP\]/ {print $1}' | tr '\n' ' ')"
|
||||
[ "$fg_disk_fixe" ] || fg_disk_fixe="-"
|
||||
[ "$fg_disk_amov" ] || fg_disk_amov="-"
|
||||
[ "$fg_disk_part_fixe_m" ] || fg_disk_part_fixe_m="-"
|
||||
[ "$fg_disk_part_swap" ] || fg_disk_part_swap="-"
|
||||
[ "$fg_disk_part_fixe_nm" ] || fg_disk_part_fixe_nm="-"
|
||||
[ "$fg_disk_part_amov_m" ] || fg_disk_part_amov_m="-"
|
||||
[ "$fg_disk_part_amov_nm" ] || fg_disk_part_amov_nm="-"
|
||||
# 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)"
|
||||
fg_disk_part_fix_tot="espace des partitions fixes montées (total, utilisé, dispo): "
|
||||
fg_disk_part_fix_tot+="$(df -h --total --output=size,used,avail $(printf '/dev/%s ' $fg_disk_part_fixe_m) 2>/dev/null | tail -n-1 | xargs)"
|
||||
fg_disk_part_fix_tot="$(sed 's/G/Go/g; s/M/Mo/g; s/K/ko/g' <<< $fg_disk_part_fix_tot)"
|
||||
# liste des disques par type
|
||||
list_id="$(ls -l /dev/disk/by-id/ | gawk '{print $9,$11}')"
|
||||
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_ata="$(tr ' ' '\n' <<< "$fget_disk_ata" | sort | tr '\n' ' ')"
|
||||
[ "$fget_disk_usb" ] || fget_disk_usb="-" && fget_disk_usb="$(tr ' ' '\n' <<< "$fget_disk_usb" | sort | tr '\n' ' ')"
|
||||
[ "$fget_disk_mmc" ] || fget_disk_mmc="-" && fget_disk_mmc="$(tr ' ' '\n' <<< "$fget_disk_mmc" | sort | tr '\n' ' ')"
|
||||
[ "$fget_disk_nvme" ] || fget_disk_nvme="-" && fget_disk_nvme="$(tr ' ' '\n' <<< "$fget_disk_nvme" | sort | tr '\n' ' ')"
|
||||
fg_disk_ata="$(sed '/^ata/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
|
||||
fg_disk_usb="$(sed -n '/part/d; /^usb/p' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
|
||||
# fg_disk_mmc="$(sed '/^mmc/!d; /part/d; /\/mmcblk/!d; s/^.*\(mmcblk..*\)$/\1/' <<< $list_id | tr '\n' ' ')"
|
||||
fg_disk_mmc="$(sed '/^mmc/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
|
||||
fg_disk_nvme="$(sed '/^nvme/!d; /part/d' <<< $list_id | awk -F '/' '{print $NF}' | tr '\n' ' ')"
|
||||
[ "$fg_disk_ata" ] || fg_disk_ata="-" && fg_disk_ata="$(tr ' ' '\n' <<< "$fg_disk_ata" | sort | tr '\n' ' ')"
|
||||
[ "$fg_disk_usb" ] || fg_disk_usb="-" && fg_disk_usb="$(tr ' ' '\n' <<< "$fg_disk_usb" | sort | tr '\n' ' ')"
|
||||
[ "$fg_disk_mmc" ] || fg_disk_mmc="-" && fg_disk_mmc="$(tr ' ' '\n' <<< "$fg_disk_mmc" | sort | tr '\n' ' ')"
|
||||
[ "$fg_disk_nvme" ] || fg_disk_nvme="-" && fg_disk_nvme="$(tr ' ' '\n' <<< "$fg_disk_nvme" | sort | tr '\n' ' ')"
|
||||
}
|
||||
|
||||
# assigne $fg_distrib
|
||||
|
|
@ -2194,7 +2189,7 @@ for j in $options; do
|
|||
case $j in
|
||||
-t | --test )
|
||||
prg_1 "$*"
|
||||
fi_systeme
|
||||
fi_disk
|
||||
prg_3
|
||||
exit ;; # test seulement
|
||||
-c* | all )
|
||||
|
|
|
|||
|
|
@ -8,14 +8,16 @@
|
|||
* revoir modules réseau
|
||||
* réviser alert_
|
||||
* finir révision vrms
|
||||
* bug aléatoire wwn, revoir filtrage
|
||||
|
||||
---
|
||||
|
||||
## 2.20.1 29/10/2017
|
||||
## 2.20.2 29/10/2017
|
||||
|
||||
* nouveau: figet_distrib
|
||||
* nouveau: taille des fichier journaux
|
||||
* suppression: figet_distro neofetch
|
||||
* fix: ? bug aléatoire wwn
|
||||
|
||||
|
||||
## 2.19.6 28/10/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue