[X2Go-Commits] [x2goserver] 01/03: x2goserver/bin/x2gosetkeyboard: fix a typo that caused the script to not work properly - with or without Arctica's nx-libs.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit da74275d1421bc24c0e57351233a6e45f1736a19
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 9 06:47:13 2017 +0100

    x2goserver/bin/x2gosetkeyboard: fix a typo that caused the script to not work properly - with or without Arctica's nx-libs.
---
 debian/changelog               | 2 ++
 x2goserver/bin/x2gosetkeyboard | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 70c18e7..dbf7c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
       change to this file.
     - x2goserver/bin/x2gosetkeyboard: make compatible with changes in
       Arctica's nxagent. Also change to an all-bash algorithm. Fixes: #1151.
+    - x2goserver/bin/x2gosetkeyboard: fix a typo that caused the script to not
+      work properly - with or without Arctica's nx-libs.
   * x2goserver.spec:
     - Add mandatory perl-generators Build-Requires as per
       https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard
index e5961d2..44fede9 100755
--- a/x2goserver/bin/x2gosetkeyboard
+++ b/x2goserver/bin/x2gosetkeyboard
@@ -72,7 +72,7 @@ read_keyboard_file() {
 		# Extract the keys, their values and add to setxkbcomp_opts.
 		typeset key=''
 		for key in "rules" "model" "layout" "variant" "options"; do
-			typeset regexp='^[[:space]]*'"${key}"'[[:space:]]*=[[:space:]]*"?(.*)"?[[:space:]]*'
+			typeset regexp='^[[:space:]]*'"${key}"'[[:space:]]*=[[:space:]]*"?(.*)"?[[:space:]]*'
 			if [[ "${line}" =~ ${regexp} ]]; then
 				typeset value="${BASH_REMATCH[0]}"
 

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git