diff --git a/scripts/wk/cfg/sources.py b/scripts/wk/cfg/sources.py index 88730320..bd807720 100644 --- a/scripts/wk/cfg/sources.py +++ b/scripts/wk/cfg/sources.py @@ -22,12 +22,11 @@ SOURCES = { 'RKill': 'https://download.bleepingcomputer.com/grinler/rkill.exe', 'RegDelNull': 'https://live.sysinternals.com/RegDelNull.exe', 'RegDelNull64': 'https://live.sysinternals.com/RegDelNull64.exe', - 'Software Bundle': 'https://ninite.com/.net4.8-7zip-chrome-edge-vlc/ninite.exe', '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/2200220191/AcroRdrDC2200220191_en_US.exe', + 'Adobe Reader DC': 'https://ardownload2.adobe.com/pub/adobe/reader/win/AcrobatDC/2300320201/AcroRdrDC2300320201_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', @@ -35,28 +34,28 @@ 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.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', + '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', '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', + 'HWiNFO': 'https://www.sac.sk/download/utildiag/hwi_746.zip', + 'LibreOffice32': 'https://download.documentfoundation.org/libreoffice/stable/7.5.4/win/x86/LibreOffice_7.5.4_Win_x86.msi', + 'LibreOffice64': 'https://download.documentfoundation.org/libreoffice/stable/7.5.4/win/x86_64/LibreOffice_7.5.4_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', + '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', '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_10_portable.zip', + 'WizTree': 'https://diskanalyzer.com/files/wiztree_4_14_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', 'XMPlay RAR': 'https://support.xmplay.com/files/16/xmp-rar.zip?v=409646', - 'XMPlay Innocuous': 'https://support.xmplay.com/files/10/Innocuous%20(v1.5).zip?v=155959', + 'XMPlay Innocuous': 'https://support.xmplay.com/files/10/Innocuous%20(v1.7).zip?v=645281', } diff --git a/scripts/wk/kit/build_win.py b/scripts/wk/kit/build_win.py index cace9c69..82f71299 100644 --- a/scripts/wk/kit/build_win.py +++ b/scripts/wk/kit/build_win.py @@ -237,7 +237,11 @@ def download_libreoffice() -> None: """Download LibreOffice.""" for arch in 32, 64: out_path = INSTALLERS_DIR.joinpath(f'LibreOffice{arch}.msi') - download_file(out_path, SOURCES[f'LibreOffice{arch}']) + download_file( + out_path, + SOURCES[f'LibreOffice{arch}'], + referer='https://www.libreoffice.org/download/download-libreoffice/', + ) ui.sleep(1) @@ -383,7 +387,7 @@ def download_xmplay() -> None: args = [archive, BIN_DIR.joinpath('XMPlay/plugins')] if archive.name == 'Innocuous.zip': args.append( - 'Innocuous (v1.5)/Innocuous (Hue Shifted)/' + 'Innocuous (v1.7)/Innocuous (Hue Shifted)/' 'Innocuous (Dark Skies - Purple-80) [L1].xmpskin' ) extract_archive(*args, mode='e') diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py index 42dc6cbe..e0894e01 100644 --- a/scripts/wk/setup/win.py +++ b/scripts/wk/setup/win.py @@ -410,7 +410,7 @@ def auto_config_browsers() -> None: 'Set default browser...', set_default_browser, msg_good='STARTED', ) print(prompt, end='', flush=True) - ui.pause('') + ui.pause(' ') # Move cursor to beginning of the previous line and clear prompt print(f'\033[F\r{" "*len(prompt)}\r', end='', flush=True) diff --git a/setup/windows/build.ps1 b/setup/windows/build.ps1 index b64c1bb0..752fabc7 100644 --- a/setup/windows/build.ps1 +++ b/setup/windows/build.ps1 @@ -86,7 +86,7 @@ if ($MyInvocation.InvocationName -ne ".") { $DownloadErrors = 0 # 7-Zip - DownloadFile -Path $Temp -Name "7z-installer.msi" -Url $Sources.'7-Zip Installer' + DownloadFile -Path $Temp -Name "7z-installer.msi" -Url $Sources.'7-Zip' # ConEmu DownloadFile -Path $Temp -Name "ConEmuPack.7z" -Url $Sources.'ConEmu' diff --git a/setup/windows/sources.json b/setup/windows/sources.json index 43b9b249..29e67152 100644 --- a/setup/windows/sources.json +++ b/setup/windows/sources.json @@ -1,7 +1,6 @@ { - "7-Zip Extra": "https://7-zip.org/a/7z2201-extra.7z", - "7-Zip Installer": "https://7-zip.org/a/7z2201.msi", - "ConEmu": "https://github.com/Maximus5/ConEmu/releases/download/v22.08.07/ConEmuPack.220807.7z", - "Python x32": "https://www.python.org/ftp/python/3.10.7/python-3.10.7-embed-win32.zip", - "Python x64": "https://www.python.org/ftp/python/3.10.7/python-3.10.7-embed-amd64.zip" + "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" }