From d0faab89f96b35b297d3117bea619d2dc8cc4c5a Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Fri, 7 Jan 2022 15:55:53 +0100
Subject: [PATCH] flame: adding wiretap tools dir to app env var

---
 openpype/hosts/flame/api/scripts/wiretap_com.py | 17 +++++++----------
 .../defaults/system_settings/applications.json  |  3 ++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/openpype/hosts/flame/api/scripts/wiretap_com.py b/openpype/hosts/flame/api/scripts/wiretap_com.py
index 4e54dfd913..2cd9a46184 100644
--- a/openpype/hosts/flame/api/scripts/wiretap_com.py
+++ b/openpype/hosts/flame/api/scripts/wiretap_com.py
@@ -43,6 +43,9 @@ class WireTapCom(object):
         self.volume_name = volume_name or "stonefs"
         self.group_name = group_name or "staff"
 
+        # wiretap tools dir path
+        self.wiretap_tools_dir = os.getenv("OPENPYPE_WIRETAP_TOOLS")
+
         # initialize WireTap client
         WireTapClientInit()
 
@@ -166,11 +169,8 @@ class WireTapCom(object):
             # form cmd arguments
             project_create_cmd = [
                 os.path.join(
-                    "/opt/Autodesk/",
-                    "wiretap",
-                    "tools",
-                    FLAME_V,
-                    "wiretap_create_node",
+                    self.wiretap_tools_dir,
+                    "wiretap_create_node"
                 ),
                 '-n',
                 os.path.join("/volumes", self.volume_name),
@@ -422,11 +422,8 @@ class WireTapCom(object):
         color_policy = color_policy or "Legacy"
         project_colorspace_cmd = [
             os.path.join(
-                "/opt/Autodesk/",
-                "wiretap",
-                "tools",
-                FLAME_V,
-                "wiretap_duplicate_node",
+                self.wiretap_tools_dir,
+                "wiretap_duplicate_node"
             ),
             "-s",
             "/syncolor/policies/Autodesk/{}".format(color_policy),
diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json
index 7fe0432fdf..4a8b6d82a2 100644
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@@ -131,7 +131,8 @@
                 },
                 "environment": {
                     "OPENPYPE_FLAME_PYTHON_EXEC": "/opt/Autodesk/python/2021/bin/python2.7",
-                    "OPENPYPE_FLAME_PYTHONPATH": "/opt/Autodesk/flame_2021/python"
+                    "OPENPYPE_FLAME_PYTHONPATH": "/opt/Autodesk/flame_2021/python",
+                    "OPENPYPE_WIRETAP_TOOLS": "/opt/Autodesk/wiretap/tools/2021"
                 }
             },
             "__dynamic_keys_labels__": {