mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.18.4
This commit is contained in:
kyodev
parent
1f09d676df
commit
b2d8039768
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.18.3
|
||||
version=2.18.4
|
||||
date="26/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -534,36 +534,48 @@ fi_dmesg(){ # 25/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_graph(){ # 26/10/2017
|
||||
local slotGraphCards graphCards alert_Multicarte openGl resolutions logXorg modules ig text
|
||||
# graphCardsManuel="$(lspci -nnk | grep -EiA 3 'vga|display|3d')"
|
||||
# graphCardsManuel="$(lspci -nnv | grep -iEA 13 'vga|display|3d)"
|
||||
fi_graph(){ # 26/10/2017-3
|
||||
local slotGraphCards graphCards cmd alert_Multicarte alert_3D openGl resolutions logXorg modules ig text
|
||||
# graphCardsManuel="$(lspci -nnk | grep -EiA 3 'vga|display|3d')" # -nn: textual and numeric ID's, k kernel
|
||||
# graphCardsManuel="$(lspci -nnv | grep -iEA 13 'vga|display|3d)" # v=verbose
|
||||
# spci -nn | grep '\[030[02]\]'
|
||||
# graphCardsManuel="lspci -nnv -s $( lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1 )"
|
||||
# debug: slotGraphCards="$(cat tests/lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
|
||||
#debug: slotGraphCards="$(cat tests/lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
|
||||
# lspci
|
||||
slotGraphCards="$(lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
|
||||
graphCards=${graphCards::-1} # suppression dernier $'\n'
|
||||
if [ $(f__cmd_exist optirun) ]; then
|
||||
for ig in $slotGraphCards; do
|
||||
graphCards+=$(DRI_PRIME=1 lspci -nnv -s $ig)$'\n'
|
||||
done
|
||||
cmd="DRI_PRIME=1 lspci -nnv | grep -iEA 13 'vga|display|3d'"
|
||||
if [ $(grep -c 'Unknown header type 7f' <<< "$graphCards") -gt 0 ] && [ $(f__cmd_exist optirun) ]; then
|
||||
for ig in $slotGraphCards; do
|
||||
graphCards+=$(optirun lspci -nnv -s $ig)$'\n'
|
||||
done
|
||||
else
|
||||
for ig in $slotGraphCards; do
|
||||
graphCards+=$(lspci -nnv -s $ig)$'\n'
|
||||
done
|
||||
cmd="optirun lspci -nnv | grep -iEA 13 'vga|display|3d'"
|
||||
fi
|
||||
if [ $(grep -c 'Unknown header type 7f' <<< "$graphCards") -gt 0 ]; then
|
||||
for ig in $slotGraphCards; do
|
||||
graphCards+=$(DRI_PRIME=1 lspci -nnv -s $ig)$'\n'
|
||||
done
|
||||
fi
|
||||
if [ $(grep -c 'Unknown header type 7f' <<< "$graphCards") -gt 0 ]; then
|
||||
alert_Multicarte="Une carte graphique est désactivée actuellement par Bumbledee ou "
|
||||
alert_Multicarte+="vga-switcheroo/DRI_PRIME, lspci n'est pas complet, "
|
||||
alert_Multicarte+="malgré un lancement avec \`optirun\` ou \`DRI_PRIME=1 lspci\`"
|
||||
fi
|
||||
alert_Multicarte="Une carte graphique est désactivée actuellement, lspci n'est pas complet. \n"
|
||||
alert_Multicarte+="Voir DRI_PRIME, vga-switcheroo, Bumbledee...? \n"
|
||||
if [ $(f__cmd_exist xrandr) ]; then
|
||||
[ $(lspci -nn | grep -c '\''[030[02]\]') != $(xrandr --listproviders | grep -c 'Provider ') ] && \
|
||||
alert_Multicarte+="Le nombre de cartes n'est pas égal au nombre de fournisseurs. \n"
|
||||
alert_Multicarte+="\`\`\`\nxrandr --listproviders\n$(xrandr --listproviders) \n\`\`\`\n"
|
||||
fi
|
||||
alert_Multicarte=${alert_Multicarte:-1}
|
||||
fi
|
||||
# openGl
|
||||
[ $(f__cmd_exist glxinfo) ] && openGl=$( glxinfo | grep 'OpenGL version' | sed 's/ string//' )
|
||||
if [ $(f__cmd_exist glxinfo) ]; then
|
||||
openGl=$( glxinfo | grep -i 'direct rendering' )$'\n'
|
||||
alert_3D=$(grep -i 'no' <<< $openGl )
|
||||
openGl+=$( glxinfo | grep 'OpenGL vendor' )$'\n'
|
||||
openGl+=$( glxinfo | grep 'OpenGL renderer' )$'\n'
|
||||
openGl+=$( glxinfo | grep 'OpenGL version' )$'\n'
|
||||
openGl+=$( glxinfo | grep 'OpenGL shading language version' )$'\n'
|
||||
openGl+=$( glxinfo | grep 'OpenGL extensions' )$'\n'
|
||||
openGl=$( sed 's/ string//g' <<< "$openGl" )
|
||||
fi
|
||||
[ "$alert_3D" ] && alert_3D="l'accélération 3D n'est pas active \n\n"
|
||||
# résolutions
|
||||
[ $(f__cmd_exist xrandr) ] && resolutions=$( xrandr --query | grep -A11 'Screen [0-9]' )
|
||||
# modules
|
||||
|
|
@ -579,11 +591,11 @@ fi_graph(){ # 26/10/2017
|
|||
text+="nombre d'écrans: **$fget_nb_screen** \n"
|
||||
text+="résolution: **$fget_resolution** \n\n"
|
||||
# lspci
|
||||
f_display "graphCards" "cmd" "lspci -nnv | grep -iEA 13 'vga|display|3d"
|
||||
# f_display "graphCards" "cmd" "lspci -nnv -s \$( lspci | grep -Ei 'vga|display|3d' | cut -d\" \" -f1 )"
|
||||
f_display "graphCards" "cmd" "$cmd"
|
||||
[ "$alert_Multicarte" ] && text+="$alert_Multicarte \n\n"
|
||||
# openGl
|
||||
[ "$openGl" ] && f_display "openGl" "cmd" "glxinfo | grep 'OpenGL version"
|
||||
[ "$openGl" ] && f_display "openGl" "cmd" "glxinfo | grep 'OpenGL"
|
||||
[ "$alert_3D" ] && text+="**$alert_3D** \n"
|
||||
# résolutions possibles, pas d'affichage si mode (ssh) ou xrandr pas accessible
|
||||
if [ "$resolutions" ]; then
|
||||
f_display "resolutions" "cmd" "xrandr --query | grep -A11 'Screen [0-9]'" "(10 premières résolutions possibles)"
|
||||
|
|
@ -2145,7 +2157,7 @@ for j in $options; do
|
|||
case $j in
|
||||
-t | --test )
|
||||
prg_1 "$*"
|
||||
fi_locale
|
||||
fi_graph
|
||||
prg_3
|
||||
exit ;; # test seulement
|
||||
-c* | all )
|
||||
|
|
|
|||
|
|
@ -9,18 +9,21 @@
|
|||
* refaire/revoir figet_resolution
|
||||
* revoir modules réseau
|
||||
* réviser alert_
|
||||
* iwlist chan, alléger, sortie juste canal utilisé
|
||||
|
||||
|
||||
---
|
||||
|
||||
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
|
||||
* f__cmd_exist f__sudo f__requis
|
||||
|
||||
## 2.18.3 26/10/2017
|
||||
## 2.18.4 26/10/2017
|
||||
|
||||
* nouveau: figet_screen (nb écrans & résolutions)
|
||||
* suppression: figet_resolution neofetch
|
||||
* nouveau: xrandr multi-écrans
|
||||
* révision: affichage des fichiers manquants
|
||||
* révision: fi_graph, version 3
|
||||
* fix: suppression s/n batterie si champs rempli d'espace vide
|
||||
|
||||
## 2.17.4 25/10/2017
|
||||
|
|
|
|||
Loading…
Reference in New Issue