changeset 8750:d913d84d5253

front-end: use 'bin' path for node commands instead of '.bin' license-checker is using relative paths for importing other modueles - that worked fine when .bin/license-checker was a symlink, but not on filesystems without symlinks support: internal/modules/cjs/loader.js:883 throw err; ^ Error: Cannot find module '../lib/index'
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 04 Nov 2020 21:11:48 +0100
parents 5dd9cf56f09e
children ad239692ea95
files kallithea/bin/kallithea_cli_front_end.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/bin/kallithea_cli_front_end.py	Fri Oct 23 00:42:26 2020 +0200
+++ b/kallithea/bin/kallithea_cli_front_end.py	Wed Nov 04 21:11:48 2020 +0100
@@ -57,7 +57,7 @@
                     '-f', 'html',
                     '-a', '.code-highlight'],
                     stdout=f)
-        lesscpath = os.path.join(front_end_dir, 'node_modules', '.bin', 'lessc')
+        lesscpath = os.path.join(front_end_dir, 'node_modules', 'less', 'bin', 'lessc')
         lesspath = os.path.join(front_end_dir, 'main.less')
         csspath = os.path.join(public_dir, 'css', 'style.css')
         subprocess.check_call([lesscpath, '--source-map',
@@ -91,7 +91,7 @@
         shutil.copytree(os.path.join(front_end_dir, 'node_modules', 'codemirror'), os.path.join(public_dir, 'codemirror'))
 
         click.echo("Generating LICENSES.txt")
-        license_checker_path = os.path.join(front_end_dir, 'node_modules', '.bin', 'license-checker')
+        license_checker_path = os.path.join(front_end_dir, 'node_modules', 'license-checker', 'bin', 'license-checker')
         check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json')
         licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt')
         subprocess.check_call([license_checker_path, '--json', '--out', check_licensing_json_path],