This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 74adacb Merge branch 'personal/sunweaver/specified-key-wins-over-lookforkeys' into 'master' new df8a3a3 x2go/backends/proxy/nx3.py: Add nxproxy launching support for Mac OS X. new 963f2cb x2go/backends/proxy/kdrive.py: Add x2gokdriveclient launching support for Mac OS X. new 2f9fbe8 x2go/backends/proxy/kdrive.py: Honour X2GOKDRIVECLIENT_BINARY env var if not on MS Windows or Mac OS X. new 00c81d4 Merge branch 'personal/sunweaver/nxproxy-on-darwin' into 'master' The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2go/backends/proxy/kdrive.py | 7 +++++++ x2go/backends/proxy/nx3.py | 5 +++++ 2 files changed, 12 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit df8a3a3db18105ed64cb1bc75eac30e97ada9dec Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 8 22:29:51 2024 +0100 x2go/backends/proxy/nx3.py: Add nxproxy launching support for Mac OS X. --- x2go/backends/proxy/nx3.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x2go/backends/proxy/nx3.py b/x2go/backends/proxy/nx3.py index c951431..9ccbff8 100644 --- a/x2go/backends/proxy/nx3.py +++ b/x2go/backends/proxy/nx3.py @@ -66,6 +66,11 @@ class X2GoProxy(base.X2GoProxy): if os.path.exists(_nxproxy_cmd): break self.PROXY_CMD = _nxproxy_cmd + elif _X2GOCLIENT_OS == 'Darwin': + if hasattr(sys, 'frozen'): # if client app is frozen + self.PROXY_CMD = join(os.environ['RESOURCEPATH'], 'nxproxy') + else: + self.PROXY_CMD = join(x2go_abs, 'contrib', 'mac', 'nxproxy', 'nxproxy') elif 'NXPROXY_BINARY' in os.environ: self.PROXY_CMD = os.environ['NXPROXY_BINARY'] else: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 2f9fbe8dc9f062012a90d87c0c7f8745c5e57cd6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 8 22:32:58 2024 +0100 x2go/backends/proxy/kdrive.py: Honour X2GOKDRIVECLIENT_BINARY env var if not on MS Windows or Mac OS X. --- x2go/backends/proxy/kdrive.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2go/backends/proxy/kdrive.py b/x2go/backends/proxy/kdrive.py index 76878ce..30ba773 100644 --- a/x2go/backends/proxy/kdrive.py +++ b/x2go/backends/proxy/kdrive.py @@ -71,6 +71,8 @@ class X2GoProxy(base.X2GoProxy): self.PROXY_CMD = join(os.environ['RESOURCEPATH'], 'x2gokdriveclient') else: self.PROXY_CMD = join(x2go_abs, 'contrib', 'mac', 'x2gokdriveclient', 'x2gokdriveclient') + elif 'X2GOKDRIVECLIENT_BINARY' in os.environ: + self.PROXY_CMD = os.environ['X2GOKDRIVECLIENT_BINARY'] else: self.PROXY_CMD = "/usr/bin/x2gokdriveclient" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 963f2cbb5c8df661bea898ed95a7fd54edbc3471 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 8 22:32:16 2024 +0100 x2go/backends/proxy/kdrive.py: Add x2gokdriveclient launching support for Mac OS X. --- x2go/backends/proxy/kdrive.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x2go/backends/proxy/kdrive.py b/x2go/backends/proxy/kdrive.py index d4b2d18..76878ce 100644 --- a/x2go/backends/proxy/kdrive.py +++ b/x2go/backends/proxy/kdrive.py @@ -66,6 +66,11 @@ class X2GoProxy(base.X2GoProxy): if os.path.exists(_x2gokdriveclient_cmd): break self.PROXY_CMD = _x2gokdriveclient_cmd + elif _X2GOCLIENT_OS == 'Darwin': + if hasattr(sys, 'frozen'): # if client app is frozen + self.PROXY_CMD = join(os.environ['RESOURCEPATH'], 'x2gokdriveclient') + else: + self.PROXY_CMD = join(x2go_abs, 'contrib', 'mac', 'x2gokdriveclient', 'x2gokdriveclient') else: self.PROXY_CMD = "/usr/bin/x2gokdriveclient" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 00c81d4c364d7178259e7378b903a59f77441422 Merge: 74adacb 2f9fbe8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jun 20 19:43:09 2024 +0000 Merge branch 'personal/sunweaver/nxproxy-on-darwin' into 'master' x2go/backends/proxy/{nx3,kdrive}.py: Mac OS X support for launch nxproxy/x2gokdriveclient See merge request x2go/client/libs/python-x2go!6 x2go/backends/proxy/kdrive.py | 7 +++++++ x2go/backends/proxy/nx3.py | 5 +++++ 2 files changed, 12 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org