mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.18.6
This commit is contained in:
kyodev
parent
ec5b81410d
commit
f548957c27
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.18.5
|
||||
version=2.18.6
|
||||
date="26/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -534,30 +534,30 @@ fi_dmesg(){ # 25/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_graph(){ # 26/10/2017-4
|
||||
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
|
||||
fi_graph(){ # 26/10/2017-5
|
||||
local slots cards cmd alert_hybrid alert_3D providers preferred current openGl resolutions modules ig text
|
||||
# cardsManuel="$(lspci -nnk | grep -EiA 3 'vga|display|3d')" # -nn: textual and numeric ID's, k kernel
|
||||
# cardsManuel="$(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)"
|
||||
# cardsManuel="lspci -nnv -s $( lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1 )"
|
||||
#debug: slots="$(cat tests/lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
|
||||
# lspci
|
||||
slotGraphCards="$(lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
|
||||
slots="$(lspci | grep -Ei 'vga|display|3d' | cut -d" " -f1)"
|
||||
if [ $(f__cmd_exist optirun) ]; then
|
||||
for ig in $slotGraphCards; do
|
||||
graphCards+=$(optirun lspci -nnv -s $ig)$'\n'
|
||||
for ig in $slots; do
|
||||
cards+=$(optirun lspci -nnv -s $ig)$'\n'
|
||||
done
|
||||
cmd="optirun lspci -nnv | grep -iEA 13 'vga|display|3d'"
|
||||
else
|
||||
for ig in $slotGraphCards; do
|
||||
graphCards+=$(DRI_PRIME=1 lspci -nnv -s $ig)$'\n'
|
||||
for ig in $slots; do
|
||||
cards+=$(DRI_PRIME=1 lspci -nnv -s $ig)$'\n'
|
||||
done
|
||||
cmd="DRI_PRIME=1 lspci -nnv | grep -iEA 13 'vga|display|3d'"
|
||||
fi
|
||||
graphCards=${graphCards::-1} # suppression dernier $'\n'
|
||||
if [ $(grep -c 'Unknown header type 7f' <<< "$graphCards") -gt 0 ]; then
|
||||
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"
|
||||
cards=${cards::-1} # suppression dernier $'\n'
|
||||
if [ $(grep -c 'Unknown header type 7f' <<< "$cards") -gt 0 ]; then
|
||||
alert_hybrid="Une carte graphique est désactivée actuellement, lspci n'est pas complet. \n"
|
||||
alert_hybrid+="Voir DRI_PRIME, vga-switcheroo, Bumbledee...? \n"
|
||||
fi
|
||||
# openGl
|
||||
if [ $(f__cmd_exist glxinfo) ]; then
|
||||
|
|
@ -571,8 +571,11 @@ fi_graph(){ # 26/10/2017-4
|
|||
openGl=$( sed 's/ string//g' <<< "$openGl" )
|
||||
fi
|
||||
[ "$alert_3D" ] && alert_3D="l'accélération 3D n'est pas active \n\n"
|
||||
# résolutions
|
||||
# xrandr: résolutions & providers & preferred & current
|
||||
[ $(f__cmd_exist xrandr) ] && resolutions=$( xrandr --query | grep -A11 'Screen [0-9]' )
|
||||
[ $(f__cmd_exist xrandr) ] && providers=$( xrandr --listproviders )
|
||||
[ $(f__cmd_exist xrandr) ] && current=$( xrandr --verbose | grep -A2 '*current' )
|
||||
[ $(f__cmd_exist xrandr) ] && preferred=$( xrandr --verbose | grep -A2 '+preferred' )
|
||||
# modules
|
||||
modules=$(lsmod | grep -Ei 'amdgpu|ati|i915|nouveau|nvidia|radeon|video|gma')
|
||||
# fonctions externes
|
||||
|
|
@ -586,11 +589,15 @@ fi_graph(){ # 26/10/2017-4
|
|||
text+="nombre d'écrans: **$fget_nb_screen** \n"
|
||||
text+="résolution: **$fget_resolution** \n\n"
|
||||
# lspci
|
||||
f_display "graphCards" "cmd" "$cmd"
|
||||
[ "$alert_Multicarte" ] && text+="$alert_Multicarte \n\n"
|
||||
f_display "cards" "cmd" "$cmd"
|
||||
[ "$alert_hybrid" ] && text+="$alert_hybrid \n\n"
|
||||
# openGl
|
||||
[ "$openGl" ] && f_display "openGl" "cmd" "glxinfo | grep 'OpenGL"
|
||||
[ "$alert_3D" ] && text+="**$alert_3D** \n"
|
||||
# liste providers, preferred, current,
|
||||
[ "$current" ] && f_display "current" "cmd" "xrandr --verbose | grep -A2 '*current'"
|
||||
[ "$preferred" ] && f_display "preferred" "cmd" "xrandr --verbose | grep -A2 '+preferred'"
|
||||
[ "$providers" ] && f_display "providers" "cmd" "xrandr --listproviders"
|
||||
# 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)"
|
||||
|
|
@ -1678,24 +1685,23 @@ figet_mod_net(){ # thanks wireless-info, assigne $fget_mod_net # 01/10/2017
|
|||
fget_mod_net="$(lsmod | grep -E "(^|[[:punct:] ])($MODMATCHES|$LSMODMATCHES)[^[:punct:] ]*([[:punct:] ]|$)")"
|
||||
}
|
||||
|
||||
# assigne $fget_nb_screen, $fget_resolution
|
||||
# assigne $fget_nb_screen, $fget_resolution. si $ENV_SSH pas vide, return avec
|
||||
# fget_resolution=n/a (ssh) & fget_nb_screen=n/a
|
||||
figet_screen(){ #v2 26/10/2017
|
||||
local resolution
|
||||
fget_nb_screen="n/a"
|
||||
fget_resolution="n/a"
|
||||
if [ "$ENV_SSH" ]; then
|
||||
fget_resolution+=" (ssh)"
|
||||
return 0
|
||||
fi
|
||||
[ "$ENV_SSH" ] && fget_resolution+=" (ssh)"
|
||||
[ "$ENV_SSH" ] && return 0
|
||||
# xrandr & et xdpyinfo ne retourne pas de nombre écrans correct (multiplex? hybrid?)
|
||||
if [ $(f__cmd_exist xrandr) ]; then
|
||||
fget_nb_screen=$(( $( grep -c 'Screen [0-9]+:' <<< "$xrandr" ) + 1 ))
|
||||
resolution=$( gawk '/[0-9]\*/ {gsub(/\*\+/,"",$2); printf "%s pixels (%dHz), ", $1, $2}' <<< $( xrandr --query ) )
|
||||
elif [ $(f__cmd_exist xdpyinfo) ]; then
|
||||
fget_nb_screen=$( gawk -F ':' '/number of screens/ { gsub(/ /,"",$2); print $2 }' <<< $(xdpyinfo) )
|
||||
resolution=$( gawk '/dimensions/ { print $2, $3 ", " }' <<< $(xdpyinfo) )
|
||||
fi
|
||||
resolution="${resolution%,*}"
|
||||
fget_resolution="$resolution"
|
||||
fget_nb_screen=$( grep -o 'pixels' <<< $fget_resolution | grep -c . )
|
||||
}
|
||||
|
||||
figet_shell(){ # thanks neofetch, assigne $fget_shell # 04/10/2017
|
||||
|
|
|
|||
|
|
@ -14,15 +14,17 @@
|
|||
* f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
|
||||
* f__cmd_exist f__sudo f__requis
|
||||
|
||||
## 2.18.5 26/10/2017
|
||||
## 2.18.6 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 4 (pour fixer sortie sur multi-cartes hybrides)
|
||||
* révision: fi_graph, version 4 (pour fixer sortie sur multi-cartes hybrides) + xrandr current & preferred
|
||||
* révision: fi_reseau, iwlist chan, juste sortie canal utilisé
|
||||
* fix: suppression s/n batterie si champs rempli d'espace vide
|
||||
* fix: figet_screen, fix nombre d'écrans
|
||||
|
||||
|
||||
## 2.17.4 25/10/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue