Skip to content

fix(mkconcore): launch quoted tool paths correctly in Windows run.bat and debug.bat #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Siddhanthguptaa wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(mkconcore): launch quoted tool paths correctly in Windows run.bat and debug.bat #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mkconcore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,8 +1245,8 @@ def cleanup_script_files():
q_source = f'"{sourcecode}"'

if langext=="py":
frun.write('start /B /D '+q_container+" "+PYTHONWIN+" "+q_source+" >"+q_container+"\\concoreout.txt\n")
fdebug.write('start /D '+q_container+" cmd /K "+PYTHONWIN+" "+q_source+"\n")
frun.write('start "" /B /D '+q_container+" "+PYTHONWIN+" "+q_source+" >"+q_container+"\\concoreout.txt\n")
fdebug.write('start /D '+q_container+' cmd /K "'+PYTHONWIN+" "+q_source+'"\n')
elif langext=="cpp": #6/25/21
frun.write('cd '+q_container+'\n')
frun.write(CPPWIN+' '+q_source+'\n')
Expand Down Expand Up @@ -1281,11 +1281,11 @@ def cleanup_script_files():
elif langext=="m": #3/23/21
# Use q_source in Windows commands to ensure quoting consistency
if M_IS_OCTAVE:
frun.write('start /B /D '+q_container+" "+OCTAVEWIN+' -qf --eval "run('+q_source+')"'+" >"+q_container+"\\concoreout.txt\n")
fdebug.write('start /D '+q_container+" cmd /K " +OCTAVEWIN+' -qf --eval "run('+q_source+')"'+"\n")
frun.write('start "" /B /D '+q_container+" "+OCTAVEWIN+' -qf --eval "run('+q_source+')"'+" >"+q_container+"\\concoreout.txt\n")
fdebug.write('start /D '+q_container+' cmd /K "' +OCTAVEWIN+' -qf --eval "run('+q_source+')""'+"\n")
else: # 4/2/21
frun.write('start /B /D '+q_container+" "+MATLABWIN+' -batch "run('+q_source+')"'+" >"+q_container+"\\concoreout.txt\n")
fdebug.write('start /D '+q_container+" cmd /K " +MATLABWIN+' -batch "run('+q_source+')"'+"\n")
frun.write('start "" /B /D '+q_container+" "+MATLABWIN+' -batch "run('+q_source+')"'+" >"+q_container+"\\concoreout.txt\n")
fdebug.write('start /D '+q_container+' cmd /K "' +MATLABWIN+' -batch "run('+q_source+')""'+"\n")
else:
#use shlex.quote for POSIX systems
safe_container = shlex.quote(containername)
Expand Down
9 changes: 9 additions & 0 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,15 @@ def test_build_command_quotes_windows_tool_path_with_spaces(self):
'"C:\\Program Files\\Python313\\python.exe" "script.py"',
run_script,
)
self.assertIn(
'start "" /B /D "N1" "C:\\Program Files\\Python313\\python.exe" "script.py"',
run_script,
)
debug_script = Path("out/debug.bat").read_text()
self.assertIn(
'cmd /K ""C:\\Program Files\\Python313\\python.exe" "script.py""',
debug_script,
)

def test_build_command_nested_output_path(self):
with self.runner.isolated_filesystem(temp_dir=self.temp_dir):
Expand Down
Loading