mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.57.1
This commit is contained in:
kyodev
parent
85088d80aa
commit
41e3c3ad64
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.57.0
|
||||
version=2.57.1
|
||||
date="6/12/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -674,7 +674,7 @@ fi_batt(){ # 1/12/2017
|
|||
}
|
||||
|
||||
# [$1=silent] (pas d'affichage), assigne $fe_nb_bluez, $fe_cards_bluez
|
||||
fi_bluez(){ # 4/12/2017
|
||||
fi_bluez(){ # 6/12/2017
|
||||
local bluez cmd_bluez cmt_bluez mod cmd_mod cmt_mod srch_mod pluriel text
|
||||
local alert_na
|
||||
|
||||
|
|
@ -708,7 +708,7 @@ fi_bluez(){ # 4/12/2017
|
|||
f_pr titre2 "Bluetooth"
|
||||
f_di cmd "$bluez" "$cmd_bluez" "$cmt_bluez"
|
||||
f_di cmd "$mod" "$cmd_mod" "$cmt_mod"
|
||||
f_di var "$srch_mod" "" "* recherche parmi:"
|
||||
f_di sans "$srch_mod" "" "* recherche parmi:"
|
||||
}
|
||||
|
||||
fi_conf(){ # 3/12/2017
|
||||
|
|
@ -944,8 +944,8 @@ fi_efi(){ # 1/12/2017
|
|||
f_di cmd "$efiboot" "efibootmgr -v" "config EFI boot"
|
||||
}
|
||||
|
||||
# assigne $fg_gpu (liste des gpu), $fe_nb_gpu, fe_Xorg, si [$1=silent|xorgOnly], sortie après configs xorg complete
|
||||
fi_gpu(){ # 3/12/2017
|
||||
# assigne $fe_gpu (liste des gpu), $fe_nb_gpu, fe_Xorg, si [$1=silent|xorgOnly], sortie après configs xorg complete
|
||||
fi_gpu(){ # 6/12/2017
|
||||
local cards cmd_cards prefixCmd openGl pluriel text
|
||||
local stck_glxinfo glx_dvc cmd_glx_dvc stck_glxinfoOpt stck_glxinfoDri glx_dvc_temp
|
||||
local cmd_openGl resolutions cmd_resolutions cmt_resolutions providers cmd_providers
|
||||
|
|
@ -959,8 +959,8 @@ fi_gpu(){ # 3/12/2017
|
|||
# cardsManuel="lspci -nnv -s $(gawk '/VGA |Display |3D / {print $1}' <<< $( lspci ))"
|
||||
|
||||
# liste/description gpu et qte
|
||||
fg_gpu=$( figet_lspci "video" "name")
|
||||
fe_nb_gpu=$( f__wcv "-l" "$fg_gpu" )
|
||||
fe_gpu=$( figet_lspci "video" "name")
|
||||
fe_nb_gpu=$( f__wcv "-l" "$fe_gpu" )
|
||||
# version Xorg Server
|
||||
fe_Xorg=$( xdpyinfoT -display $DISPLAY 2>/dev/null | grep 'version:' ) # version Xorg
|
||||
fe_Xorg=${fe_Xorg//*version: /X.Org X Server}
|
||||
|
|
@ -1085,7 +1085,7 @@ fi_gpu(){ # 3/12/2017
|
|||
[ "$fg_resolution" ] || figet_screen
|
||||
###
|
||||
f_pr titre2 "graphisme"
|
||||
f_pr l "$( sed -E 's/(.*)/**\1** /' <<< $fg_gpu )" # mise en gras
|
||||
f_pr l "$( sed -E 's/(.*)/**\1** /' <<< $fe_gpu )" # mise en gras
|
||||
f_pr
|
||||
# nb écran & résolution(s) active(s)
|
||||
f_pr l "nombre d'écrans: **$fg_nb_screen**"
|
||||
|
|
@ -1108,9 +1108,9 @@ fi_gpu(){ # 3/12/2017
|
|||
f_di cmd "$resolutions" "$cmd_resolutions" "$cmt_resolutions"
|
||||
# modules vidéo
|
||||
f_di cmd "$modGpu" "$cmd_modGpu" "$cmt_modGpu"
|
||||
f_di var "$srch_modGpu" "" "* recherche parmi:"
|
||||
f_di sans "$srch_modGpu" "" "* recherche parmi:"
|
||||
f_di cmd "$modVid" "$cmd_modVid" "$cmt_modVid"
|
||||
f_di var "$srch_modVid" "" "* recherche parmi:"
|
||||
f_di sans "$srch_modVid" "" "* recherche parmi:"
|
||||
# Xorg config
|
||||
f_di cmd "$confs" "$cmd_confs" "$cmt_confs"
|
||||
f_dspl_alrt "$info_config" "info"
|
||||
|
|
@ -1374,7 +1374,7 @@ fi_mem(){ # 5/12/2017
|
|||
}
|
||||
|
||||
# [$1=silent], assigne fe_nb_reseau, fe_cards_reseau
|
||||
fi_net(){ # 1/12/2017 ( matériel )
|
||||
fi_net(){ # 6/12/2017 ( matériel )
|
||||
local cards cmd_cards modEth cmd_modEth cmt_modEth srch_modEth pluriel text
|
||||
local modWln cmd_modWln cmt_modWln srch_modWln
|
||||
local alert_wlx
|
||||
|
|
@ -1420,9 +1420,9 @@ fi_net(){ # 1/12/2017 ( matériel )
|
|||
f_di cmd "$cards" "$cmd_cards"
|
||||
# modules réseau
|
||||
f_di cmd "$modWln" "$cmd_modWln" "$cmt_modWln"
|
||||
f_di var "$srch_modWln" "" "* recherche parmi:"
|
||||
f_di sans "$srch_modWln" "" "* recherche parmi:"
|
||||
f_di cmd "$modEth" "$cmd_modEth" "$cmt_modEth"
|
||||
f_di var "$srch_modEth" "" "* recherche parmi:"
|
||||
f_di sans "$srch_modEth" "" "* recherche parmi:"
|
||||
f_dspl_alrt "$alert_wlx" "alert"
|
||||
}
|
||||
|
||||
|
|
@ -1971,7 +1971,7 @@ fi_system(){ # 6/12/2017
|
|||
[ "$fg_wm" ] || figet_wm
|
||||
[ "$fe_cards_audio" ] || fi_audio "silent"
|
||||
[ "$fe_cards_bluez" ] || fi_bluez "silent"
|
||||
[ "$fg_gpu" ] || fi_gpu "silent"
|
||||
[ "$fe_gpu" ] || fi_gpu "silent"
|
||||
[ "$fe_cards_reseau" ] || fi_net "silent"
|
||||
[ "$fu_archi" ] || f__architecture
|
||||
echo -n "ø"
|
||||
|
|
@ -2048,7 +2048,7 @@ fi_system(){ # 6/12/2017
|
|||
f_pr 1 "CPU"
|
||||
f_pr 2 "**$( sed -n '1p' <<< $fg_cpu )**"
|
||||
f_pr 1 "Vidéo"
|
||||
f_pr 2 "$( sed -E 's/(.*)/**\1**/' <<<$fg_gpu )" '[ "$fg_gpu" ]'
|
||||
f_pr 2 "$( sed -E 's/(.*)/**\1**/' <<<$fe_gpu )" '[ "$fe_gpu" ]'
|
||||
f_pr 2 "pas de carte graphique détectée" '[ "$fe_nb_gpu" -eq 0 ]'
|
||||
f_pr 1 "Réseau"
|
||||
f_pr 2 "$( sed -E 's/(.*)/**\1**/' <<<$fe_cards_reseau )" '[ "$fe_cards_reseau" ]'
|
||||
|
|
@ -3220,7 +3220,7 @@ figet_ip_pub(){ # 20/11/2017
|
|||
}
|
||||
|
||||
# $1=audio|video|net, $2 objet raw|name, $3=[graph] (optirun, DRI)
|
||||
figet_lspci(){ # 30/11/2017
|
||||
figet_lspci(){ # 6/12/2017
|
||||
local motif slots lspci display='' prefixCmd
|
||||
|
||||
if [ "$1" = "audio" ]; then
|
||||
|
|
@ -3247,7 +3247,7 @@ figet_lspci(){ # 30/11/2017
|
|||
lspci=${lspci/Series Family /Series }
|
||||
lspci=${lspci/Series Chipset Family /Series }
|
||||
lspci=${lspci/High Definition /HD }
|
||||
display+="$lspci"$'\n'
|
||||
display+="$lspci "$'\n'
|
||||
done <<< $( lspci | grep -Ei "$motif" )
|
||||
|
||||
# lspci détaillé
|
||||
|
|
@ -3936,7 +3936,7 @@ for j in $options; do
|
|||
ORIGIN='test'
|
||||
prg_1 "$*"
|
||||
echo -n "•"
|
||||
fi_system
|
||||
fi_gpu
|
||||
echo; f_dspl_md "$fileOutput"
|
||||
exit ;; # test
|
||||
-c* | all )
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
# changelog getInfo
|
||||
|
||||
|
||||
|
||||
|
||||
## getInfo 2.57.0 6/12/2017
|
||||
## getInfo 2.57.1 6/12/2017
|
||||
|
||||
* révision: fi_locale, oublié locale
|
||||
* révision: fi_system, uptime avec gawk et selon formats possibles
|
||||
loadAverage, avec calcul fonction threads
|
||||
* révision: fscript_update, controle chargement début et fin
|
||||
* révision: changement séquence start pour éviter erreur cron
|
||||
* révision: figet_lspci, \n markdown
|
||||
* fix mineurs affichage
|
||||
|
||||
## 2.56.0 5/12/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue