From 94150e09f9da6ddbc33a3f1e5deb4b1eaf041f3c Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Tue, 12 May 2020 16:27:58 +0200 Subject: [PATCH 1/2] basic darwin compatibility --- environments/global.json | 4 +++- launchers/darwin/blender_2.82 | 2 ++ launchers/darwin/python3 | 2 ++ system/storage.json | 8 ++++---- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 launchers/darwin/blender_2.82 create mode 100644 launchers/darwin/python3 diff --git a/environments/global.json b/environments/global.json index fabcc1e..9b8d453 100644 --- a/environments/global.json +++ b/environments/global.json @@ -7,6 +7,7 @@ "STUDIO_SOFT": "{PYPE_STUDIO_CORE_MOUNT}/soft", "FFMPEG_PATH": { "windows": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/windows/bin", + "darwin": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/darwin/bin", "linux": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/linux" }, "DJV_PATH": { @@ -26,7 +27,8 @@ "PYPE_PROJECT_CONFIGS": "{PYPE_ROOT}/../studio-project-configs", "PYPE_PYTHON_EXE": { "windows": "{VIRTUAL_ENV}/Scripts/python.exe", - "linux": "{VIRTUAL_ENV}/Scripts/python" + "linux": "{VIRTUAL_ENV}/Scripts/python", + "darwin": "{VIRTUAL_ENV}/bin/python" }, "PYPE_LOG_MONGO_HOST": "localhost", "PYPE_LOG_MONGO_PORT": "2707", diff --git a/launchers/darwin/blender_2.82 b/launchers/darwin/blender_2.82 new file mode 100644 index 0000000..8254411 --- /dev/null +++ b/launchers/darwin/blender_2.82 @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +open -a blender $@ diff --git a/launchers/darwin/python3 b/launchers/darwin/python3 new file mode 100644 index 0000000..1c5f04d --- /dev/null +++ b/launchers/darwin/python3 @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +python3 $@ diff --git a/system/storage.json b/system/storage.json index 6fb1902..0556eae 100644 --- a/system/storage.json +++ b/system/storage.json @@ -3,24 +3,24 @@ "projects": { "path": { "windows": "//network/path/to/projects", - "darwin": "", + "darwin": "/Users/annatar/pype/projects", "linux": "/mnt/share/projects" }, "mount": { "windows": "P:/mounted/path/to/projects", - "darwin": "", + "darwin": "/Users/annatar/pype/projects", "linux": "/mnt/share/core" } }, "core": { "path": { "windows": "//network/path/to/core", - "darwin": "", + "darwin": "/Users/annatar/pype/core", "linux": "/mnt/share/core" }, "mount": { "windows": "K:/network/path/to/core", - "darwin": "", + "darwin": "/Users/annatar/pype/core", "linux": "/mnt/share/core" } } From bb20bf05493c83cf7a3ef2130cde53f9ffbf8499 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Tue, 12 May 2020 17:20:53 +0200 Subject: [PATCH 2/2] fixed executable rights --- launchers/darwin/blender_2.82 | 0 launchers/darwin/python3 | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 launchers/darwin/blender_2.82 mode change 100644 => 100755 launchers/darwin/python3 diff --git a/launchers/darwin/blender_2.82 b/launchers/darwin/blender_2.82 old mode 100644 new mode 100755 diff --git a/launchers/darwin/python3 b/launchers/darwin/python3 old mode 100644 new mode 100755 index 1c5f04d..c2b82c7 --- a/launchers/darwin/python3 +++ b/launchers/darwin/python3 @@ -1,2 +1,2 @@ #!/usr/bin/env bash -python3 $@ +open /usr/bin/python3 --args $@