getInfo 2.21.10

This commit is contained in:
kyodev 2017-11-01 17:59:23 +01:00
parent f2c68cba83
commit a92087733e
2 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
version=2.21.9
version=2.21.10
date="31/10/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
@ -403,7 +403,7 @@ fi_cpu(){ # 01/11/2017
[ ${fg_cpu:0:1} -gt 1 ] && pluriel="s" || unset pluriel
text="## processeur$pluriel \n\n"
f_display "fg_cpu" "sans"
f_display "fg_codename" "var" "codename processeur"
[ "$fg_codename" ] && f_display "fg_codename" "var" "codename processeur"
f_display "cpu_flags" "var" "flags cpu:"
printf "$text\n" >> "$fileOutput"
unset text
@ -1270,7 +1270,8 @@ figet_cpu(){ #v2 01/11/2017
gawk -F ':' '
/^vendor_id/{gsub(/ /,"",$2);vendor=$2}; /^cpu family/{family=$2};
/^model[^ ]/{model=$2}; /^stepping/{rev=$2}
END {print "{fréq. mini/nominale/maxi} " vendor" famille" family", modèle"model", révision" rev}
END {model=sprintf("%s(0x%.2X)",model,model);
print "{fréq. mini/nominale/maxi} " vendor" famille" family", modèle"model", révision" rev}
' <<< "$cpuinfo"
)
cpu3=$(
@ -1289,8 +1290,7 @@ figet_cpu(){ #v2 01/11/2017
if [[ "$(grep -m1 '^vendor_id' /proc/cpuinfo)" =~ Intel ]]; then
var_temp=$(grep -m1 '^model' /proc/cpuinfo)
var_temp=${var_temp#*: } # extraction valeur
model=$(printf "%.2X" $var_temp)
model="0x$model"
model=$(printf 0x"%.2X" $var_temp)
#model, arch codename, techno
[ "$model" == "0x3A" ] && fg_codename="Intel IvyBridge 22nm"
[ "$model" == "0x2A" ] && fg_codename="Intel SandyBridge 32nm"
@ -1312,7 +1312,7 @@ figet_cpu(){ #v2 01/11/2017
[ "$model" == "0x36" ] && fg_codename="Intel Atom 32nm"
[ "$model" == "0x26" ] && fg_codename="Intel Atom 45nm"
[ "$model" == "0x1C" ] && fg_codename="Intel Atom 45nm"
[ "$fg_codename" ] || fg_codename="codename inconnue, base à compléter"
# [ "$fg_codename" ] || fg_codename="codename inconnu"
fg_codename+=" ($model-$var_temp)"
fi
}

View File

@ -3,7 +3,7 @@
* f__wcv
## 2.21.9 01/11/2017
## 2.21.10 01/11/2017
nouveau: codename proc intel, gadget
fix: figet_distrib, affichage distrib