[X2Go-Commits] [python-x2go] 02/04: x2go/backends/proxy/kdrive.py: Add x2gokdriveclient launching support for Mac OS X.

git-admin at x2go.org git-admin at x2go.org
Thu Jun 20 21:43:15 CEST 2024


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


More information about the x2go-commits mailing list