x2goserver.git - master (branch) updated: 3.0.99-2-117-ga5c516a - x2go-commits

19 Jul 2011

The branch, master has been updated
       via  a5c516aaf140791c74bccb49439db7edcd5e114b (commit)
      from  870f0743571be8f4f3c1612f87ca33e626aa195d (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 -----------------------------------------------------------------
commit a5c516aaf140791c74bccb49439db7edcd5e114b
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Jul 19 16:03:55 2011 +0200

    Tab'ified (forgotten) scripts in x2goserver-extensions package.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                          |    1 +
 x2goserver-extensions/bin/x2gosetkeyboard |   28 ++++++++++++++--------------
 x2goserver-extensions/bin/x2goversion     |    2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 9b93da2..4fa2d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Store SQLite db in /var/lib/x2go to comply to latest FHS.
   * Tab'ified (forgotten) scripts in /usr/sbin.
   * Tab'ified (forgotten) init script.
+  * Tab'ified (forgotten) scripts in x2goserver-extensions package.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard
index 022f97d..6f2fc6f 100755
--- a/x2goserver-extensions/bin/x2gosetkeyboard
+++ b/x2goserver-extensions/bin/x2gosetkeyboard
@@ -33,26 +33,26 @@ test -f ${X2GO_CLIENT_KBD_FILE} || exit 0
 
 read_keyboard_file() {
 
-        # retrieve keyboard settings from keyboard file in X2go session dir
-        XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+	# retrieve keyboard settings from keyboard file in X2go session dir
+	XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+	XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+	XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+	XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+	XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
 
 }
 
 update_keymap() {
 
-        # prepare for setxkbmap call
-        [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES"
-        [ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL"
-        [ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT"
-        [ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT"
-        [ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS"
+	# prepare for setxkbmap call
+	[ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES"
+	[ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL"
+	[ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT"
+	[ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT"
+	[ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS"
 
-        # update keyboard map
-        setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS
+	# update keyboard map
+	setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS
 }
 
 ### main ###
diff --git a/x2goserver-extensions/bin/x2goversion b/x2goserver-extensions/bin/x2goversion
index 64dd758..b777625 100755
--- a/x2goserver-extensions/bin/x2goversion
+++ b/x2goserver-extensions/bin/x2goversion
@@ -23,7 +23,7 @@
 X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions"
 
 get_version() {
-        cat "$1" | egrep -v "^#.*" | head -n1 | cut -d" " -f1
+	cat "$1" | egrep -v "^#.*" | head -n1 | cut -d" " -f1
 }
 
 if [ -n "$1" ]; then


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).

    