[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.0-19-gccdd436

[X2Go dev team]

The branch, build-main has been updated
       via  ccdd4364d44b187c1f5cd24b4f1c2aa487110cac (commit)
      from  3fa5425554f3c40e1d4a2717f575c406f471c1a3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2goserver/bin/x2goresume-session |    2 +-
 x2goserver/bin/x2gostartagent     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index fd001e8..a0b299a 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -172,7 +172,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && {
 	(sleep 1; $X2GO_LIB_PATH/x2goresume  "$X2GO_CLIENT" "$SESSION_NAME"  "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;)
 
 	# set client-side keyboard model, type, variant, etc.
-	if [ "$X2GO_SET_KBD" != "0" ]
+	if [ "$X2GO_SET_KBD" != "0" ]; then
 		X2GO_DISPLAY=$(echo $X2GO_SESSION | cut -d"-" -f2)
 		(sleep 1; DISPLAY=:$X2GO_DISPLAY.0 x2gosetkeyboard;)
 	fi
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 234047c..dfbf017 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -253,8 +253,8 @@ else
 	x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" &
 
 	# if we do not enforce a special keybaord type/layout/variant, use the one detected on the client-side
-	if [ "$X2GO_SET_KBD" != "0" ]
-		(sleep 1; x2gosetkeyboard; )
+	if [ "$X2GO_SET_KBD" != "0" ]; then
+		(sleep 1; x2gosetkeyboard;)
 	fi
 fi
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).