The branch, master has been updated via bf04119f723a9d65cde57ac8af4c464195561075 (commit) from 06145b01f02ff4d027f9b6f9f2e666f4995e447f (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 bf04119f723a9d65cde57ac8af4c464195561075 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Mar 10 13:14:37 2012 +0100 Add new command ,,x2gofeaturelist''. This command can be used by X2Go client applications to retrieve a list of server-side supported X2Go features. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2goserver/bin/{x2gofeature => x2gofeaturelist} | 11 +------- x2goserver/man/man8/x2gofeature.8 | 1 + x2goserver/man/man8/x2gofeaturelist.8 | 30 +++++++++++++++++++++++ 4 files changed, 36 insertions(+), 9 deletions(-) copy x2goserver/bin/{x2gofeature => x2gofeaturelist} (77%) create mode 100644 x2goserver/man/man8/x2gofeaturelist.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index af90d11..dbbb37b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low - Fix syslog output of x2goserver-run-exentions. - Fix x2goserver extension calls in x2goruncommand. - Add feature name ,,X2GO_PUBLISHED_APPLICATIONS''. + - Add new command ,,x2gofeaturelist''. This command can be used + by X2Go client applications to retrieve a list of server-side + supported X2Go features. * Remove /etc/x2go/applications on package removal if it is a symlink, keep it, if it is a directory. Remove /etc/x2go (if empty after purge) on package purge. diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeaturelist similarity index 77% copy from x2goserver/bin/x2gofeature copy to x2goserver/bin/x2gofeaturelist index f379070..1258a77 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeaturelist @@ -17,24 +17,17 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> - -[ -z $1 ] && { echo usage: "$(basename $0) <X2GO_FEATURE_NAME>"; exit -2; } +# Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` X2GO_SHARE_PATH=`echo -n \$(x2gobasepath)/share/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -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 + cat $subscript | egrep ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1 done } -echo "not available" -exit -1 diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index 67937a4..2907b6f 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -24,6 +24,7 @@ If feature <feature_name> is available on the X2Go server, then ,,ok'' is writte Otherwise the expression ,,not available'' is written to stdout. .SH SEE ALSO /usr/share/x2go/x2gofeature.d/*.features +x2gofeaturelist(8) .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8 new file mode 100644 index 0000000..fcbaa83 --- /dev/null +++ b/x2goserver/man/man8/x2gofeaturelist.8 @@ -0,0 +1,30 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gofeaturelist 8 "Feb 2012" "Version 3.1.1.x" "X2Go Server Tool" +.SH NAME +x2gofeaturelist \- Query X2Go Feature List for X2Go Server +.SH SYNOPSIS +'nh +.fi +.ad 1 +x2gofeaturelist + +.SH DESCRIPTION +\fBx2gofeaturelist\fR allows client applications to query a server-side list of X2Go features. +Such a list is very handy when new X2Go clients connect to older X2Go server. The list of features +provides an overview to the client on what functionalities the server support and what not. +.PP +\fBx2gofeaturelist\fR can be run with user privileges. +.SH RETURN VALUES +List of X2Go feature names. +.SH SEE ALSO +/usr/share/x2go/x2gofeature.d/*.features +x2gofeature(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). 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).