mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.49.3
This commit is contained in:
kyodev
parent
b8e7018b00
commit
a55415e8d8
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.49.2
|
||||
version=2.49.3
|
||||
date="29/11/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -564,17 +564,17 @@ fi_audio(){ # 29/11/2017
|
|||
|
||||
# modules alsa
|
||||
mod=$( gawk '{ print $2 }' /proc/asound/modules )
|
||||
mod=$( sort <<< $mod )
|
||||
|
||||
# modules kernel
|
||||
for imod in $mod; do
|
||||
for imod in $( sort -u <<< $mod ); do
|
||||
modules+=$( gawk '
|
||||
/'$( echo $imod )'/ { printf "%-25s %s %2s %s\n",$1, $2, $3, $4 }
|
||||
' <<< $( lsmod ) )$'\n'
|
||||
/'$imod'/ { printf "%-25s %s %2s %s\n",$1, $2, $3, $4 }
|
||||
' <<< $( lsmod ) )$'\n'"------"$'\n'
|
||||
motif+="$imod|"
|
||||
done
|
||||
motif=${motif%|}
|
||||
|
||||
mod=${mod%[[:cntrl:]]} # suppression \nl finaux
|
||||
modules=${modules%[[:cntrl:]]------[[:cntrl:]]} # suppression espacement
|
||||
motif=${motif%|} # suppression | final
|
||||
cmd_modules="lsmod | grep '$motif'"
|
||||
cmt_modules="modules kernel"
|
||||
###
|
||||
|
|
@ -645,10 +645,10 @@ fi_cpu(){ # 19/11/2017
|
|||
###
|
||||
[ ${fg_cpu:0:1} -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text="## processeur"$pluriel" \n\n"
|
||||
f_display "fg_cpu" "cmd" "lscpu" # affichage proc
|
||||
f_display "fg_cpu" "cmd" "lscpu" # affichage proc
|
||||
f_display "fg_uarch" "var" "µarchitecture processeur"
|
||||
f_display "cpu_flags" "var" "$qte_flags flags cpu" # flags cpu bruts
|
||||
f_display "text_flags" "sans" # flags cpu texte
|
||||
f_display "cpu_flags" "var" "$qte_flags flags cpu" # flags cpu bruts
|
||||
f_display "text_flags" "sans" # flags cpu texte
|
||||
echo -en "$text\n" >> "$fileOutput"
|
||||
unset text
|
||||
}
|
||||
|
|
@ -905,7 +905,7 @@ fi_graph(){ # 29/11/2017
|
|||
fi
|
||||
fi
|
||||
# modules
|
||||
modules="$(lsmod | grep -Ei 'amdgpu|ati|i915|nouveau|nvidia|radeon|video|gma')"
|
||||
modules=$( lsmod | grep -Ei 'amdgpu|ati|i915|nouveau|nvidia|radeon|video|gma' )
|
||||
cmt_modules="modules recherchés: amdgpu, ati, i915, nouveau, nvidia, radeon, video, gma"
|
||||
# fonctions externes
|
||||
[ "$fg_resolution" ] || figet_screen
|
||||
|
|
@ -1184,9 +1184,15 @@ fi_lspci(){ # 29/11/2017
|
|||
while read field1 lspci; do
|
||||
lspci=${lspci#*: } # suppression début, jusqu"à': '
|
||||
lspci=${lspci% (rev*} # suppression à la fin, '(rev..'
|
||||
lspci=${lspci/System Controller Hub } # suppression ' Corporation'
|
||||
lspci=${lspci/Corporation } # suppression ' Corporation'
|
||||
lspci=${lspci/Advanced Micro Devices, Inc. } # suppression 'Advanced Micro Devices, Inc. '
|
||||
lspci=${lspci/System Controller Hub } # suppression 'System Controller Hub '
|
||||
lspci=${lspci/Advanced Micro Devices, Inc. } # suppression 'Advanced Micro Devices, Inc. '
|
||||
lspci=${lspci/Semiconductor Co., Ltd. } # suppression 'Semiconductor Co., Ltd. '
|
||||
lspci=${lspci/Corporation } # suppression 'Corporation '
|
||||
lspci=${lspci/Limited } # suppression 'Limited '
|
||||
lspci=${lspci/Inc. } # suppression 'Inc. '
|
||||
lspci=${lspci/Co. } # suppression 'Co. '
|
||||
lspci=${lspci/Ltd. } # suppression 'Ltd. '
|
||||
lspci=${lspci// } # suppression ' '
|
||||
display+="$lspci"$'\n'
|
||||
done <<< $( lspci | grep -Ei "$1" )
|
||||
|
||||
|
|
@ -1211,7 +1217,7 @@ fi_lspci(){ # 29/11/2017
|
|||
fi
|
||||
fi
|
||||
|
||||
display=${display%[[:cntrl:]]} # suppression \nl finaux
|
||||
display=${display%[[:cntrl:]]} # suppression \nl final
|
||||
echo -en "$display\n"
|
||||
}
|
||||
|
||||
|
|
@ -2079,13 +2085,16 @@ figet_batt(){ #v2 11/11/2017
|
|||
}
|
||||
|
||||
# assigne $fg_cpu (3 lignes description cpu), fg_nb_threads, $fg_cpu_arch, $fg_uarch, $fg_vendor=AMD|Intel
|
||||
figet_cpu(){ #v2 24/11/2017
|
||||
figet_cpu(){ #v2 29/11/2017
|
||||
local cpuinfo speedNom speedMax speedMin speedCpu descrCpu cpu1 cpu2 cpu3
|
||||
cpuinfo="$(cat /proc/cpuinfo)"
|
||||
# speed
|
||||
speedNom=$(gawk -F ':' '/cpu MHz/ {printf "%.2f", $2/1000;exit}' <<< "$cpuinfo")
|
||||
speedMax=$(gawk '{printf "%.2f", $1/1000000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq 2>/dev/null)
|
||||
speedMin=$(gawk '{printf "%.2f", $1/1000000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq 2>/dev/null)
|
||||
speedNom=$( gawk -F ':' '
|
||||
/cpu MHz/ { printf "%.2f", $2/1000;exit }' <<< "$cpuinfo" )
|
||||
speedMax=$( gawk '
|
||||
{ printf "%.2f", $1/1000000 }' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq 2>/dev/null )
|
||||
speedMin=$( gawk '
|
||||
{printf "%.2f", $1/1000000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq 2>/dev/null )
|
||||
speedCpu=""
|
||||
if [ "$speedMin" ]; then
|
||||
speedCpu+="$speedMin/"
|
||||
|
|
@ -2720,7 +2729,7 @@ figet_dm(){ #v1 27/11/2017
|
|||
}
|
||||
|
||||
# informations DMI, (firmware partie matériel), assigne $fg_dmi
|
||||
figet_dmi(){ #v2 06/11/2017
|
||||
figet_dmi(){ #v2 29/11/2017
|
||||
local product board bios tempo idmi indic1="" indic2=""
|
||||
local chassis_type=( # type de chassis selon smbios janvier 2017
|
||||
# http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.1.1.pdf
|
||||
|
|
@ -2760,10 +2769,10 @@ figet_dmi(){ #v2 06/11/2017
|
|||
)
|
||||
# ligne1 $product
|
||||
for idmi in sys_vendor product_name product_version chassis_type; do
|
||||
tempo=$(cat /sys/class/dmi/id/$idmi 2>/dev/null) # extraction valeur
|
||||
tempo=$(sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs) # ménage
|
||||
tempo=$( cat /sys/class/dmi/id/$idmi 2>/dev/null ) # extraction valeur
|
||||
tempo=$( sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs ) # ménage
|
||||
if [ "$idmi" == "chassis_type" ]; then
|
||||
tempo="(${chassis_type[ $(( ${tempo##0} - 1 )) ]})" # valeur tableau après mise en forme index
|
||||
tempo="( ${chassis_type[ $(( ${tempo##0} - 1 )) ]} )" # valeur tableau après mise en forme index
|
||||
fi
|
||||
# indic1 pour tester égalité avec $board
|
||||
[[ "$idmi" == "sys_vendor" || "$idmi" == "product_name" ]] && indic1+="$tempo "
|
||||
|
|
@ -2771,21 +2780,25 @@ figet_dmi(){ #v2 06/11/2017
|
|||
done
|
||||
# ligne2 $board (carte mère) éventuellement pas affiché
|
||||
for idmi in board_vendor board_name board_version; do
|
||||
tempo=$(cat /sys/class/dmi/id/$idmi 2>/dev/null)
|
||||
tempo=$(sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs)
|
||||
tempo=$( cat /sys/class/dmi/id/$idmi 2>/dev/null )
|
||||
tempo=$( sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs )
|
||||
# indic2 pour tester égalité avec $product
|
||||
[[ "$idmi" == "board_vendor" || "$idmi" == "board_name" ]] && indic2+="$tempo "
|
||||
board+="$tempo "
|
||||
done
|
||||
# ligne3 $bios
|
||||
for idmi in bios_vendor bios_version bios_date; do
|
||||
tempo=$(cat /sys/class/dmi/id/$idmi 2>/dev/null)
|
||||
tempo=$(sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs)
|
||||
bios+="$tempo"
|
||||
tempo=$( cat /sys/class/dmi/id/$idmi 2>/dev/null )
|
||||
tempo=$( sed 's/x.xx*//; s/To be filled by O\.E\.M\.//g' <<< $tempo | xargs )
|
||||
bios+="$tempo "
|
||||
done
|
||||
[ "$product" ] && fg_dmi=$(printf "%s: %s " "prod." "$product")$'\n'
|
||||
[[ "$board" && "$indic1" != "$indic2" ]] && fg_dmi+=$(printf "%s: %s " "board" "$board")$'\n'
|
||||
[ "$bios" ] && fg_dmi+=$(printf "%s : %s" "bios" "$bios")
|
||||
fg_dmi=${fg_dmi//Inc. }
|
||||
fg_dmi=${fg_dmi//INC. }
|
||||
fg_dmi=${fg_dmi//Computer }
|
||||
fg_dmi=${fg_dmi//COMPUTER }
|
||||
}
|
||||
|
||||
# assigne $fg_gpu (liste des gpu), $fg_nb_gpu, requiert fi_lspci()
|
||||
|
|
@ -2793,6 +2806,9 @@ figet_gpu(){ #v4 29/11/2017
|
|||
# laissé en fonction car utilisé par fi_system & fi_graph
|
||||
# tout se passe dans fi_lspci
|
||||
fg_gpu=$( fi_lspci "VGA .* controller|Display controller|3D controller|Graphic|multimedia" "name")
|
||||
fg_gpu=${fg_gpu/Series Family /Series }
|
||||
fg_gpu=${fg_gpu/Series Chipset Family /Series }
|
||||
fg_gpu=${fg_gpu/High Definition /HD }
|
||||
fg_nb_gpu=$( f__wcv "-l" "$fg_gpu" )
|
||||
}
|
||||
|
||||
|
|
@ -2876,8 +2892,8 @@ figet_ip(){ # 27/11/2017
|
|||
# fg_mac="$(sed '/^[[:blank:]]*$/d' <<< $fg_mac)" # suppression lignes vides
|
||||
# voir cat /sys/class/net/wlp1s0/uevent
|
||||
fg_mac_tp="$(sed -E 's/(^.*wl.*)/\1 (wifi)/;s/(^.*en.*|^.*eth.*)/\1 (ethernet)/' <<< $fg_mac)"
|
||||
fg_ifn=${fg_ifn%[[:cntrl:]]} # suppression derniers $'\n'
|
||||
fg_mac_tp=${fg_mac_tp%[[:cntrl:]]} # suppression derniers $'\n'
|
||||
fg_ifn=${fg_ifn%[[:cntrl:]]} # suppression dernier $'\n'
|
||||
fg_mac_tp=${fg_mac_tp%[[:cntrl:]]} # suppression dernier $'\n'
|
||||
}
|
||||
|
||||
# $1=4|6, assigne $fg_public
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@
|
|||
|
||||
|
||||
|
||||
## 2.49.2 29/11/2017
|
||||
## 2.49.3 29/11/2017
|
||||
|
||||
* révision: fi-graph, figet_gpu, utilisation f_lspci
|
||||
* révision: figet_ucode, affichage
|
||||
* révision: figet_dmi, fi_lspci, extractions pour affichage
|
||||
* fix: fi_audio, modules si multi-devices
|
||||
|
||||
## 2.48.1 28/11/2017
|
||||
|
|
|
|||
Loading…
Reference in New Issue