This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit bbd66e607faf1690171808fc22d6cb63dbba7e4f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 31 15:57:25 2021 +0200 Rename 'NX options' to 'session options'. --- man/man1/pyhoca-cli.1 | 2 +- pyhoca-cli | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 3edc0164..cf0c1e18 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -198,7 +198,7 @@ try those for authentication against the X2Go Session Broker. (Not implemented, .TP \*(T<\fB\-\-broker-ssh-key=<SSHPRIVKEY>\fR\*(T> NOT IMPLEMENTED YET: For SSH based X2Go Session Brokers. Full path to a valid SSH private key file. (Not implemented, yet). -.SH NX OPTIONS (Version 3) +.SH SESSION OPTIONS (NXv3 or X2GoKDrive) .TP \*(T<\fB\-g, \-\-geometry\fR \fI{<WIDTH>x<HEIGHT>|fullscreen|maximize}\fR\*(T> Screen geometry (default: '800x600'). diff --git a/pyhoca-cli b/pyhoca-cli index f432b906..0ed5c40e 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -185,8 +185,7 @@ broker_options = [ {'args':['-B','--broker-url'], 'default': None, 'help': 'retrieve session profiles via an X2Go Session Broker under the given URL', }, {'args':['--broker-password'], 'default': None, 'help': 'password for authenticating against the X2Go Session Broker', }, ] - -nx_options = [ +session_options = [ {'args':['-g','--geometry'], 'default': '800x600','help': 'screen geometry: \'<width>x<height>\' or \'fullscreen\' (default: \'800x600\')',}, {'args':['-x','--xinerama'], 'default': False, 'action': 'store_true', 'help': 'enable Xinerama support in remote X2Go session',}, {'args':['-q','--link'], 'default': 'adsl', 'choices': ('modem','isdn','adsl','wan','lan'), 'help': 'link quality (default: \'adsl\')',}, @@ -215,8 +214,6 @@ elif _X2GOCLIENT_OS == 'Linux': else: _config_backends = ('FILE') - - backend_options = [ {'args':['--backend-controlsession'], 'default': None, 'metavar': '<CONTROLSESSION_BACKEND>', 'choices': BACKENDS['X2GoControlSession'].keys(), 'help': 'force usage of a certain CONTROLSESSION_BACKEND (do not use this unless you know exactly what you are doing)', }, {'args':['--backend-terminalsession'], 'default': None, 'metavar': '<TERMINALSESSION_BACKEND>', 'choices': BACKENDS['X2GoTerminalSession'].keys(), 'help': 'force usage of a certain TERMINALSESSION_BACKEND (do not use this unless you know exactly what you are doing)', }, @@ -259,11 +256,11 @@ Possible values for the --pack NX option are: p_sshopts = p.add_argument_group('SSH options') p_printopts = p.add_argument_group('X2Go print options') p_brokeropts = p.add_argument_group('X2Go Session Broker client options') - p_nxopts = p.add_argument_group('NX options') + p_sessionopts = p.add_argument_group('Session (NXv3 / X2GoKDrive) options') p_backendopts = p.add_argument_group('Python X2Go backend options (for experts only)') p_compatopts = p.add_argument_group('compatibility options') - for (p_group, opts) in ((p_x2goopts, x2go_options), (p_sshopts, ssh_options), (p_printopts, print_options), (p_brokeropts, broker_options), (p_actionopts, action_options), (p_debugopts, debug_options), (p_nxopts, nx_options), (p_backendopts, backend_options), (p_compatopts, compat_options)): + for (p_group, opts) in ((p_x2goopts, x2go_options), (p_sshopts, ssh_options), (p_printopts, print_options), (p_brokeropts, broker_options), (p_actionopts, action_options), (p_debugopts, debug_options), (p_sessionopts, session_options), (p_backendopts, backend_options), (p_compatopts, compat_options)): for opt in opts: args = opt['args'] -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git