spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-08 15:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[wgem] environment update fix

Browse Source
This commit is contained in:
Vinícius Moreira
2019-12-10 18:14:37 -03:00
parent b4533413e6
commit bac3c5bcde
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bauh/gems/web/environment.py
View File

@@ -66,11 +66,14 @@ class NodeUpdater:
if not os.path.exists(NODE_DIR_PATH): if not os.path.exists(NODE_DIR_PATH):
return self._download_and_install(version=version, version_url=version_url, watcher=watcher) return self._download_and_install(version=version, version_url=version_url, watcher=watcher)
else: else:
installed_version = system.run_cmd('{} --version'.format(NODE_BIN_PATH)) installed_version = system.run_cmd('{} --version'.format(NODE_BIN_PATH), print_error=False)
if installed_version: if installed_version:
installed_version = installed_version.strip() installed_version = installed_version.strip()
if installed_version.startswith('v'):
installed_version = installed_version[1:]
self.logger.info('Node -> installed: {}. cloud: {}.'.format(installed_version, version)) self.logger.info('Node -> installed: {}. cloud: {}.'.format(installed_version, version))
if version != installed_version: if version != installed_version:
@@ -128,7 +131,17 @@ class NodeUpdater:
if not self._is_nativefier_installed(): if not self._is_nativefier_installed():
return self._install_nativefier(version=version, handler=handler) return self._install_nativefier(version=version, handler=handler)
self.logger.info("Nativefier is already installed") installed_version = run_cmd('{} --version'.format(NATIVEFIER_BIN_PATH), print_error=False)
if installed_version:
installed_version = installed_version.strip()
self.logger.info("Nativefier versions: installed ({}), cloud ({})".format(installed_version, version))
if version != installed_version:
self.logger.info("Installed nativefier version is different from cloud's. Changing version.")
return self._install_nativefier(version=version, handler=handler)
self.logger.info("Nativefier is already installed and up to date")
return True return True
def _download_electron(self, version: str, is_x86_x64_arch: bool, watcher: ProcessWatcher) -> bool: def _download_electron(self, version: str, is_x86_x64_arch: bool, watcher: ProcessWatcher) -> bool: