diff options
author | Ankit Meel <ankitjmeel@gmail.com> | 2022-02-21 12:49:19 +0300 |
---|---|---|
committer | Ankit Meel <ankitjmeel@gmail.com> | 2022-02-21 12:49:19 +0300 |
commit | 5be74160c06a51fa61dce6293ddbd538562e766b (patch) | |
tree | 84c21b65024c5ddc94ce69864ba1ffe39679aa39 /release/datafiles | |
parent | 9189191c5b1665ae91a4a9582bd4ff762e44072b (diff) |
macOS/ blender_icons_update.py: prioritise environment variables
Also fix binary name for mac
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D14161
Diffstat (limited to 'release/datafiles')
-rwxr-xr-x | release/datafiles/blender_icons_update.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/release/datafiles/blender_icons_update.py b/release/datafiles/blender_icons_update.py index f4299fc510f..c1cf8d6fcb0 100755 --- a/release/datafiles/blender_icons_update.py +++ b/release/datafiles/blender_icons_update.py @@ -26,8 +26,8 @@ if sys.platform[:3] == "win": env["SystemDrive"] = os.environ.get("SystemDrive", "") env["SystemRoot"] = os.environ.get("SystemRoot", "") -inkscape_bin = os.environ.get("INKSCAPE_BIN", "inkscape") -blender_bin = os.environ.get("BLENDER_BIN", "blender") +inkscape_bin = "inkscape" +blender_bin = "blender" if sys.platform == 'darwin': inkscape_app_path = '/Applications/Inkscape.app/Contents/MacOS/inkscape' @@ -36,6 +36,11 @@ if sys.platform == 'darwin': blender_app_path = '/Applications/Blender.app/Contents/MacOS/Blender' if os.path.exists(blender_app_path): blender_bin = blender_app_path + else: + blender_bin = "Blender" + +inkscape_bin = os.environ.get("INKSCAPE_BIN", inkscape_bin) +blender_bin = os.environ.get("BLENDER_BIN", blender_bin) cmd = ( inkscape_bin, |