# HG changeset patch # User Goffi # Date 1590489189 -7200 # Node ID 10748aa888a9f1a0406108b0149ccdf4c80fdfad # Parent 3a3f3bccd65b853ae7b5e255c1f3448025dab268 tasks (js_modules, sass): check for `yarnpkg` before `yarn`, as it is the name used in Debian diff -r 3a3f3bccd65b -r 10748aa888a9 libervia/server/tasks/implicit/task_js_modules.py --- a/libervia/server/tasks/implicit/task_js_modules.py Mon May 25 15:51:07 2020 +0200 +++ b/libervia/server/tasks/implicit/task_js_modules.py Tue May 26 12:33:09 2020 +0200 @@ -25,10 +25,7 @@ with package_path.open('w') as f: json.dump(package, f) - try: - cmd = self.findCommand('yarn') - except exceptions.NotFound: - cmd = self.findCommand('npm') + cmd = self.findCommand('yarnpkg', 'yarn', 'npm') await self.runCommand(cmd, 'install', path=str(self.build_path)) try: diff -r 3a3f3bccd65b -r 10748aa888a9 libervia/server/tasks/implicit/task_sass.py --- a/libervia/server/tasks/implicit/task_sass.py Mon May 25 15:51:07 2020 +0200 +++ b/libervia/server/tasks/implicit/task_sass.py Tue May 26 12:33:09 2020 +0200 @@ -46,10 +46,7 @@ with package_path.open('w') as f: json.dump(package, f, indent=4) - try: - cmd = self.findCommand('yarn') - except exceptions.NotFound: - cmd = self.findCommand('npm') + cmd = self.findCommand('yarnpkg', 'yarn', 'npm') await self.runCommand(cmd, 'install', path=str(d_path)) self.WATCH_DIRS = list(sass_dirs)