diff --git a/scripts/wk/cfg/sources.py b/scripts/wk/cfg/sources.py index a4307ced..d9b7c577 100644 --- a/scripts/wk/cfg/sources.py +++ b/scripts/wk/cfg/sources.py @@ -29,12 +29,12 @@ SOURCES = { 'VCRedist_2012_x64': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe', 'VCRedist_2013_x32': 'https://aka.ms/highdpimfc2013x86enu', 'VCRedist_2013_x64': 'https://aka.ms/highdpimfc2013x64enu', - 'VCRedist_2019_x32': 'https://aka.ms/vs/16/release/vc_redist.x86.exe', - 'VCRedist_2019_x64': 'https://aka.ms/vs/16/release/vc_redist.x64.exe', + 'VCRedist_2022_x32': 'https://aka.ms/vs/17/release/vc_redist.x86.exe', + 'VCRedist_2022_x64': 'https://aka.ms/vs/17/release/vc_redist.x64.exe', # Build Kit - 'AIDA64': 'https://download.aida64.com/aida64engineer660.zip', - 'Adobe Reader DC': 'https://ardownload2.adobe.com/pub/adobe/reader/win/AcrobatDC/2101120039/AcroRdrDC2101120039_en_US.exe', + 'AIDA64': 'https://download.aida64.com/aida64engineer675.zip', + 'Adobe Reader DC': 'https://ardownload2.adobe.com/pub/adobe/reader/win/AcrobatDC/2200220191/AcroRdrDC2200220191_en_US.exe', 'Aria2': 'https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0-win-32bit-build1.zip', 'Autoruns32': 'http://live.sysinternals.com/Autoruns.exe', 'Autoruns64': 'http://live.sysinternals.com/Autoruns64.exe', @@ -42,23 +42,22 @@ SOURCES = { 'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip', 'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip', 'ERUNT': 'http://www.aumha.org/downloads/erunt.zip', - 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.1009.x86.en-US.zip', - 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.1009.x64.en-US.zip', - 'FastCopy': 'https://ftp.vector.co.jp/73/10/2323/FastCopy392_installer.exe', - 'Fluent-Metro': 'https://github.com/bonzibudd/Fluent-Metro/releases/download/v1.5.2/Fluent-Metro_1.5.2.zip', - 'FurMark': 'https://geeks3d.com/dl/get/569', - 'HWiNFO': 'https://www.sac.sk/download/utildiag/hwi_712.zip', 'IOBit Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe', - 'LibreOffice32': 'https://download.documentfoundation.org/libreoffice/stable/7.3.0/win/x86/LibreOffice_7.3.0_Win_x86.msi', - 'LibreOffice64': 'https://download.documentfoundation.org/libreoffice/stable/7.3.0/win/x86_64/LibreOffice_7.3.0_Win_x64.msi', + 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.1020.x86.zip', + 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.1020.x64.zip', + 'FastCopy': 'https://ftp.vector.co.jp/75/32/2323/FastCopy4.2.0_installer.exe', + 'Fluent-Metro': 'https://github.com/bonzibudd/Fluent-Metro/releases/download/v1.5.3/Fluent-Metro_1.5.3.zip', + 'FurMark': 'https://geeks3d.com/dl/get/696', + 'HWiNFO': 'https://www.sac.sk/download/utildiag/hwi_730.zip', + 'LibreOffice32': 'https://download.documentfoundation.org/libreoffice/stable/7.3.6/win/x86/LibreOffice_7.3.6_Win_x86.msi', + 'LibreOffice64': 'https://download.documentfoundation.org/libreoffice/stable/7.3.6/win/x86_64/LibreOffice_7.3.6_Win_x64.msi', 'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe', 'Neutron': 'http://keir.net/download/neutron.zip', 'Notepad++': 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.1.9.3/npp.8.1.9.3.portable.minimalist.7z', - 'OpenShell': 'https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.160/OpenShellSetup_4_4_160.exe', + 'OpenShell': 'https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.170/OpenShellSetup_4_4_170.exe', 'PuTTY': 'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip', - 'SDIO Torrent': 'https://www.snappy-driver-installer.org/downloads/SDIO_Update.torrent', - 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.2-WIP.win.zip', - 'WizTree': 'https://diskanalyzer.com/files/wiztree_4_07_portable.zip', + 'SDIO Torrent': 'https://www.glenn.delahoy.com/downloads/sdio/SDIO_Update.torrent', + 'WizTree': 'https://diskanalyzer.com/files/wiztree_4_10_portable.zip', 'XMPlay': 'https://support.xmplay.com/files/20/xmplay385.zip?v=47090', 'XMPlay 7z': 'https://support.xmplay.com/files/16/xmp-7z.zip?v=800962', 'XMPlay Game': 'https://support.xmplay.com/files/12/xmp-gme.zip?v=515637', diff --git a/scripts/wk/kit/build_win.py b/scripts/wk/kit/build_win.py index 595efeac..01b09bb1 100644 --- a/scripts/wk/kit/build_win.py +++ b/scripts/wk/kit/build_win.py @@ -251,6 +251,7 @@ def download_libreoffice(): for arch in 32, 64: out_path = INSTALLERS_DIR.joinpath(f'LibreOffice{arch}.msi') download_file(out_path, SOURCES[f'LibreOffice{arch}']) + sleep(1) def download_neutron(): @@ -357,15 +358,6 @@ def download_snappy_driver_installer_origin(): delete_from_temp('fake.7z') -def download_testdisk(): - """Download TestDisk.""" - archive = download_to_temp('testdisk_wip.zip', SOURCES['TestDisk']) - out_path = BIN_DIR.joinpath('TestDisk') - tmp_path = TMP_DIR.joinpath('TestDisk') - extract_archive(archive, tmp_path) - rename_item(tmp_path.joinpath('testdisk-7.2-WIP'), out_path) - delete_from_temp('TestDisk') - delete_from_temp('testdisk_wip.zip') def download_wiztree(): @@ -491,7 +483,6 @@ def build_kit(): try_print.run('OpenShell...', download_openshell) 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('WizTree...', download_wiztree) try_print.run('XMPlay...', download_xmplay) try_print.run('XMPlay Music...', download_xmplay_music) diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py index cb50e3ca..c399b0c6 100644 --- a/scripts/wk/setup/win.py +++ b/scripts/wk/setup/win.py @@ -812,7 +812,7 @@ def install_software_bundle(): def install_vcredists(): """Install latest supported Visual C++ runtimes.""" - for year in (2012, 2013, 2019): + for year in (2012, 2013, 2022): cmd_args = ['/install', '/passive', '/norestart'] if year == 2012: cmd_args.pop(0)