[X2Go-Commits] [python-x2go] 01/04: x2go/backends/proxy/nx3.py: Add nxproxy launching support for Mac OS X.

[git-admin at x2go.org]

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 at 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