Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Feature/pype 785 osx compatibility #141

Merged
merged 2 commits into from
May 12, 2020
Merged

Feature/pype 785 osx compatibility #141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
777eea9
support darwin for launching apps
antirotor May 12, 2020
4c5d0fa
fixed PEP issues
antirotor May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pype/ftrack/lib/ftrack_app_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ def launch(self, session, entities, event):
executable=execfile, args=[], environment=env
)

elif sys.platform.startswith("linux"):
elif (sys.platform.startswith("linux")
or sys.platform.startswith("darwin")):
execfile = os.path.join(path.strip('"'), self.executable)
if not os.path.isfile(execfile):
msg = "Launcher doesn't exist - {}".format(execfile)
Expand Down Expand Up @@ -303,7 +304,7 @@ def launch(self, session, entities, event):
)
}

popen = avalonlib.launch(
popen = avalon.lib.launch( # noqa: F841
"/usr/bin/env", args=["bash", execfile], environment=env
)

Expand Down