dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-29 16:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: add cwd parameter to run_cmd for directory control

Browse source
This commit is contained in:
Paul Gauthier (aider) 2024-11-26 19:52:06 -08:00
parent 28d1feacf5
commit 1f2917681f
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
aider/run_cmd.py
View file

@ -8,12 +8,12 @@ import pexpect
import psutil import psutil
def run_cmd(command, verbose=False, error_print=None): def run_cmd(command, verbose=False, error_print=None, cwd=None):
try: try:
if sys.stdin.isatty() and hasattr(pexpect, "spawn") and platform.system() != "Windows": if sys.stdin.isatty() and hasattr(pexpect, "spawn") and platform.system() != "Windows":
return run_cmd_pexpect(command, verbose) return run_cmd_pexpect(command, verbose, cwd)
return run_cmd_subprocess(command, verbose) return run_cmd_subprocess(command, verbose, cwd)
except OSError as e: except OSError as e:
error_message = f"Error occurred while running command '{command}': {str(e)}" error_message = f"Error occurred while running command '{command}': {str(e)}"
if error_print is None: if error_print is None:
@ -39,7 +39,7 @@ def get_windows_parent_process_name():
return None return None
def run_cmd_subprocess(command, verbose=False): def run_cmd_subprocess(command, verbose=False, cwd=None):
if verbose: if verbose:
print("Using run_cmd_subprocess:", command) print("Using run_cmd_subprocess:", command)
@ -69,6 +69,7 @@ def run_cmd_subprocess(command, verbose=False):
errors="replace", errors="replace",
bufsize=0, # Set bufsize to 0 for unbuffered output bufsize=0, # Set bufsize to 0 for unbuffered output
universal_newlines=True, universal_newlines=True,
cwd=cwd,
) )
output = [] output = []
@ -85,7 +86,7 @@ def run_cmd_subprocess(command, verbose=False):
return 1, str(e) return 1, str(e)
def run_cmd_pexpect(command, verbose=False): def run_cmd_pexpect(command, verbose=False, cwd=None):
""" """
Run a shell command interactively using pexpect, capturing all output. Run a shell command interactively using pexpect, capturing all output.
@ -112,12 +113,12 @@ def run_cmd_pexpect(command, verbose=False):
# Use the shell from SHELL environment variable # Use the shell from SHELL environment variable
if verbose: if verbose:
print("Running pexpect.spawn with shell:", shell) print("Running pexpect.spawn with shell:", shell)
child = pexpect.spawn(shell, args=["-c", command], encoding="utf-8") child = pexpect.spawn(shell, args=["-c", command], encoding="utf-8", cwd=cwd)
else: else:
# Fall back to spawning the command directly # Fall back to spawning the command directly
if verbose: if verbose:
print("Running pexpect.spawn without shell.") print("Running pexpect.spawn without shell.")
child = pexpect.spawn(command, encoding="utf-8") child = pexpect.spawn(command, encoding="utf-8", cwd=cwd)
# Transfer control to the user, capturing output # Transfer control to the user, capturing output
child.interact(output_filter=output_callback) child.interact(output_filter=output_callback)