From 3ccca9a6053a889ac760ffec87abfbc32d669e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 2 Dec 2021 15:13:48 +0100 Subject: [PATCH] fix x2go for xfce DISPLAY worked before only when it was :[0-9]* not it works for :[0-9]*.[0-9] too --- myshell_load_x2go_tokenforward | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/myshell_load_x2go_tokenforward b/myshell_load_x2go_tokenforward index ae824c9..8624a60 100644 --- a/myshell_load_x2go_tokenforward +++ b/myshell_load_x2go_tokenforward @@ -28,10 +28,11 @@ fi # check our client DISPLAY and SSH client IP correspond to # a running X2Go session and # check ~/.x2go/agentsocket is a regular file + if which x2golistsessions >/dev/null && \ [ -n "$DISPLAY" ] && \ [ -n "$(x2golistsessions | \ - awk -F '|' '":"$3 == "'${DISPLAY:1:2}'" && \ + awk -F '|' '$3 == "'${DISPLAY:1:2}'" && \ $5 == "R" && \ $8 == "'$(echo $SSH_CLIENT | \ awk '{print $1}')'" { print $3 }')" ] && \ @@ -44,7 +45,7 @@ if which x2golistsessions >/dev/null && \ if [ -S "$MIGHTBEOURAGENT" ]; then # export path to agent socket export SSH_AUTH_SOCK=$MIGHTBEOURAGENT - logdebug "export it" + logdebug "export SSH_AUTH_SOCK=$MIGHTBEOURAGENT" fi fi