mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.21.7
This commit is contained in:
kyodev
parent
8536594505
commit
cee9384e97
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.21.6
|
||||
version=2.21.7
|
||||
date="31/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -408,7 +408,7 @@ fi_cpu(){ # 25/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_disk(){ # 30/10/2017
|
||||
fi_disk(){ # 31/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)"
|
||||
|
|
@ -439,8 +439,8 @@ fi_disk(){ # 30/10/2017
|
|||
dd_temp+="$idisk: $tempodd °C"$'\n'
|
||||
[ "$tempodd" -ge 50 ] && dd_temp_alert+="/!\ $idisk: température > 50°C) "$'\n'
|
||||
done
|
||||
dd_temp=${dd_temp::-1} # suppression dernier $'\n'
|
||||
dd_temp_alert=${dd_temp_alert::-1} # suppression dernier $'\n'
|
||||
[ "$dd_temp" ] && dd_temp=${dd_temp::-1} # suppression dernier $'\n'
|
||||
[ "$dd_temp_alert" ] && dd_temp_alert=${dd_temp_alert::-1} # suppression dernier $'\n'
|
||||
fi
|
||||
###
|
||||
[ "$fg_nb_disk" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
|
|
@ -538,18 +538,20 @@ fi_dmesg(){ # 30/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_graph(){ # 30/10/2017
|
||||
local slots cards cmd alert_hybrid alert_3D providers preferred current openGl resolutions text
|
||||
local ig modules glx_dev glx_temp
|
||||
fi_graph(){ # 31/10/2017
|
||||
local slots cmd alert_hybrid alert_3D providers preferred current openGl resolutions text
|
||||
local ig modules glx_dev glx_temp cards="fg_gpu"
|
||||
# cardsManuel="$(lspci -nnk | grep -EiA 3 'vga|display|3d')" # -nn: textual and numeric ID's, k kernel
|
||||
# cardsManuel="$(lspci -nnv | grep -iEA11 'vga|display|3d)" # v=verbose
|
||||
# cardsManuel="lspci -nnv -s $( lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1 )" si plusieurs devices possibles??
|
||||
|
||||
[ "$fg_nb_gpu" ] || figet_gpu # peut retourner "n/a"/-1
|
||||
# slots pci video
|
||||
slots="$(lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
|
||||
# si mult-cartes
|
||||
[ "$fg_nb_gpu" ] || figet_gpu
|
||||
# lspci
|
||||
if [ "$fg_nb_gpu" -gt 1 ]; then
|
||||
# lspci
|
||||
if [ "$fg_nb_gpu" -eq 0 ]; then
|
||||
cards="pas de carte graphique"$'\n'
|
||||
elif [ "$fg_nb_gpu" -gt 1 ]; then
|
||||
if [ $(f__cmd_exist optirun) ]; then
|
||||
for ig in $slots; do
|
||||
cards+="$(optirun lspci -nnv -s $ig)"$'\n'
|
||||
|
|
@ -567,9 +569,8 @@ fi_graph(){ # 30/10/2017
|
|||
done
|
||||
cmd="lspci -nnv | grep -iEA11 'vga|display|3d'" # commande à afficher dans le rapport
|
||||
fi
|
||||
cards=${cards::-1} # suppression dernier $'\n'
|
||||
[ $(f__wcv -l "$cards") -eq 0 ] && cards="lspci incompatible"
|
||||
cmd="$prefix_cmd lspci -nnv | grep -iEA11 'vga|display|3d'" # commande à afficher dans le rapport
|
||||
[ "$cards" ] && cards=${cards::-1} # suppression dernier $'\n'
|
||||
[ "$cards" ] || cards="lspci -nnv non disponible"
|
||||
if [ $(grep -c 'Unknown header type 7f' <<< "$cards") -gt 0 ]; then
|
||||
alert_hybrid="Une carte graphique est désactivée actuellement, lspci n'est pas complet. \n"
|
||||
alert_hybrid+="Voir DRI_PRIME, vga-switcheroo, Bumbledee...? \n"
|
||||
|
|
@ -603,7 +604,6 @@ fi_graph(){ # 30/10/2017
|
|||
# modules
|
||||
modules="$(lsmod | grep -Ei 'amdgpu|ati|i915|nouveau|nvidia|radeon|video|gma')"
|
||||
# fonctions externes
|
||||
[ "$fg_gpu" ] || figet_gpu
|
||||
[ "$fg_resolution" ] || figet_screen
|
||||
###
|
||||
[ "$fg_gpu" ] && text="## graphisme \n\n" || text="## graphisme (incomplet) \n\n"
|
||||
|
|
@ -826,7 +826,7 @@ fi_nm(){ # 29/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_reseau(){ # 30/10/2017
|
||||
fi_reseau(){ # 31/10/2017
|
||||
local slots cards ip_a iwconfig interfaces route resolv canal_wifi ifx alert_wlx text pluriel
|
||||
# cardsManuel="$(lspci -nnk | grep -EiA 5 'network|ethernet')"
|
||||
# cardsManuel="$(lspci -nnv | grep -EiA 15 'network|ethernet')"
|
||||
|
|
@ -836,7 +836,7 @@ fi_reseau(){ # 30/10/2017
|
|||
for ifx in $slots; do
|
||||
cards+=$(lspci -s $ifx -nnv)$'\n'
|
||||
done
|
||||
cards=${cards::-1} # suppression dernier $'\n'
|
||||
[ "$cards" ] && cards=${cards::-1} # suppression dernier $'\n'
|
||||
[ $(f__wcv -l "$cards") -eq 0 ] && cards="lspci incompatible"
|
||||
# ip a & route
|
||||
ip_a="$(ip a | sed '/link\/ether/d; /valid_lft/d')" # filtre sur adr MAC & bail
|
||||
|
|
@ -921,7 +921,7 @@ fi_reseau(){ # 30/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_sources(){ # 30/10/2017
|
||||
fi_sources(){ # 31/10/2017
|
||||
[ "$(f__cmd_exist dpkg)" ] || return 0
|
||||
local sources dateMaj nb_packages apt text pluriel
|
||||
local alert_autoremove alert_nbAutoremove alert_paquetToRemove alert_httpredir alert_httpredir_text
|
||||
|
|
@ -955,7 +955,7 @@ fi_sources(){ # 30/10/2017
|
|||
alert_upgradable_text+='`apt list --upgradable`:'
|
||||
fi
|
||||
printf "."
|
||||
alert_paquetBiz="$(dpkg -l | gawk 'FNR>5 && ! /^i/ {print $1, $2, $3}')"
|
||||
alert_paquetBiz="$(LC_ALL=C dpkg -l | gawk 'FNR>5 && ! /^i/ {print $1, $2, $3}')"
|
||||
if [ "$alert_paquetBiz" ]; then
|
||||
[ "$(grep -c '.' <<< "$alert_paquetBiz")" -gt 1 ] && pluriel="s" || unset pluriel
|
||||
alert_paquetBiz_text0="$(grep -c '.' <<< \
|
||||
|
|
@ -976,7 +976,7 @@ fi_sources(){ # 30/10/2017
|
|||
[[ ${alert_paquetBiz,,} =~ ^.u ]] && alert_paquetBiz_text+=" * **u**npacked (décompressé seulement) "$'\n'
|
||||
[[ ${alert_paquetBiz,,} =~ ^.w ]] && alert_paquetBiz_text+=" * triggers-a**w**aiting (attente déclencheurs) "$'\n'
|
||||
[[ ${alert_paquetBiz,,} =~ ^..r ]] && alert_paquetBiz_text+="* **Drapeaux d'erreur**\n * (réinstallation requise) "$'\n'
|
||||
alert_paquetBiz_text=${alert_paquetBiz_text::-1} # suppression dernier $'\n'
|
||||
[ "$alert_paquetBiz_text" ] && alert_paquetBiz_text=${alert_paquetBiz_text::-1} # suppression dernier $'\n'
|
||||
fi
|
||||
###
|
||||
text="## sources liste \n\n"
|
||||
|
|
@ -1068,7 +1068,7 @@ fi_systeme(){ # 31/10/2017
|
|||
figet_dmi
|
||||
figet_disk
|
||||
figet_distrib
|
||||
figet_gpu
|
||||
[ "$fg_nb_gpu" ] || figet_gpu
|
||||
figet_screen
|
||||
figet_shell
|
||||
figet_wm
|
||||
|
|
@ -1085,8 +1085,7 @@ fi_systeme(){ # 31/10/2017
|
|||
text+="* distribution **$fg_distrib** \n\n"
|
||||
text+='``` \n'
|
||||
text+="processeur: $fg_cpu_arch \n"
|
||||
text+="nombre de gpu: $fg_nb_gpu ($(f__wcv -l $fg_nb_gpu)) \n"
|
||||
text+="architecture: $architecture \n"
|
||||
text+="architecture système: $architecture \n"
|
||||
text+="uname: $uname \n"
|
||||
text+="$bootImage \n"
|
||||
text+="démon d'initialisation: $initDaemon \n"
|
||||
|
|
@ -1142,7 +1141,7 @@ fi_vrms(){ # 30/09/2017
|
|||
}
|
||||
|
||||
# informations batterie(s), assigne $fg_nb_batt $fg_batt
|
||||
figet_batt(){ #v2 30/10/2017
|
||||
figet_batt(){ #v2 31/10/2017
|
||||
local batt_detail batt_nb 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
|
||||
|
|
@ -1233,7 +1232,7 @@ figet_batt(){ #v2 30/10/2017
|
|||
fi
|
||||
done
|
||||
fg_nb_batt="$batt_nb"
|
||||
fg_batt=${batt_detail::-1} # suppression dernier $'\n'
|
||||
[ "$batt_detail" ] && fg_batt=${batt_detail::-1} # suppression dernier $'\n'
|
||||
}
|
||||
|
||||
# assigne $fg_cpu (3 lignes description cpu), fg_nb_threads, $fg_cpu_arch
|
||||
|
|
@ -1321,7 +1320,7 @@ figet_de(){ # thanks neofetch, assigne $fg_de #30/10/2017
|
|||
# $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 30/10/2017
|
||||
figet_disk(){ #v2 31/10/2017
|
||||
local size type vendor_model serial_rev list_id idisk lsblk
|
||||
unset fg_disk_fixe fg_disk_amov
|
||||
# $fg_disk_table: tableau sommaire des disques
|
||||
|
|
@ -1347,7 +1346,7 @@ figet_disk(){ #v2 30/10/2017
|
|||
fg_disk_amov+="$idisk "
|
||||
fi
|
||||
done
|
||||
fg_disk_table=${fg_disk_table::-1} # suppression dernier $'\n'
|
||||
[ "$fg_disk_table" ] && fg_disk_table=${fg_disk_table::-1} # suppression dernier $'\n'
|
||||
# nb de disques (fixe+amovible), peut servir d'indicateur fonction déja appelée
|
||||
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)
|
||||
|
|
@ -1462,19 +1461,20 @@ figet_dmi(){ # 30/10/2017
|
|||
# done
|
||||
}
|
||||
|
||||
# assigne $fg_gpu, fg_nb_gpu
|
||||
# assigne $fg_gpu, $fg_nb_gpu peut retourner "n/a"/-1
|
||||
figet_gpu(){ # 31/10/2017
|
||||
fg_gpu="lspci -mm non disponible" fg_nb_gpu=-1
|
||||
local lspci="$(lspci -mm)"
|
||||
[ "$?" -gt 0 ] && return 0
|
||||
[ "$?" -gt 0 ] && return 1
|
||||
# debug: lspci="$(< tests/lspci)"
|
||||
fg_gpu="$(gawk -F' "|" "|" -' ' /"Display|"3D|"VGA/ {
|
||||
sub(/ Corporation/,"",$3); sub(/Advanced Micro Devices, Inc. /,"",$3); sub(/ /," ",$3);
|
||||
print $3": "$4}' <<< $lspci)"
|
||||
fg_nb_gpu=$(echo "$fg_gpu" | wc -l)
|
||||
fg_nb_gpu=$(f__wcv -l "$fg_gpu")
|
||||
}
|
||||
|
||||
# infos température et fan via acpi, assigne $fg_hw
|
||||
figet_hw(){ #v2 30/10/2017
|
||||
figet_hw(){ #v2 31/10/2017
|
||||
local name labelF inputF labelT inputT critT hystT maxiT fan temp ihw
|
||||
if [ ! -d /sys/class/hwmon/ ]; then
|
||||
fg_hw="gestion acpi hwmon non accessible"
|
||||
|
|
@ -1498,9 +1498,9 @@ figet_hw(){ #v2 30/10/2017
|
|||
hystT=$(echo $hystT | tr '/' '\n' | sort --unique | tr '\n' '/')
|
||||
maxiT=$(echo $maxiT | tr '/' '\n' | sort --unique | tr '\n' '/')
|
||||
# suppression premier /
|
||||
[ ${critT:0:1} == "/" ] && critT=${critT:1}
|
||||
[ ${hystT:0:1} == "/" ] && hystT=${hystT:1}
|
||||
[ ${maxiT:0:1} == "/" ] && maxiT=${maxiT:1}
|
||||
critT=${critT#/} #[ ${critT:0:1} == "/" ] && critT=${critT:1}
|
||||
hystT=${hystT#/} # suppression / en début de variable
|
||||
maxiT=${maxiT#/}
|
||||
# suppression dernier caractère (/) fin (nécessaire si multi-valeurs)
|
||||
[ "$inputT" ] && inputT=${inputT::-1}
|
||||
[ "$labelT" ] && labelT=${labelT::-1}
|
||||
|
|
@ -1536,7 +1536,7 @@ figet_hw(){ #v2 30/10/2017
|
|||
}
|
||||
|
||||
# assigne $fg_ip, $fg_ip_tp, $fg_gws, $fg_gws_tp, $fg_ifn_prior, $fg_ifn, $fg_mac, fg_mac_tp
|
||||
figet_ip(){ # 30/10/2017
|
||||
figet_ip(){ # 31/10/2017
|
||||
local ifn
|
||||
[ "$(f__cmd_exist ip)" ] || return 1
|
||||
fg_ip="$(sed '/[[:digit:]]:[[:blank:]]lo.*inet/d; /inet6.*scope/d' <<< $(ip -o a) | gawk '{print " ",$4,"(",$2,")"}')"
|
||||
|
|
@ -1552,8 +1552,8 @@ figet_ip(){ # 30/10/2017
|
|||
fg_ifn="$(sed '/^[[:space:]]*$/d' <<< $fg_ifn)" # suppression lignes vides
|
||||
fg_mac="$(sed '/^[[:space:]]*$/d' <<< $fg_mac)" # suppression lignes vides
|
||||
fg_mac_tp="$(sed -E 's/(^.*wl.*)/\1 (wifi)/;s/(^.*en.*|^.*eth.*)/\1 (ethernet)/' <<< $fg_mac)"
|
||||
fg_ifn=${fg_ifn::-1} # suppression dernier $'\n'
|
||||
fg_mac=${fg_mac::-1} # suppression dernier $'\n'
|
||||
[ "$fg_ifn" ] && fg_ifn=${fg_ifn::-1} # suppression dernier $'\n'
|
||||
[ "$fg_mac" ] && fg_mac=${fg_mac::-1} # suppression dernier $'\n'
|
||||
}
|
||||
|
||||
# $1=4|6, assigne $fg_public
|
||||
|
|
@ -1649,7 +1649,7 @@ figet_ip_pub(){ # 27/10/2017
|
|||
}
|
||||
|
||||
# $1=mem|swap [total|notitle|nocoltitle], assigne $fg_mem ($2=debug all cols + free)
|
||||
figet_mem(){ # 30/10/2017
|
||||
figet_mem(){ # 31/10/2017
|
||||
local freeDebug MemTotal MemFree MemAvailable Buffers Cached SReclaimable Shmem MemUsed
|
||||
local SwapTotal SwapFree SwapCached col
|
||||
[ "$2" == "debug" ] && freeDebug="$(free -hw | sed '3d')"
|
||||
|
|
@ -1706,11 +1706,11 @@ figet_mem(){ # 30/10/2017
|
|||
local espace=$(printf '% 6s')
|
||||
fg_mem="$espace""mém.: totale utilisée libre shared buffers cache disponible"$'\n'
|
||||
fg_mem+="$espace""ram :$MemTotal$MemUsed$MemFree$Shmem$Buffers$Cached$MemAvailable"$'\n'
|
||||
fg_mem=${fg_mem::-1} # suppression dernier $'\n'
|
||||
[ "$fg_mem" ] && fg_mem=${fg_mem::-1} # suppression dernier $'\n'
|
||||
echo "$fg_mem"
|
||||
echo "$freeDebug"
|
||||
fi
|
||||
fg_mem=${fg_mem::-1} # suppression dernier $'\n'
|
||||
[ "$fg_mem" ] && fg_mem=${fg_mem::-1} # suppression dernier $'\n'
|
||||
}
|
||||
|
||||
figet_mod_net(){ # thanks wireless-info, assigne $fg_mod_net # 30/10/2017
|
||||
|
|
|
|||
|
|
@ -1,32 +1,15 @@
|
|||
# changelog getInfo
|
||||
|
||||
|
||||
## todo
|
||||
|
||||
* placer ln dans /usr/local/bin au lieu de /usr/bin ?
|
||||
* réseau réviser, interface name: virbr0, docker0
|
||||
* revoir modules réseau, ipv6 préfixes
|
||||
* réviser alert_
|
||||
* finir révision vrms
|
||||
* ajouter openrc: OpenRC's built-in init is /usr/bin/openrc-init (tester aussi /usr/bin/init-openrc)
|
||||
The /etc/openrc/
|
||||
https://wiki.gentoo.org/wiki/Comparison_of_init_systems
|
||||
* réviser tous les comptages grep -c ! :(
|
||||
* durcir term?
|
||||
* démon d'initialisation, durcir?
|
||||
|
||||
---
|
||||
|
||||
* f__wcv
|
||||
|
||||
|
||||
|
||||
## 2.21.6 31/10/2017
|
||||
## 2.21.7 31/10/2017
|
||||
|
||||
* nouveau: architecture processeur
|
||||
* fix: alpine linux, FIN!
|
||||
* renommage de tous les variables publiques des fonctions partageables
|
||||
|
||||
* ajout partout protection avant suppression newlines
|
||||
* révision: fi_graph
|
||||
* fix: alpine linux, FIN!
|
||||
|
||||
## 2.21.3 30/10/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue