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

Support tools with multiple architectures

Browse source
This commit is contained in:
2Shirt 2021-05-05 23:10:38 -06:00
parent acc3a4dccc
commit 4872a18e91
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,7 @@ def download_file(out_path, source_url, as_new=False, overwrite=False):
def download_tool(folder, name): def download_tool(folder, name):
"""Download tool.""" """Download tool."""
name_arch = f'{name}{ARCH}'
out_path = find_kit_dir('.bin').joinpath(f'{folder}/{name}.exe') out_path = find_kit_dir('.bin').joinpath(f'{folder}/{name}.exe')
up_to_date = False up_to_date = False
@ -77,9 +78,15 @@ def download_tool(folder, name):
LOG.info('Skip downloading up-to-date tool: %s', name) LOG.info('Skip downloading up-to-date tool: %s', name)
return return
# Get ARCH specific URL if available
if name_arch in SOURCES:
source_url = SOURCES[name_arch]
out_path = out_path.with_stem(name_arch)
else:
source_url = SOURCES[name]
# Download # Download
LOG.info('Downloading tool: %s', name) LOG.info('Downloading tool: %s', name)
source_url = SOURCES[name]
try: try:
new_file = download_file(out_path, source_url, as_new=True) new_file = download_file(out_path, source_url, as_new=True)
new_file.replace(out_path) new_file.replace(out_path)

7
scripts/wk/repairs/win.py
View file

@ -20,7 +20,7 @@ from wk.exe import (
wait_for_procs, wait_for_procs,
) )
from wk.io import delete_folder, rename_item from wk.io import delete_folder, rename_item
from wk.kit.tools import ARCH, download_tool, get_tool_path, run_tool from wk.kit.tools import download_tool, get_tool_path, run_tool
from wk.log import format_log_path, update_log_path from wk.log import format_log_path, update_log_path
from wk.os.win import ( from wk.os.win import (
reg_delete_value, reg_delete_value,
@ -817,10 +817,7 @@ def run_hitmanpro():
log_path = log_path.with_suffix('.xml') log_path = log_path.with_suffix('.xml')
log_path.parent.mkdir(parents=True, exist_ok=True) log_path.parent.mkdir(parents=True, exist_ok=True)
cmd_args = ['/scanonly', f'/log={log_path}'] cmd_args = ['/scanonly', f'/log={log_path}']
run_tool( run_tool('HitmanPro', 'HitmanPro', *cmd_args, download=True)
'HitmanPro', f'HitmanPro{"64" if ARCH=="64" else ""}',
*cmd_args, download=True,
)
def run_iobit_uninstaller(): def run_iobit_uninstaller():