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

getInfo 2.17.3

This commit is contained in:
kyodev 2017-10-26 01:21:24 +02:00
parent 17ec45dbfc
commit f0fb1c6e80
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/getInfo
View File

@ -1,6 +1,6 @@
#!/bin/bash
version=2.17.2
version=2.17.3
date="25/10/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
@ -533,6 +533,7 @@ fi_graph(){ # 25/10/2017
# graphCardsManuel="$(lspci -nnk | grep -EiA 3 'vga|display|3d')"
# graphCardsManuel="$(lspci -nnv | grep -iEA 13 'vga|display|3d)"
# graphCardsManuel="lspci -nnv -s $( lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1 )"
# lspci
slotGraphCards="$(lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
# debug: slotGraphCards="$(cat tests/lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
graphCards=${graphCards::-1} # suppression dernier $'\n'
@ -555,16 +556,20 @@ fi_graph(){ # 25/10/2017
alert_Multicarte+="vga-switcheroo/DRI_PRIME, lspci n'est pas complet, "
alert_Multicarte+="malgré un lancement avec \`optirun\` ou \`DRI_PRIME=1 lspci\`"
fi
[ $(f__cmd_exist glxinfo) ] && openGl="$(glxinfo | grep 'OpenGL version')"
[ $(f__cmd_exist xrandr) ] && resolutions="$(xrandr --query | grep '^ *[0-9]' | head -n 10)"
# openGl
[ $(f__cmd_exist glxinfo) ] && openGl=$( glxinfo | grep 'OpenGL version' | sed 's/string//' )
# résolutions
[ $(f__cmd_exist xrandr) ] && resolutions=$( xrandr --query | grep '^ *[0-9]' | head -n 10 )
# modules
modules=$(lsmod | grep -Ei 'amdgpu|ati|i915|nouveau|nvidia|radeon|video|gma')
[ "$fget_resolution" ] || figet_gpu
# fonctions externes
[ "$fget_gpu" ] || figet_gpu
[ "$fget_resolution" ] || figet_resolution
###
text="## graphisme \n\n"
# cartes graphiques
text+="$(sed -E 's/(.*)/> \* \*\*\1\*\*/' <<< $fget_gpu) \n"
# résolution active
# résolution(s) active(s)
text+="\n\n**résolution: $fget_resolution** \n\n"
# lspci
f_display "graphCards" "cmd" "lspci -nnv | grep -iEA 13 'vga|display|3d"
@ -1651,10 +1656,10 @@ figet_mod_net(){ # thanks wireless-info, assigne $fget_mod_net # 01/10/2017
}
figet_resolution(){ # thanks neofetch, assigne $fget_resolution # 22/10/2017
if [ "$ENV_SSH" ]; then
fget_resolution="n/a (ssh)"
return 0
fi
if [ "$ENV_SSH" ]; then
fget_resolution="n/a (ssh)"
return 0
fi
local resolution
if type -p xrandr >/dev/null; then
resolution="$(xrandr --nograb --current | gawk 'match($0,/[0-9]*\.[0-9]*\*/) {printf $1 " @ " substr($0,RSTART,RLENGTH) "Hz, "}')"
@ -1665,6 +1670,8 @@ figet_resolution(){ # thanks neofetch, assigne $fget_resolution # 22/10/2017
fi
resolution="${resolution%,*}"
fget_resolution="$resolution"
### nombre d'écrans
# xrandr --nograb --current
}
figet_shell(){ # thanks neofetch, assigne $fget_shell # 04/10/2017

4
scripts/getInfo_changelog.md
View File

@ -9,13 +9,15 @@
* refaire/revoir figet_resolution
* revoir modules réseau
* réviser alert_
* revoir affichage cmd si présente sinon, juste signalement plus discret
*
---
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
* f__cmd_exist f__sudo f__requis
## 2.17.2 25/10/2017
## 2.17.3 25/10/2017
* révision: batterie, unité en W au lieu de mW, mA inchangé
* fix: fi_locale compatible fedora (arch ok)