From 1c6f0f5f28af623e94c57569839f557b4f8441d2 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 21 Oct 2023 18:43:54 -0700 Subject: [PATCH] Update tool sources --- scripts/wk/cfg/sources.py | 20 ++++++++++---------- setup/windows/build.ps1 | 4 ++-- setup/windows/sources.json | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/wk/cfg/sources.py b/scripts/wk/cfg/sources.py index 651ac7d3..d6905e22 100644 --- a/scripts/wk/cfg/sources.py +++ b/scripts/wk/cfg/sources.py @@ -25,8 +25,8 @@ SOURCES = { 'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe', # Build Kit - 'AIDA64': 'https://download.aida64.com/aida64engineer675.zip', - 'Adobe Reader DC': 'https://ardownload2.adobe.com/pub/adobe/reader/win/AcrobatDC/2300320201/AcroRdrDC2300320201_en_US.exe', + 'AIDA64': 'https://download.aida64.com/aida64engineer692.zip', + 'Adobe Reader DC': 'https://ardownload2.adobe.com/pub/adobe/reader/win/AcrobatDC/2300620360/AcroRdrDC2300620360_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', @@ -37,21 +37,21 @@ SOURCES = { 'ERUNT': 'http://www.aumha.org/downloads/erunt.zip', 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.1024.x86.zip', 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.1024.x64.zip', - 'FastCopy': 'https://download.softrepository.com/files/tools/FastCopy4.2.2_installer.exe', + 'FastCopy': 'https://github.com/FastCopyLab/FastCopyDist2/blob/main/FastCopy5.4.2_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_746.zip', - 'LibreOffice32': 'https://download.documentfoundation.org/libreoffice/stable/7.5.5/win/x86/LibreOffice_7.5.5_Win_x86.msi', - 'LibreOffice64': 'https://download.documentfoundation.org/libreoffice/stable/7.5.5/win/x86_64/LibreOffice_7.5.5_Win_x86-64.msi', + 'FurMark': 'https://geeks3d.com/dl/get/728', + 'HWiNFO': 'https://www.sac.sk/download/utildiag/hwi_764.zip', + 'LibreOffice32': 'https://download.documentfoundation.org/libreoffice/stable/7.6.2/win/x86/LibreOffice_7.6.2_Win_x86.msi', + 'LibreOffice64': 'https://download.documentfoundation.org/libreoffice/stable/7.6.2/win/x86_64/LibreOffice_7.6.2_Win_x86-64.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.5.4/npp.8.5.4.portable.minimalist.7z', - 'OpenShell': 'https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.170/OpenShellSetup_4_4_170.exe', + 'Notepad++': 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.8/npp.8.5.8.portable.minimalist.7z', + 'OpenShell': 'https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.191/OpenShellSetup_4_4_191.exe', 'PuTTY': 'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip', 'SDIO Torrent': 'https://www.glenn.delahoy.com/downloads/sdio/SDIO_Update.torrent', 'UninstallView32': 'https://www.nirsoft.net/utils/uninstallview.zip', 'UninstallView64': 'https://www.nirsoft.net/utils/uninstallview-x64.zip', - 'WizTree': 'https://diskanalyzer.com/files/wiztree_4_14_portable.zip', + 'WizTree': 'https://diskanalyzer.com/files/wiztree_4_15_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/setup/windows/build.ps1 b/setup/windows/build.ps1 index 752fabc7..35ecc6fa 100644 --- a/setup/windows/build.ps1 +++ b/setup/windows/build.ps1 @@ -100,10 +100,10 @@ if ($MyInvocation.InvocationName -ne ".") { # Python: psutil $DownloadPage = "https://pypi.org/project/psutil/" - $RegEx = "href=.*-cp36-abi3-win32.whl" + $RegEx = "href=.*-abi3-win32.whl" $Url = FindDynamicUrl $DownloadPage $RegEx DownloadFile -Path $Temp -Name "psutil32.whl" -Url $Url - $RegEx = "href=.*-cp36-abi3-win_amd64.whl" + $RegEx = "href=.*-abi3-win_amd64.whl" $Url = FindDynamicUrl $DownloadPage $RegEx DownloadFile -Path $Temp -Name "psutil64.whl" -Url $Url diff --git a/setup/windows/sources.json b/setup/windows/sources.json index 29e67152..48de2c98 100644 --- a/setup/windows/sources.json +++ b/setup/windows/sources.json @@ -1,6 +1,6 @@ { "7-Zip": "https://7-zip.org/a/7z2301.msi", - "ConEmu": "https://github.com/Maximus5/ConEmu/releases/download/v22.12.18/ConEmuPack.221218.7z", - "Python x32": "https://www.python.org/ftp/python/3.10.11/python-3.10.11-embed-win32.zip", - "Python x64": "https://www.python.org/ftp/python/3.10.11/python-3.10.11-embed-amd64.zip" + "ConEmu": "https://github.com/Maximus5/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z", + "Python x32": "https://www.python.org/ftp/python/3.12.0/python-3.12.0-embed-win32.zip", + "Python x64": "https://www.python.org/ftp/python/3.12.0/python-3.12.0-embed-amd64.zip" }