Merge pull request #82 from jbytheway/popen_shell_confusion

Fix popen call to run make

Author: Nick Yamane

compiledb/commands/make.py

@@ -7,7 +7,7 @@
 from sys import exit, stdout, stderr
 
 from compiledb import generate
-from compiledb.utils import popen
+from compiledb.utils import popen, cmd_join
 
 
 class AutoconfMockScript:
@@ -92,7 +92,7 @@ def command(ctx, make_cmd, make_args):
         cmd = [make_cmd, logging_mode_flags] + list(make_args)
         if mock_script.path:
             cmd.append("SHELL={}".format(mock_script.path))
-        pipe = popen(cmd, stdout=PIPE)
+        pipe = popen(cmd_join(cmd), stdout=PIPE)
         options.infile = pipe.stdout
         del args['verbose']
         done = generate(**args)

compiledb/utils.py

@@ -13,3 +13,12 @@ def popen(cmd, encoding='utf-8', **kwargs):
 
     def run_cmd(cmd, encoding='utf-8', **kwargs):
         return subprocess.check_output(cmd, **kwargs)
+
+try:
+    from shlex import quote as cmd_quote
+except ImportError:
+    from pipes import quote as cmd_quote
+
+
+def cmd_join(cmd):
+    return ' '.join(cmd_quote(s) for s in cmd)