From 11dc381f61d7f56e12d139f5460eb0cab82f33b3 Mon Sep 17 00:00:00 2001
From: kyodev <kyodev@yandex.fr>
Date: Sat, 25 Nov 2017 06:27:15 +0100
Subject: [PATCH] getInfo 2.44.2

---
 scripts/getInfo              | 12 ++++++++----
 scripts/getInfo_changelog.md |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/getInfo b/scripts/getInfo
index e9e61bb..7027f92 100755
--- a/scripts/getInfo
+++ b/scripts/getInfo
@@ -734,7 +734,7 @@ fi_efi(){		# 20/11/2017
 	unset text
 }
 
-fi_graph(){		# 23/11/2017
+fi_graph(){		# 24/11/2017
 	local slots cards cmd_cards ig 
 	local stck_glxinfo stck_glxinfoOpt stck_glxinfoDri glx_dvc cmd_glx_dvc glx_dvc_temp openGl cmd_openGl
 	local providers resolutions pluriel modules cmt_modules text
@@ -774,7 +774,7 @@ fi_graph(){		# 23/11/2017
 		# $1="[opt|dri]", assigne $openGl pour un ou plusieurs gpu (dri & optirun) & $cmd_openGl
 	fi_graph_openGl(){
 		local iogl dri_glxinfo=""
-		[[ "$1" == "opt" ]] && openGl+="----  \n"
+		[[ "$1" == "opt" ]] && openGl+="\n----  \n"
 		toScrut=(
 			'OpenGL vendor'
 			'OpenGL renderer'
@@ -1003,7 +1003,7 @@ fi_journal(){		# 23/11/2017
 	unset text
 }
 
-fi_locale(){		# 20/11/2017
+fi_locale(){		# 24/11/2017
 	local locale localectl timezone timedatectl xKeyboardMap keyboard text 
 	local alert_rtc alert_ntp 
 		# locale
@@ -1029,7 +1029,11 @@ fi_locale(){		# 20/11/2017
 	fi
 		# keyboard layout
 	keyboard="$(f_grep_file "/etc/default/keyboard*")"
+	if [[ "$wayland" && "$EUID" -eq 0 ]]; then	# évite erreur $DISPLAY en root wayland
+		xKeyboardMap="n/a en root sous wayland"
+	else
 	[ $( f__which setxkbmap ) ] && xKeyboardMap="$(setxkbmap -query)"
+	fi
 ###
 	text="## localisation \n\n"
 		# locale
@@ -1807,7 +1811,7 @@ fi_systeme(){		# 22/11/2017
 	text+="dernier boot: $lastboot, uptime: $uptime  \n"
 	text+="charge système depuis les 1, 5 et 15 dernières minutes: $charge ($fg_nb_threads threads) \n"
 	text+='```  \n\n'
-	[[ -z "$alert_microcode" && "$fg_ucode" ]] && text+="* $fg_ucode"
+	[[ -z "$alert_microcode" && "$fg_ucode" ]] && text+="* $fg_ucode \n\n"
 	f_dspl_alert "alert_SLiM" "info" 
 	f_dspl_alert "alert_microcode" "info"
 	echo -en "$text\n" >> "$fileOutput"
diff --git a/scripts/getInfo_changelog.md b/scripts/getInfo_changelog.md
index 7838795..611cd63 100644
--- a/scripts/getInfo_changelog.md
+++ b/scripts/getInfo_changelog.md
@@ -3,13 +3,14 @@
 * f__wcv, f_display_grep, f_dspl_md, f__wget_test, fscript_get_version, fscript_update
 * ! f__requis (debOnly), fscript_install, f__scandir
 
-## 2.44.1 24/11/2017
+## 2.44.2  24/11/2017
 
 * nouveau: figet_ucode, indépendant de debian
 * révision: fi_systeme, microcode
 * révision: figet_cpu, figet_cpu_uarch, fg_vendor
 * révision: pas de log xorg si inutile
 * révision: affichages générals mineurs
+* fix: fi_locale, setxkbmap! merde wayland: setxkbmap+xprop, xrandr, xdpyinfo
 
 ## 2.43.3 23/11/2017