Windows/detect.py: Simplify try_cmd function

This commit is contained in:
Alvin Wong 2024-07-25 23:14:51 +08:00
parent 108c603f91
commit 3a0837b74b
1 changed files with 5 additions and 15 deletions

View File

@ -21,10 +21,14 @@ def get_name():
def try_cmd(test, prefix, arch):
archs = ["x86_64", "x86_32", "arm64", "arm32"]
if arch:
archs = [arch]
for a in archs:
try:
out = subprocess.Popen(
get_mingw_bin_prefix(prefix, arch) + test,
get_mingw_bin_prefix(prefix, a) + test,
shell=True,
stderr=subprocess.PIPE,
stdout=subprocess.PIPE,
@ -34,20 +38,6 @@ def try_cmd(test, prefix, arch):
return True
except Exception:
pass
else:
for a in ["x86_64", "x86_32", "arm64", "arm32"]:
try:
out = subprocess.Popen(
get_mingw_bin_prefix(prefix, a) + test,
shell=True,
stderr=subprocess.PIPE,
stdout=subprocess.PIPE,
)
out.communicate()
if out.returncode == 0:
return True
except Exception:
pass
return False