From 0214730c9afaf732b3571f3f63416fea9f98a65c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 9 Apr 2025 19:59:05 -0400 Subject: launcher: switch command quoting to shlex.quote Minor fix, but just in case, provides properly quoted commands for people to copy & paste. Change-Id: Ia9fce5c0df9f51cbed9d49861adcf6821251e46f Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/466821 Tested-by: Mike Frysinger Commit-Queue: Mike Frysinger Reviewed-by: Gavin Mak --- release/util.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'release/util.py') diff --git a/release/util.py b/release/util.py index df7a5638..c839b872 100644 --- a/release/util.py +++ b/release/util.py @@ -16,6 +16,7 @@ import os import re +import shlex import subprocess import sys @@ -35,12 +36,7 @@ KEYID_ECC = "E1F9040D7A3F6DAFAC897CD3D3B95DA243E48A39" def cmdstr(cmd): """Get a nicely quoted shell command.""" - ret = [] - for arg in cmd: - if not re.match(r"^[a-zA-Z0-9/_.=-]+$", arg): - arg = f'"{arg}"' - ret.append(arg) - return " ".join(ret) + return " ".join(shlex.quote(x) for x in cmd) def run(opts, cmd, check=True, **kwargs): -- cgit v1.2.3-54-g00ecf