From 3864a332e0f3ec6d58b3bdc72dff9acfa6d4e2c7 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 7 Apr 2017 12:29:33 +0200
Subject: [beamergui] Don't remove spaces from screen model name

---
 core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/modules/beamergui')

diff --git a/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter b/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter
index 6a8c5e97..4ec0e191 100755
--- a/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter
+++ b/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter
@@ -78,7 +78,7 @@ if [ ${#OUTPUTNAMES[@]} -eq 2 ]; then
     # handles backslashes differently depending on the version.
     echo -e -n "$( <<<"$XRANDRV"  grep -Pzo "\n${OUTPUTNAMES[$i]}\N*connected\N*\n(\s+\N*\n)+" | grep -Eao '[0-9a-f]{32}' | sed -r ':a;N;$!ba;s/[^0-9a-f]//gI;s/([0-9a-f]{2})/\\x\1/gI' )" > "$TF"
     EDID=$( < "$TF" parse-edid )
-    MODEL_NAME=$( <<<"$EDID"  awk '{if ($1 == "ModelName") { A=$2$3$4$5; print substr(A, 2, length(A) - 2)}}' )
+    MODEL_NAME=$( <<<"$EDID"  grep -m 1 -E '^\s*ModelName' | sed -r 's/^[^"]*"(.*)"[^"]*$/\1/;s/^\s+//;s/\s+$//' )
     echo "'${OUTPUTNAMES[$i]}' is connected to device '$MODEL_NAME'"
     # Have a name, do the checks
     if [ -n "$MODEL_NAME" ]; then
-- 
cgit v1.2.3-55-g7522