Merge pull request #626 from pre-commit/pipes_quote_more

asottile · web-flow · commit eefeaaf844e4 · 2017-09-21T15:49:21.000-07:00
Use pipes.quote for executable path
diff --git a/pre_commit/commands/install_uninstall.py b/pre_commit/commands/install_uninstall.py
@@ -3,6 +3,7 @@
 
 import io
 import os.path
+import pipes
 import sys
 
 from pre_commit import output
@@ -68,7 +69,7 @@ def install(
 
         skip_on_missing_conf = 'true' if skip_on_missing_conf else 'false'
         contents = io.open(resource_filename('hook-tmpl')).read().format(
-            sys_executable=sys.executable,
+            sys_executable=pipes.quote(sys.executable),
             hook_type=hook_type,
             hook_specific=hook_specific_contents,
             config_file=runner.config_file,
diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
@@ -9,7 +9,7 @@ popd > /dev/null
 retv=0
 args=""
 
-ENV_PYTHON='{sys_executable}'
+ENV_PYTHON={sys_executable}
 SKIP_ON_MISSING_CONF={skip_on_missing_conf}
 
 which pre-commit >& /dev/null
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -4,6 +4,7 @@
 
 import io
 import os.path
+import pipes
 import re
 import shutil
 import subprocess
@@ -54,7 +55,7 @@ def test_install_pre_commit(tempdir_factory):
     pre_commit_contents = io.open(runner.pre_commit_path).read()
     pre_commit_script = resource_filename('hook-tmpl')
     expected_contents = io.open(pre_commit_script).read().format(
-        sys_executable=sys.executable,
+        sys_executable=pipes.quote(sys.executable),
         hook_type='pre-commit',
         hook_specific='',
         config_file=runner.config_file,
@@ -70,7 +71,7 @@ def test_install_pre_commit(tempdir_factory):
     pre_push_tmpl = resource_filename('pre-push-tmpl')
     pre_push_template_contents = io.open(pre_push_tmpl).read()
     expected_contents = io.open(pre_commit_script).read().format(
-        sys_executable=sys.executable,
+        sys_executable=pipes.quote(sys.executable),
         hook_type='pre-push',
         hook_specific=pre_push_template_contents,
         config_file=runner.config_file,
