From 1138347b2975b49c6fab91611eabfdecacb16fdb Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 20 Oct 2021 23:40:31 -0600 Subject: [PATCH] Add missing download in build_win --- scripts/wk/kit/build_win.py | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/scripts/wk/kit/build_win.py b/scripts/wk/kit/build_win.py index 475a0ab8..0d779091 100644 --- a/scripts/wk/kit/build_win.py +++ b/scripts/wk/kit/build_win.py @@ -239,12 +239,6 @@ def download_iobit_uninstaller(): delete_item(installer) -def download_macs_fan_control(): - """Download Macs Fan Control.""" - out_path = INSTALLERS_DIR.joinpath('Macs Fan Control.exe') - download_file(out_path, SOURCES['Macs Fan Control']) - - def download_libreoffice(): """Download LibreOffice.""" for arch in 32, 64: @@ -252,6 +246,20 @@ def download_libreoffice(): download_file(out_path, SOURCES[f'LibreOffice{arch}']) +def download_linux_reader(): + """Download Linux Reader.""" + installer = download_to_temp('LinuxReader.exe', SOURCES['Linux Reader']) + out_path = BIN_DIR.joinpath('LinuxReader') + extract_archive(installer, out_path, '-x!*PLUGINSDIR', '-x!Uninstall*') + delete_from_temp('LinuxReader.exe') + + +def download_macs_fan_control(): + """Download Macs Fan Control.""" + out_path = INSTALLERS_DIR.joinpath('Macs Fan Control.exe') + download_file(out_path, SOURCES['Macs Fan Control']) + + def download_neutron(): """Download Neutron.""" archive = download_to_temp('neutron.zip', SOURCES['Neutron']) @@ -520,12 +528,14 @@ def build_kit(): try_print.run('HWiNFO...', download_hwinfo) try_print.run('IOBit Uninstaller...', download_iobit_uninstaller) try_print.run('LibreOffice...', download_libreoffice) + try_print.run('Linux Reader...', download_linux_reader) try_print.run('Macs Fan Control...', download_macs_fan_control) try_print.run('Neutron...', download_neutron) try_print.run('Notepad++...', download_notepad_plus_plus) - try_print.run('OpenShell...', download_openshell) - try_print.run('PuTTY...', download_putty) try_print.run('O&O ShutUp10...', download_shutup10) + try_print.run('OpenShell...', download_openshell) + try_print.run('Prime95...', download_prime95) + try_print.run('PuTTY...', download_putty) try_print.run('Snappy Driver Installer...', download_snappy_driver_installer_origin) try_print.run('TestDisk...', download_testdisk) try_print.run('Windows Repair AIO...', download_windows_repair_aio)