Robot
/
kyopages
mirror of https://framagit.org/kyodev/kyopages.git
2
0
Fork 0
Code Issues Releases Wiki Activity

getInfo 2.13.1

This commit is contained in:
kyodev 2017-10-22 11:36:30 +02:00
parent b8c01306a5
commit e6fd1d73b6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/getInfo
View File

@ -1,6 +1,6 @@
#!/bin/bash
version=2.13.0
version=2.13.1
date="22/10/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
@ -732,11 +732,11 @@ fi_nonFree(){ # 22/09/2017
vrms="les paquets non-free ou contrib ne peuvent être détectés sans l'installation de vrms"
fi
###
tempo1=$(grep -o '.*non-free packages' <<< "$vrms" | xargs)
tempo2=$(grep -o '.*contrib packages' <<< "$vrms" | xargs)
tempo=$(( ${tempo1:0:1} + ${tempo2:0:1} ))
[[ "$tempo1" && "$tempo" -gt 1 ]] && pluriel="s" || unset pluriel
text="## paquet$pluriel non-libre$pluriel \n\n"
# tempo1=$(grep -o '.*non-free packages' <<< "$vrms" | xargs)
# tempo2=$(grep -o '.*contrib packages' <<< "$vrms" | xargs)
# tempo=$(( ${tempo1:0:1} + ${tempo2:0:1} ))
# [[ "$tempo1" && "$tempo" -gt 1 ]] && pluriel="s" || unset pluriel
text="## paquets$pluriel non-libres$pluriel \n\n"
f_display "vrms" "cmd" "vrms"
}
@ -1085,7 +1085,7 @@ figet_batt(){ #v2 22/10/2017
}
# assigne $fget_cpu (3 lignes description cpu)
figet_cpu(){ #v2 21/10/2017
figet_cpu(){ #v2 22/10/2017
local cpuinfo speedNom speedMax speedMin speedCpu cpu1 cpu2 cpu3
cpuinfo="$(cat /proc/cpuinfo)"
# speed
@ -1106,7 +1106,7 @@ figet_cpu(){ #v2 21/10/2017
/cpu cores/ { procCore=sprintf("%d",$2); if (procCore>1) pllc="s" }
/siblings/ { procThread=sprintf("%d",$2); if (procThread>1) pllt="s" }
/microcode/ { sub(/^ /,"",$2); microCode=$2 }
END { print nbCpu" x "cpu " (" nbCpu "c," procThread "t) {" speedCpu "} microcode:" microCode }
END { print nbCpu" x "cpu " (" procCore "c," procThread "t) {" speedCpu "} microcode:" microCode }
' <<< "$cpuinfo "
)
cpu2=$(

2
scripts/getInfo_changelog.md
View File

@ -19,7 +19,7 @@
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
* f__cmd_exist f__sudo f__requis
## 2.13.0 22/10/2017
## 2.13.1 22/10/2017
* nouveau: f__cmd_exist, émule et remplace which
* bug fedora: which à supprimer/émuler