x2goserver.git - master (branch) updated: 3.0.99.6-5-g71b0dad - x2go-commits

25 Oct 2011

The branch, master has been updated
       via  71b0dad76b60b87ea92bde1f6c18a4e19967bd9c (commit)
      from  55bef4636e37d6211c01254295cd6065b419fe36 (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 71b0dad76b60b87ea92bde1f6c18a4e19967bd9c
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Oct 25 19:08:16 2011 +0200

    X2go server extensions: fix regular expression when scanning modality dirs.

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

Summary of changes:
 debian/changelog                                   |    1 +
 .../bin/x2goserver-run-extensions                  |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 79ddb32..769ad92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x2goserver (3.0.99.7-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.0.99.7):
     - Move x2golistmounts script from x2goserver-extensions to x2goserver
       core.
+    - X2go server extensions: fix regular expression when scanning modality dirs.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 12 Oct 2011 13:17:38 +0200
 
diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions
index 968167c..3a640a2 100755
--- a/x2goserver-extensions/bin/x2goserver-run-extensions
+++ b/x2goserver-extensions/bin/x2goserver-run-extensions
@@ -31,7 +31,7 @@ X2GO_SESSION=$1
 X2GO_MODALITY=$2
 
 # scan extensions and execute them
-find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "^[0-9]{3}_[:alnum:]+" | sort | while read x2go_extension; do
+find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do
 	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION"
 	$x2go_extension $X2GO_SESSION &>/dev/null && {
 		$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully"


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

    