From b22ee6b1919be9418bfa06d3bac858f7973fdf37 Mon Sep 17 00:00:00 2001 From: "Cimon Lucas (LCM)" Date: Fri, 4 Aug 2017 10:48:21 +0200 Subject: [PATCH 1/2] NodeJS hooks compatibilty fix for Cygwin --- pre_commit/languages/node.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py index 69378b06..9110a3a9 100644 --- a/pre_commit/languages/node.py +++ b/pre_commit/languages/node.py @@ -19,8 +19,8 @@ healthy = helpers.basic_healthy def get_env_patch(venv): # pragma: windows no cover return ( ('NODE_VIRTUAL_ENV', venv), - ('NPM_CONFIG_PREFIX', venv), - ('npm_config_prefix', venv), + ('NPM_CONFIG_PREFIX', os.path.join(venv, 'bin') if sys.platform == 'cygwin' else venv), + ('npm_config_prefix', os.path.join(venv, 'bin') if sys.platform == 'cygwin' else venv), ('NODE_PATH', os.path.join(venv, 'lib', 'node_modules')), ('PATH', (os.path.join(venv, 'bin'), os.pathsep, Var('PATH'))), ) From 5f3e162646b0abb0a9cd5597acad3e549c430ef6 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 4 Aug 2017 08:31:06 -0700 Subject: [PATCH 2/2] Appease flake8 --- pre_commit/languages/node.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py index 9110a3a9..58922672 100644 --- a/pre_commit/languages/node.py +++ b/pre_commit/languages/node.py @@ -17,10 +17,11 @@ healthy = helpers.basic_healthy def get_env_patch(venv): # pragma: windows no cover + config = os.path.join(venv, 'bin') if sys.platform == 'cygwin' else venv return ( ('NODE_VIRTUAL_ENV', venv), - ('NPM_CONFIG_PREFIX', os.path.join(venv, 'bin') if sys.platform == 'cygwin' else venv), - ('npm_config_prefix', os.path.join(venv, 'bin') if sys.platform == 'cygwin' else venv), + ('NPM_CONFIG_PREFIX', config), + ('npm_config_prefix', config), ('NODE_PATH', os.path.join(venv, 'lib', 'node_modules')), ('PATH', (os.path.join(venv, 'bin'), os.pathsep, Var('PATH'))), )