From c608ed3af3d211da81278347e562aab2d99bebff Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Fri, 15 Oct 2021 00:26:36 -0600 Subject: [PATCH] Fix bugs --- scripts/wk/cfg/sources.py | 2 +- scripts/wk/kit/build_win.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/wk/cfg/sources.py b/scripts/wk/cfg/sources.py index bcf65145..2fd0e2fa 100644 --- a/scripts/wk/cfg/sources.py +++ b/scripts/wk/cfg/sources.py @@ -67,7 +67,7 @@ SOURCES = { 'ShutUp10': 'https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe', 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.2-WIP.win.zip', 'Windows Repair AIO': 'http://www.tweaking.com/files/setups/tweaking.com_windows_repair_aio.zip', - 'WinSCP': 'https://cdn.winscp.net/files/WinSCP-5.19.3-Portable.zip?secure=iCBRi6uUbZhemz82zxjEqw==,1634262014', + 'WinSCP': 'https://sourceforge.net/projects/winscp/files/WinSCP/5.19.3/WinSCP-5.19.3-Portable.zip/download', 'WizTree': 'https://wiztreefree.com/files/wiztree_3_39_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', diff --git a/scripts/wk/kit/build_win.py b/scripts/wk/kit/build_win.py index b2170eb1..3add5eae 100644 --- a/scripts/wk/kit/build_win.py +++ b/scripts/wk/kit/build_win.py @@ -381,7 +381,12 @@ def download_windows_repair_aio(): out_path = BIN_DIR.joinpath('WinRepairAIO') tmp_path = TMP_DIR.joinpath('WinRepairAIO') extract_archive(archive, tmp_path) - rename_item(tmp_path.joinpath('Tweaking.com - Windows Repair'), out_path) + for item in tmp_path.joinpath('Tweaking.com - Windows Repair').iterdir(): + try: + rename_item(item, out_path.joinpath(item.name)) + except FileExistsError: + # Ignore and use our defaults + pass delete_from_temp('WinRepairAIO') delete_from_temp('winrepairaio.zip')