From 6d7a2ff25f2d37937ce46d2041b7a820d2d4353d Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 13 Dec 2021 16:03:36 -0300 Subject: [PATCH] [web] refactoring: using the environment definition file URL from bauh-files --- bauh/gems/web/__init__.py | 2 +- bauh/gems/web/environment.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bauh/gems/web/__init__.py b/bauh/gems/web/__init__.py index d95e0684..5fa04dad 100644 --- a/bauh/gems/web/__init__.py +++ b/bauh/gems/web/__init__.py @@ -22,7 +22,7 @@ ELECTRON_DOWNLOAD_URL = 'https://github.com/electron/electron/releases/download/ ELECTRON_SHA256_URL = 'https://github.com/electron/electron/releases/download/v{version}/SHASUMS256.txt' ELECTRON_WIDEVINE_URL = 'https://github.com/castlabs/electron-releases/releases/download/v{version}-wvvmp/electron-v{version}-wvvmp-linux-{arch}.zip' ELECTRON_WIDEVINE_SHA256_URL = 'https://github.com/castlabs/electron-releases/releases/download/v{version}-wvvmp/SHASUMS256.txt' -URL_ENVIRONMENT_SETTINGS = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/web/env/v1/environment.yml' +URL_ENVIRONMENT_SETTINGS = f'https://raw.githubusercontent.com/vinifmor/bauh-files/master/web/env/v2/environment.yml' DESKTOP_ENTRY_PATH_PATTERN = f'{DESKTOP_ENTRIES_DIR}/{__app_name__}.web.' + '{name}.desktop' URL_FIX_PATTERN = "https://raw.githubusercontent.com/vinifmor/bauh-files/master/web/fix/{url}.js" URL_SUGGESTIONS = "https://raw.githubusercontent.com/vinifmor/bauh-files/master/web/env/v2/suggestions.yml" diff --git a/bauh/gems/web/environment.py b/bauh/gems/web/environment.py index ca3a1f72..fbe3e3ca 100644 --- a/bauh/gems/web/environment.py +++ b/bauh/gems/web/environment.py @@ -304,6 +304,11 @@ class EnvironmentUpdater: try: settings = yaml.safe_load(res.content) + nodejs_settings = settings.get('nodejs') + + if nodejs_settings: + nodejs_settings['url'] = nodejs_settings['url'].format(version=nodejs_settings['version']) + except yaml.YAMLError: self.logger.error(f'Could not parse environment settings: {res.text}') self._finish_task_download_settings()