From 18249bec8ad3c72cfd134ad0768a9de9c3488652 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sat, 29 Mar 2014 23:27:26 -0700 Subject: [PATCH] Simplify installing into virtualenv --- pre_commit/languages/node.py | 4 +--- pre_commit/languages/python.py | 2 +- pre_commit/languages/ruby.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py index ec9da388..87312e84 100644 --- a/pre_commit/languages/node.py +++ b/pre_commit/languages/node.py @@ -45,9 +45,7 @@ def install_environment(repo_cmd_runner): python_env.run('nodeenv --jobs 4 {{prefix}}{0}'.format(NODE_ENV)) with in_env(repo_cmd_runner) as node_env: - node_env.run( - 'cd {0} && npm install -g'.format(repo_cmd_runner.prefix_dir), - ) + node_env.run('cd {prefix} && npm install -g') def run_hook(repo_cmd_runner, hook, file_args): diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py index 91d43b2e..14f2c935 100644 --- a/pre_commit/languages/python.py +++ b/pre_commit/languages/python.py @@ -27,7 +27,7 @@ def install_environment(repo_cmd_runner): # Install a virtualenv repo_cmd_runner.run(['virtualenv', '{{prefix}}{0}'.format(PY_ENV)]) with in_env(repo_cmd_runner) as env: - env.run('cd {0} && pip install .'.format(repo_cmd_runner.prefix_dir)) + env.run('cd {prefix} && pip install .') def run_hook(repo_cmd_runner, hook, file_args): diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py index fcd3ad42..9d3ef26c 100644 --- a/pre_commit/languages/ruby.py +++ b/pre_commit/languages/ruby.py @@ -25,7 +25,7 @@ def install_environment(repo_cmd_runner): repo_cmd_runner.run(['__rvm-env.sh', '{{prefix}}{0}'.format(RVM_ENV)]) with in_env(repo_cmd_runner) as env: - env.run('bundle install', cwd=repo_cmd_runner.prefix_dir) + env.run('cd {prefix} && bundle install') def run_hook(repo_cmd_runner, hook, file_args):