Skip to content

refactor: reduce subprocess shell=True usage with Windows fallback #659

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
ishan372or wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor: reduce subprocess shell=True usage with Windows fallback #659

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3137880
refactor: reduce subprocess shell=True usage with Windows fallback
ishan372or Dec 22, 2025
de8bfa8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 22, 2025
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
57 changes: 47 additions & 10 deletions datashuttle/utils/rclone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,38 @@ def call_rclone(command: str, pipe_std: bool = False) -> CompletedProcess:
subprocess.CompletedProcess with `stdout` and `stderr` attributes.

"""
command = "rclone " + command
if pipe_std:
output = subprocess.run(
command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True
)
else:
output = subprocess.run(command, shell=True)
cmd = ["rclone "] + shlex.split(command)

try:
if pipe_std:
output = subprocess.run(
cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=False,
)
else:
output = subprocess.run(
cmd,
shell=False,
)
except FileNotFoundError:
if platform.system() == "Windows":
full_cmd = "rclone " + command
if pipe_std:
output = subprocess.run(
full_cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=True,
)
else:
output = subprocess.run(
full_cmd,
shell=True,
)
else:
raise

if output.returncode != 0:
prompt_rclone_download_if_does_not_exist()
Expand Down Expand Up @@ -396,13 +421,25 @@ def check_rclone_with_default_call() -> bool:
"""
try:
output = subprocess.run(
"rclone -h",
["rclone", "-h"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=True,
shell=False,
)
except FileNotFoundError:
return False
if platform.system() == "Windows":
try:
output = subprocess.run(
"rclone -h",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=True,
)
except FileNotFoundError:
return False
else:
return False

return True if output.returncode == 0 else False


Expand Down