From 34e0e2666c3d9c38c04c8565a33a6b4089e6a1e6 Mon Sep 17 00:00:00 2001 From: endarova Date: Fri, 15 Nov 2019 15:09:01 +0200 Subject: [PATCH 1/3] set preview falback path according to os --- core/settings/Settings.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/core/settings/Settings.py b/core/settings/Settings.py index bc66d63e..f327c2fd 100644 --- a/core/settings/Settings.py +++ b/core/settings/Settings.py @@ -103,11 +103,19 @@ class Packages(object): if ENV == EnvironmentType.LIVE: __default_preview_folder = 'latest-official' PREVIEW_APP_ID = "org.nativescript.preview" - PREVIEW_PATH = os.environ.get('preview_folder_path', os.path.join("/tns-dist", "Playground", - "ns-play-dev", __default_preview_folder)) - PLAYGROUND_PATH = os.environ.get('playground_folder_path', os.path.join("/tns-dist", "Playground", - "ns-play", __default_preview_folder)) - + if os.name == 'nt': + PREVIEW_PATH = os.environ.get('preview_folder_path', + os.path.join("\\telerik.com\distributions\DailyBuilds\NativeScript", + "Playground","ns-play-dev", __default_preview_folder)) + PLAYGROUND_PATH = os.environ.get('playground_folder_path', + os.path.join("\\telerik.com\distributions\DailyBuilds\NativeScript", + "Playground", "ns-play", __default_preview_folder)) + else: + PREVIEW_PATH = os.environ.get('preview_folder_path', os.path.join("/tns-dist", "Playground", + "ns-play-dev", __default_preview_folder)) + PLAYGROUND_PATH = os.environ.get('playground_folder_path',os.path.join("/tns-dist", "Playground", + "ns-play", __default_preview_folder)) + PREVIEW_APP_IOS = os.path.join(PREVIEW_PATH, "nsplaydev.tgz") PREVIEW_APP_ANDROID = os.path.join(PREVIEW_PATH, "app-universal-release.apk") PLAYGROUND_APP_IOS = os.path.join(PLAYGROUND_PATH, "nsplay.tgz") From 10839410c3be502328f5aa7439bb48d40cc02168 Mon Sep 17 00:00:00 2001 From: endarova Date: Fri, 15 Nov 2019 15:22:36 +0200 Subject: [PATCH 2/3] fix win path --- core/settings/Settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/settings/Settings.py b/core/settings/Settings.py index f327c2fd..19c1bb2a 100644 --- a/core/settings/Settings.py +++ b/core/settings/Settings.py @@ -105,10 +105,10 @@ class Packages(object): PREVIEW_APP_ID = "org.nativescript.preview" if os.name == 'nt': PREVIEW_PATH = os.environ.get('preview_folder_path', - os.path.join("\\telerik.com\distributions\DailyBuilds\NativeScript", + os.path.join("\\\\telerik.com\\distributions\\DailyBuilds\\NativeScript", "Playground","ns-play-dev", __default_preview_folder)) PLAYGROUND_PATH = os.environ.get('playground_folder_path', - os.path.join("\\telerik.com\distributions\DailyBuilds\NativeScript", + os.path.join("\\\\telerik.com\\distributions\\DailyBuilds\\NativeScript", "Playground", "ns-play", __default_preview_folder)) else: PREVIEW_PATH = os.environ.get('preview_folder_path', os.path.join("/tns-dist", "Playground", From 40164ee7f73794fbd1395e9de7cbb5686dc29463 Mon Sep 17 00:00:00 2001 From: endarova Date: Fri, 15 Nov 2019 16:22:25 +0200 Subject: [PATCH 3/3] fix lint errors --- core/settings/Settings.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/settings/Settings.py b/core/settings/Settings.py index 19c1bb2a..0e88a7df 100644 --- a/core/settings/Settings.py +++ b/core/settings/Settings.py @@ -106,16 +106,16 @@ class Packages(object): if os.name == 'nt': PREVIEW_PATH = os.environ.get('preview_folder_path', os.path.join("\\\\telerik.com\\distributions\\DailyBuilds\\NativeScript", - "Playground","ns-play-dev", __default_preview_folder)) + "Playground", "ns-play-dev", __default_preview_folder)) PLAYGROUND_PATH = os.environ.get('playground_folder_path', - os.path.join("\\\\telerik.com\\distributions\\DailyBuilds\\NativeScript", - "Playground", "ns-play", __default_preview_folder)) + os.path.join("\\\\telerik.com\\distributions\\DailyBuilds\\NativeScript", + "Playground", "ns-play", __default_preview_folder)) else: PREVIEW_PATH = os.environ.get('preview_folder_path', os.path.join("/tns-dist", "Playground", "ns-play-dev", __default_preview_folder)) - PLAYGROUND_PATH = os.environ.get('playground_folder_path',os.path.join("/tns-dist", "Playground", - "ns-play", __default_preview_folder)) - + PLAYGROUND_PATH = os.environ.get('playground_folder_path', os.path.join("/tns-dist", "Playground", + "ns-play", __default_preview_folder)) + PREVIEW_APP_IOS = os.path.join(PREVIEW_PATH, "nsplaydev.tgz") PREVIEW_APP_ANDROID = os.path.join(PREVIEW_PATH, "app-universal-release.apk") PLAYGROUND_APP_IOS = os.path.join(PLAYGROUND_PATH, "nsplay.tgz")