2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Support suffixes other than exe for kit tools

Browse source
This commit is contained in:
2Shirt 2021-09-15 16:38:11 -06:00
parent 90f2a37531
commit 38fd38f1ec
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/wk/kit/tools.py
View file

@ -62,10 +62,10 @@ def download_file(out_path, source_url, as_new=False, overwrite=False):
return out_path return out_path
def download_tool(folder, name): def download_tool(folder, name, suffix=None):
"""Download tool.""" """Download tool."""
name_arch = f'{name}{ARCH}' name_arch = f'{name}{ARCH}'
out_path = get_tool_path(folder, name, check=False) out_path = get_tool_path(folder, name, check=False, suffix=suffix)
up_to_date = False up_to_date = False
# Check if tool is up to date # Check if tool is up to date
@ -145,16 +145,18 @@ def find_kit_dir(name=None):
return cur_path return cur_path
def get_tool_path(folder, name, check=True): def get_tool_path(folder, name, check=True, suffix=None):
"""Get tool path, returns pathlib.Path""" """Get tool path, returns pathlib.Path"""
bin_dir = find_kit_dir('.bin') bin_dir = find_kit_dir('.bin')
if not suffix:
suffix = 'exe'
name_arch = f'{name}{ARCH}' name_arch = f'{name}{ARCH}'
# "Search" # "Search"
tool_path = bin_dir.joinpath(f'{folder}/{name_arch}.exe') tool_path = bin_dir.joinpath(f'{folder}/{name_arch}.{suffix}')
if not (tool_path.exists() or name_arch in SOURCES): if not (tool_path.exists() or name_arch in SOURCES):
# Use "default" path instead # Use "default" path instead
tool_path = tool_path.with_name(f'{name}.exe') tool_path = tool_path.with_name(f'{name}.{suffix}')
# Missing? # Missing?
if check and not tool_path.exists(): if check and not tool_path.exists():