From 942dd770fdef40b373ab6f8c9ab1cb066ac55020 Mon Sep 17 00:00:00 2001 From: antirotor Date: Fri, 26 Apr 2019 12:56:22 +0200 Subject: [PATCH] fix(setup): fixed PYPE_SETUP_ROOT -> PYPE_ROOT --- pype/aport/api.py | 2 +- pype/aport/original/api.py | 2 +- pype/aport/original/pipeline.py | 2 +- pype/clockify/widget_settings.py | 2 +- pype/ftrack/login_dialog.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pype/aport/api.py b/pype/aport/api.py index 42a090dc63..bac3e235df 100644 --- a/pype/aport/api.py +++ b/pype/aport/api.py @@ -56,7 +56,7 @@ def publish(json_data_path, gui): log.info("avalon.session is: \n{}".format(SESSION)) - pype_start = os.path.join(os.getenv('PYPE_SETUP_ROOT'), + pype_start = os.path.join(os.getenv('PYPE_ROOT'), "app", "pype-start.py") publish = "--publish-gui" if gui else "--publish" diff --git a/pype/aport/original/api.py b/pype/aport/original/api.py index b7ae447546..b1fffed1dc 100644 --- a/pype/aport/original/api.py +++ b/pype/aport/original/api.py @@ -56,7 +56,7 @@ def publish(json_data_path, staging_dir=None): return_json_path = os.path.join(staging_dir, "return_data.json") log.info("avalon.session is: \n{}".format(SESSION)) - pype_start = os.path.join(os.getenv('PYPE_SETUP_ROOT'), + pype_start = os.path.join(os.getenv('PYPE_ROOT'), "app", "pype-start.py") args = [pype_start, "--publish", diff --git a/pype/aport/original/pipeline.py b/pype/aport/original/pipeline.py index 2c37695225..1bfd9a8d1e 100644 --- a/pype/aport/original/pipeline.py +++ b/pype/aport/original/pipeline.py @@ -55,7 +55,7 @@ def publish(json_data_path, staging_dir=None): return_json_path = os.path.join(staging_dir, "return_data.json") log.debug("avalon.session is: \n{}".format(SESSION)) - pype_start = os.path.join(os.getenv('PYPE_SETUP_ROOT'), + pype_start = os.path.join(os.getenv('PYPE_ROOT'), "app", "pype-start.py") args = [pype_start, "--publish", diff --git a/pype/clockify/widget_settings.py b/pype/clockify/widget_settings.py index ad92c299bb..7142548fa6 100644 --- a/pype/clockify/widget_settings.py +++ b/pype/clockify/widget_settings.py @@ -26,7 +26,7 @@ class ClockifySettings(QtWidgets.QWidget): elif hasattr(parent, 'parent') and hasattr(parent.parent, 'icon'): self.setWindowIcon(self.parent.parent.icon) else: - pype_setup = os.getenv('PYPE_SETUP_ROOT') + pype_setup = os.getenv('PYPE_ROOT') items = [pype_setup, "app", "resources", "icon.png"] fname = os.path.sep.join(items) icon = QtGui.QIcon(fname) diff --git a/pype/ftrack/login_dialog.py b/pype/ftrack/login_dialog.py index 04ebd59ae4..5520087032 100644 --- a/pype/ftrack/login_dialog.py +++ b/pype/ftrack/login_dialog.py @@ -28,7 +28,7 @@ class Login_Dialog_ui(QtWidgets.QWidget): elif hasattr(parent, 'parent') and hasattr(parent.parent, 'icon'): self.setWindowIcon(self.parent.parent.icon) else: - pype_setup = os.getenv('PYPE_SETUP_ROOT') + pype_setup = os.getenv('PYPE_ROOT') items = [pype_setup, "app", "resources", "icon.png"] fname = os.path.sep.join(items) icon = QtGui.QIcon(fname)