mkconcore: quote tool executables with spaces in generated scripts

Author: Titas-Ghosh

mkconcore.py

@@ -111,7 +111,21 @@ def safe_relpath(value, context):
     if any(part in ("", "..") for part in normalized.split("/")):
         raise ValueError(f"Unsafe {context}: invalid path segment.")
     return normalized
-
+
+def _quote_executable_windows(value):
+    value = value.strip()
+    if value.startswith('"') and value.endswith('"'):
+        return value
+    return f'"{value}"'
+
+def _quote_executable_posix(value):
+    value = value.strip()
+    if (value.startswith("'") and value.endswith("'")) or (
+        value.startswith('"') and value.endswith('"')
+    ):
+        return value
+    return shlex.quote(value)
+
 MKCONCORE_VER = "22-09-18"
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -1136,14 +1150,32 @@ def cleanup_script_files():
         fbuild.write('cd ..'+"\n") 
     i=i+1
 
-#start running source in associated dirs (run and debug scripts)
-if concoretype=="posix":
-    fdebug.write('#!/bin/bash' + "\n")
-    frun.write('#!/bin/bash' + "\n")
-
-
-i=0
-for node in nodes_dict:
+#start running source in associated dirs (run and debug scripts)
+if concoretype=="posix":
+    fdebug.write('#!/bin/bash' + "\n")
+    frun.write('#!/bin/bash' + "\n")
+
+# Normalize tool executable quoting once, then reuse existing script templates.
+if concoretype == "windows":
+    PYTHONWIN = _quote_executable_windows(PYTHONWIN)
+    CPPWIN = _quote_executable_windows(CPPWIN)
+    VWIN = _quote_executable_windows(VWIN)
+    JAVACWIN = _quote_executable_windows(JAVACWIN)
+    JAVAWIN = _quote_executable_windows(JAVAWIN)
+    OCTAVEWIN = _quote_executable_windows(OCTAVEWIN)
+    MATLABWIN = _quote_executable_windows(MATLABWIN)
+else:
+    PYTHONEXE = _quote_executable_posix(PYTHONEXE)
+    CPPEXE = _quote_executable_posix(CPPEXE)
+    VEXE = _quote_executable_posix(VEXE)
+    JAVACEXE = _quote_executable_posix(JAVACEXE)
+    JAVAEXE = _quote_executable_posix(JAVAEXE)
+    OCTAVEEXE = _quote_executable_posix(OCTAVEEXE)
+    MATLABEXE = _quote_executable_posix(MATLABEXE)
+
+
+i=0
+for node in nodes_dict:
   containername,sourcecode = nodes_dict[node].split(':')
   if len(sourcecode)!=0:
       dockername,langext = sourcecode.rsplit(".", 1)

tests/test_cli.py

@@ -4,6 +4,7 @@
 import os
 import json
 from pathlib import Path
+from unittest.mock import patch
 from click.testing import CliRunner
 from concore_cli.cli import cli
 
@@ -185,6 +186,65 @@ def test_build_command_default_type(self):
             else:
                 self.assertTrue(Path("out/build").exists())
 
+    def test_build_command_quotes_posix_tool_path_with_spaces(self):
+        with self.runner.isolated_filesystem(temp_dir=self.temp_dir):
+            result = self.runner.invoke(cli, ["init", "test-project"])
+            self.assertEqual(result.exit_code, 0)
+
+            with patch.dict(
+                os.environ,
+                {"CONCORE_PYTHONEXE": "/opt/custom tools/python3"},
+                clear=False,
+            ):
+                result = self.runner.invoke(
+                    cli,
+                    [
+                        "build",
+                        "test-project/workflow.graphml",
+                        "--source",
+                        "test-project/src",
+                        "--output",
+                        "out",
+                        "--type",
+                        "posix",
+                    ],
+                )
+
+            self.assertEqual(result.exit_code, 0)
+            run_script = Path("out/run").read_text()
+            self.assertIn("'/opt/custom tools/python3' script.py", run_script)
+
+    def test_build_command_quotes_windows_tool_path_with_spaces(self):
+        with self.runner.isolated_filesystem(temp_dir=self.temp_dir):
+            result = self.runner.invoke(cli, ["init", "test-project"])
+            self.assertEqual(result.exit_code, 0)
+
+            with patch.dict(
+                os.environ,
+                {"CONCORE_PYTHONWIN": r"C:\Program Files\Python313\python.exe"},
+                clear=False,
+            ):
+                result = self.runner.invoke(
+                    cli,
+                    [
+                        "build",
+                        "test-project/workflow.graphml",
+                        "--source",
+                        "test-project/src",
+                        "--output",
+                        "out",
+                        "--type",
+                        "windows",
+                    ],
+                )
+
+            self.assertEqual(result.exit_code, 0)
+            run_script = Path("out/run.bat").read_text()
+            self.assertIn(
+                '"C:\\Program Files\\Python313\\python.exe" "script.py"',
+                run_script,
+            )
+
     def test_build_command_nested_output_path(self):
         with self.runner.isolated_filesystem(temp_dir=self.temp_dir):
             result = self.runner.invoke(cli, ["init", "test-project"])