[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-292-gb7c112f

X2go dev team git-admin at x2go.org
Sun Sep 25 00:52:09 CEST 2011


The branch, master has been updated
       via  b7c112fcb0f1855cbd11df6fbafee19a1e89019d (commit)
      from  3ab03bc1ec437ec5fa3e07121f49830352e80656 (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 b7c112fcb0f1855cbd11df6fbafee19a1e89019d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 00:52:04 2011 +0200

    Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions and x2goserver-printing.

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

Summary of changes:
 debian/changelog                                   |    2 +
 debian/x2goserver-extensions.install               |    3 +-
 debian/x2goserver-printing.install                 |    3 +-
 debian/x2goserver.install                          |    2 +-
 .../x2gofeature.d/x2goserver-extensions.features   |   19 +++++++++-----
 .../x2gofeature.d/x2goserver-printing.features     |   17 +++++++++---
 x2goserver/bin/{x2gocmdexitmessage => x2gofeature} |   27 ++++++++++++++-----
 x2goserver/share/x2gofeature.d/.placeholder        |    1 +
 8 files changed, 53 insertions(+), 21 deletions(-)
 copy x2goserver/bin/x2gocmdexitmessage => x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features (67%)
 copy x2goserver-compat/bin/x2gosuspend => x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features (67%)
 copy x2goserver/bin/{x2gocmdexitmessage => x2gofeature} (60%)
 create mode 100644 x2goserver/share/x2gofeature.d/.placeholder

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5912c83..46fd40a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     of x2gognomebindings and moved it there (with new name:
     x2goumount-session-gnome).
   * Add x2golistmounts script to X2go server extensions.
+  * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions and
+    x2goserver-printing.
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/debian/x2goserver-extensions.install b/debian/x2goserver-extensions.install
index 8263b77..4983aa8 100644
--- a/debian/x2goserver-extensions.install
+++ b/debian/x2goserver-extensions.install
@@ -1,2 +1,3 @@
 x2goserver-extensions/bin/x2go*      /usr/bin/
-x2goserver-extensions/VERSION.x2goserver-extensions      /usr/share/x2go/versions/
\ No newline at end of file
+x2goserver-extensions/VERSION.x2goserver-extensions      /usr/share/x2go/versions/
+x2goserver-extensions/share/x2gofeature.d/*              /usr/share/x2go/x2gofeature.d/
\ No newline at end of file
diff --git a/debian/x2goserver-printing.install b/debian/x2goserver-printing.install
index 5daea4e..c37db3c 100644
--- a/debian/x2goserver-printing.install
+++ b/debian/x2goserver-printing.install
@@ -1,2 +1,3 @@
 x2goserver-printing/bin/x2go*      /usr/bin/
-x2goserver-printing/VERSION.x2goserver-printing      /usr/share/x2go/versions/
\ No newline at end of file
+x2goserver-printing/VERSION.x2goserver-printing      /usr/share/x2go/versions/
+x2goserver-printing/share/x2gofeature.d/*           /usr/share/x2go/x2gofeature.d/
\ No newline at end of file
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index 5f1395a..ea91840 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -5,4 +5,4 @@ x2goserver/etc/x2gosql/sql              /etc/x2go/x2gosql/
 x2goserver/etc/x2goserver.conf          /etc/x2go/
 x2goserver/VERSION.x2goserver           /usr/share/x2go/versions/
 x2goserver/x2gosqlitewrapper            /usr/lib/x2go/
-
+x2goserver/share/x2gofeature.d          /usr/share/x2go/
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
similarity index 67%
copy from x2goserver/bin/x2gocmdexitmessage
copy to x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
index 8c96e92..879e71b 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
@@ -17,15 +17,20 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+# Copyright (C) 2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 
 X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
-X2GO_ROOT=${HOME}/.x2go
-MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput
 
 $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)"
 
-# return command output of the command that was issued by x2goruncommand
-cat $MESSAGE_FILE
+X2GO_FEATURE=$1
+
+# check for X2go server core features
+case "$X2GO_FEATURE" in
+
+    "X2GO_LIST_MOUNTS") echo "ok"; exit 0;;
+    *) exit -1;;
+
+esac
+
diff --git a/x2goserver-compat/bin/x2gosuspend b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features
similarity index 67%
copy from x2goserver-compat/bin/x2gosuspend
copy to x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features
index 4ddd3df..6926e41 100755
--- a/x2goserver-compat/bin/x2gosuspend
+++ b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features
@@ -17,8 +17,17 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+# Copyright (C) 2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
+X2GO_FEATURE=$1
+
+# check for X2go server core features
+case "$X2GO_FEATURE" in
+
+    "X2GO_PRINTING") echo "ok"; exit 0;;
+    *) exit -1;;
+esac
 
-# this script is here for reasons of backwards compatibility with older clients
-x2gosuspend-session $@
\ No newline at end of file
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gofeature
similarity index 60%
copy from x2goserver/bin/x2gocmdexitmessage
copy to x2goserver/bin/x2gofeature
index 8c96e92..59855f0 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gofeature
@@ -17,15 +17,28 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+# Copyright (C) 2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 
 X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
-X2GO_ROOT=${HOME}/.x2go
-MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput
+X2GO_SHARE_PATH=`echo -n \$(x2gobasepath)/share/x2go`
 
 $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)"
 
-# return command output of the command that was issued by x2goruncommand
-cat $MESSAGE_FILE
+X2GO_FEATURE=$1
+
+# run x2gofeature scripts of X2go extensions
+test -d $X2GO_SHARE_PATH/x2gofeature.d && {
+    for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do
+        $subscript $@ && exit 0
+    done
+}
+
+# check for X2go server core features
+case "$X2GO_FEATURE" in
+
+    "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;;
+    *) echo "not available"; exit -1;;
+
+esac
+
diff --git a/x2goserver/share/x2gofeature.d/.placeholder b/x2goserver/share/x2gofeature.d/.placeholder
new file mode 100644
index 0000000..2f72cde
--- /dev/null
+++ b/x2goserver/share/x2gofeature.d/.placeholder
@@ -0,0 +1 @@
+# do not remove this file, it's a placeholder
\ No newline at end of file


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




More information about the x2go-commits mailing list