From f842cec65b6ddce6e31468894338223fe4cf7817 Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Mon, 20 Nov 2017 23:11:07 -0800 Subject: [PATCH] Always more downloads --- .bin/Scripts/functions/setup.py | 32 +++---- .bin/Scripts/functions/update.py | 135 +++++++++++++++++++++++++---- .bin/Scripts/settings/launchers.py | 11 +++ .bin/Scripts/settings/sources.py | 74 +++++++++++----- .bin/Scripts/update_kit.py | 13 +-- .gitignore | 2 + 6 files changed, 208 insertions(+), 59 deletions(-) diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py index cc81e892..7d7722fd 100644 --- a/.bin/Scripts/functions/setup.py +++ b/.bin/Scripts/functions/setup.py @@ -85,35 +85,35 @@ SETTINGS_GOOGLE_CHROME = { }, } VCR_REDISTS = [ - {'Name': 'Visual C++ 2005 SP1 x32...', - 'Cmd': ['msiexec', '/i', r'2005sp1\x86\vcredist.msi', - '/qb!', '/norestart']}, - {'Name': 'Visual C++ 2005 SP1 x64...', - 'Cmd': ['msiexec', '/i', r'2005sp1\x64\vcredist.msi', - '/qb!', '/norestart']}, {'Name': 'Visual C++ 2008 SP1 x32...', - 'Cmd': [r'2008sp1\vcredist_x86.exe', '/qb! /norestart']}, + 'Cmd': [r'2008sp1\x32\vcredist.exe', '/qb! /norestart']}, {'Name': 'Visual C++ 2008 SP1 x64...', - 'Cmd': [r'2008sp1\vcredist_x64.exe', '/qb! /norestart']}, + 'Cmd': [r'2008sp1\x64\vcredist.exe', '/qb! /norestart']}, {'Name': 'Visual C++ 2010 x32...', - 'Cmd': [r'2010\vcredist_x86.exe', '/passive', '/norestart']}, + 'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']}, {'Name': 'Visual C++ 2010 x64...', - 'Cmd': [r'2010\vcredist_x64.exe', '/passive', '/norestart']}, + 'Cmd': [r'2010sp1\x64\vcredist.exe', '/passive', '/norestart']}, {'Name': 'Visual C++ 2012 Update 4 x32...', - 'Cmd': [r'2012u4\vcredist_x86.exe', '/passive', '/norestart']}, + 'Cmd': [r'2012u4\x32\vcredist.exe', '/passive', '/norestart']}, {'Name': 'Visual C++ 2012 Update 4 x64...', - 'Cmd': [r'2012u4\vcredist_x64.exe', '/passive', '/norestart']}, + 'Cmd': [r'2012u4\x64\vcredist.exe', '/passive', '/norestart']}, {'Name': 'Visual C++ 2013 x32...', - 'Cmd': [r'2013\vcredist_x86.exe', '/install', + 'Cmd': [r'2013\x32\vcredist.exe', '/install', '/passive', '/norestart']}, {'Name': 'Visual C++ 2013 x64...', - 'Cmd': [r'2013\vcredist_x64.exe', '/install', + 'Cmd': [r'2013\x64\vcredist.exe', '/install', '/passive', '/norestart']}, {'Name': 'Visual C++ 2015 Update 3 x32...', - 'Cmd': [r'2015u3\vc_redist.x86.exe', '/install', + 'Cmd': [r'2015u3\x32\vcredist.exe', '/install', '/passive', '/norestart']}, {'Name': 'Visual C++ 2015 Update 3 x64...', - 'Cmd': [r'2015u3\vc_redist.x64.exe', '/install', + 'Cmd': [r'2015u3\x64\vcredist.exe', '/install', + '/passive', '/norestart']}] + {'Name': 'Visual C++ 2017 x32...', + 'Cmd': [r'2017\x32\vcredist.exe', '/install', + '/passive', '/norestart']}, + {'Name': 'Visual C++ 2017 x64...', + 'Cmd': [r'2017\x64\vcredist.exe', '/install', '/passive', '/norestart']}] def config_classicstart(): diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index 433d7861..ef83f2c5 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -140,6 +140,29 @@ def update_fastcopy(): remove_from_temp('FastCopy32.zip') remove_from_temp('FastCopy64.zip') +def update_wimlib(): + # Stop running processes + kill_process('wimlib-imagex.exe') + + # Remove existing folders + remove_from_kit('wimlib') + + # Download + download_to_temp('wimlib32.zip', SOURCE_URLS['wimlib32']) + download_to_temp('wimlib64.zip', SOURCE_URLS['wimlib64']) + + # Extract + extract_generic( + r'{}\wimlib32.zip'.format(global_vars['TmpDir']), + r'{}\wimlib\x32'.format(global_vars['CBinDir'])) + extract_generic( + r'{}\wimlib64.zip'.format(global_vars['TmpDir']), + r'{}\wimlib\x64'.format(global_vars['CBinDir'])) + + # Cleanup + remove_from_temp('wimlib32.zip') + remove_from_temp('wimlib64.zip') + def update_xyplorer(): # Stop running processes kill_process('XYplorerFree.exe') @@ -244,23 +267,6 @@ def update_bluescreenview(): remove_from_temp('bluescreenview32.zip') remove_from_temp('bluescreenview64.zip') -def update_du(): - # Stop running processes - kill_process('du.exe') - kill_process('du64.exe') - - # Remove existing folders - remove_from_kit('Du') - - # Download - download_to_temp('du.zip', SOURCE_URLS['Du']) - - # Extract files - extract_temp_to_cbin('du.zip', 'Du') - - # Cleanup - remove_from_temp('du.zip') - def update_erunt(): # Stop running processes kill_process('ERUNT.EXE') @@ -469,8 +475,71 @@ def update_office(): # Cleanup remove_from_temp('odt2013.exe') remove_from_temp('odt2016.exe') + +def update_classic_start_skin(): + # Remove existing folders + remove_from_kit('ClassicStartSkin') + # Download + download_generic( + r'{}\ClassicStartSkin'.format(global_vars['CBinDir']), + 'Metro-Win10-Black.skin7', + SOURCE_URLS['ClassicStartSkin']) + +def update_vcredists(): + # Remove existing folders + remove_from_kit('_vcredists') + + # Prep + dest = r'{}\_vcredists'.format(global_vars['CBinDir']) + include_path = r'{}\_include\_vcredists'.format(global_vars['CBinDir']) + if os.path.exists(include_path): + shutil.copytree(include_path, dest) + + # Download + for year in VCREDIST_SOURCES.keys(): + for bit in ['32', '64']: + dest = r'{}\_vcredists\{}\x{}'.format( + global_vars['CBinDir'], year, bit) + download_generic( + dest, + 'vcredist.exe', + VCREDIST_SOURCES[year][bit]) + ## Misc ## +def update_caffeine(): + # Stop running processes + kill_process('caffeine.exe') + + # Remove existing folders + remove_from_kit('Caffeine') + + # Download + download_to_temp('caffeine.zip', SOURCE_URLS['Caffeine']) + + # Extract files + extract_temp_to_cbin('caffeine.zip', 'Caffeine') + + # Cleanup + remove_from_temp('caffeine.zip') + +def update_du(): + # Stop running processes + kill_process('du.exe') + kill_process('du64.exe') + + # Remove existing folders + remove_from_kit('Du') + + # Download + download_to_temp('du.zip', SOURCE_URLS['Du']) + + # Extract files + extract_temp_to_cbin('du.zip', 'Du') + + # Cleanup + remove_from_temp('du.zip') + def update_everything(): # Stop running processes for exe in ['Everything.exe', 'Everything64.exe']: @@ -494,6 +563,22 @@ def update_everything(): remove_from_temp('everything32.zip') remove_from_temp('everything64.zip') +def update_firefox_ublock_origin(): + # Remove existing folders + remove_from_kit('FirefoxExtensions') + + # Download + download_to_temp('ff-uBO.xpi', SOURCE_URLS['Firefox uBO']) + + # Extract files + extract_generic( + r'{}\ff-uBO.xpi'.format(global_vars['TmpDir']), + r'{}\FirefoxExtensions\uBlock0@raymondhill.net'.format( + global_vars['CBinDir'])) + + # Cleanup + remove_from_temp('ff-uBO.xpi') + def update_notepadplusplus(): # Stop running processes kill_process('notepadplusplus.exe') @@ -514,6 +599,22 @@ def update_notepadplusplus(): # Cleanup remove_from_temp('npp.7z') +def update_putty(): + # Stop running processes + kill_process('PUTTY.EXE') + + # Remove existing folders + remove_from_kit('PuTTY') + + # Download + download_to_temp('putty.zip', SOURCE_URLS['PuTTY']) + + # Extract files + extract_temp_to_cbin('putty.zip', 'PuTTY') + + # Cleanup + remove_from_temp('putty.zip') + def update_treesizefree(): # Stop running processes kill_process('TreeSizeFree.exe') diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py index 17e58865..a698fb1b 100644 --- a/.bin/Scripts/settings/launchers.py +++ b/.bin/Scripts/settings/launchers.py @@ -676,6 +676,17 @@ LAUNCHERS = { 'L_NCMD': 'True', 'L_WAIT': '', }, + 'PuTTY': { + 'L_TYPE': 'Program', + 'L_PATH': 'PuTTY', + 'L_ITEM': 'PUTTY.EXE', + 'L_ARGS': '', + 'L_7ZIP': '', + 'L_CHCK': 'True', + 'L_ELEV': '', + 'L_NCMD': 'True', + 'L_WAIT': '', + }, 'TreeSizeFree-Portable': { 'L_TYPE': 'Program', 'L_PATH': 'TreeSizeFree', diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py index 14b9bb77..41b7c493 100644 --- a/.bin/Scripts/settings/sources.py +++ b/.bin/Scripts/settings/sources.py @@ -1,46 +1,78 @@ # Wizard Kit: Settings - Sources SOURCE_URLS = { - 'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z', - 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip', - 'FastCopy32': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip', - 'FastCopy64': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip', - 'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip', 'AIDA64': 'http://download.aida64.com/aida64engineer592.zip', + 'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1800920044/AcroRdrDC1800920044_en_US.exe', + 'AdwCleaner': 'https://toolslib.net/downloads/finish/1-adwcleaner/', 'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip', 'BleachBit': 'https://download.bleachbit.org/beta/1.17/BleachBit-1.17-portable.zip', - 'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip', 'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip', 'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip', + 'Caffeine': 'http://www.zhornsoftware.co.uk/caffeine/caffeine.zip', + 'ClassicStartSkin': 'http://www.classicshell.net/forum/download/file.php?id=3001&sid=9a195960d98fd754867dcb63d9315335', 'Du': 'https://download.sysinternals.com/files/DU.zip', 'ERUNT': 'http://www.aumha.org/downloads/erunt.zip', - 'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe', - 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe', + 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.877.x86.zip', + 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.877.x64.zip', + 'FastCopy32': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip', + 'FastCopy64': 'http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip', + 'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/764482/ublock_origin-1.14.18-an+fx.xpi?src=dp-btn-primary', 'HWiNFO32': 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip', 'HWiNFO64': 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip', + 'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe', + 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe', + 'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.0.2.49.paf.exe', + 'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe', + 'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe', + 'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.1/npp.7.5.1.bin.minimalist.7z', 'Office Deployment Tool 2013': 'https://download.microsoft.com/download/6/2/3/6230F7A2-D8A9-478B-AC5C-57091B632FCF/officedeploymenttool_x86_4827-1000.exe', 'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_8529.3600.exe', 'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip', 'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip', - 'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe', - 'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe', - 'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip', - 'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent', + 'PuTTY': 'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip', + 'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/', 'SDIO Themes': 'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip', - 'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1800920044/AcroRdrDC1800920044_en_US.exe', - 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.877.x86.zip', - 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.877.x64.zip', + 'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent', + 'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe', + 'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe', + 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip', 'TreeSizeFree-Portable': 'https://www.jam-software.com/treesize_free/TreeSizeFree-Portable.zip', - 'XMPlay': 'http://support.xmplay.com/files/20/xmplay3823.zip?v=115916', + 'wimlib32': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-i686-bin.zip', + 'wimlib64': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip', + 'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip', 'XMPlay 7z': 'http://support.xmplay.com/files/16/xmp-7z.zip?v=800962', 'XMPlay Game': 'http://support.xmplay.com/files/12/xmp-gme.zip?v=515637', 'XMPlay RAR': 'http://support.xmplay.com/files/16/xmp-rar.zip?v=409646', 'XMPlay WAModern': 'http://support.xmplay.com/files/10/WAModern.zip?v=207099', - 'AdwCleaner': 'https://toolslib.net/downloads/finish/1-adwcleaner/', - 'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe', - 'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/', - 'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe', - 'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.0.2.49.paf.exe', + 'XMPlay': 'http://support.xmplay.com/files/20/xmplay3823.zip?v=115916', + 'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip', + 'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip', + } +VCREDIST_SOURCES = { + '2008sp1': { + '32': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe', + '64': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe', + }, + '2010sp1': { + '32': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe', + '64': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe', + }, + '2012u4': { + '32': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe', + '64': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe', + }, + '2013': { + '32': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe', + '64': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe', + }, + '2015u3': { + '32': 'https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x86.exe', + '64': 'https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x64.exe', + }, + '2017': { + '32': 'https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe', + '64': 'https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe', + }, } NINITE_SOURCES = { 'Bundles': { diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index b41599bb..3d9c2f61 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -21,17 +21,14 @@ if __name__ == '__main__': print_info('Updating Kit Tools') ## Download ## - # .bin (Not compressed) - print_info('\n.bin') - try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results) - try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results) - # Data Recovery print_info('\nData Recovery') try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results) # Data Transfers print_info('\nData Transfers') + try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results) + try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results) try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results) # Diagnostics @@ -42,6 +39,7 @@ if __name__ == '__main__': try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results) try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results) try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results) + try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results) try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results) # Drivers @@ -55,6 +53,7 @@ if __name__ == '__main__': print_info('\nInstallers') try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results) try_and_print(message='MS Office...', function=update_office, other_results=other_results) + try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results) print_info('\nNinite') for section in sorted(NINITE_SOURCES.keys()): print_success(' {}'.format(section)) @@ -68,7 +67,11 @@ if __name__ == '__main__': # Misc print_info('\nMisc') try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results) + try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results) + try_and_print(message='Du...', function=update_du, other_results=other_results) try_and_print(message='Everything...', function=update_everything, other_results=other_results) + try_and_print(message='PuTTY...', function=update_putty, other_results=other_results) + try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results) try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results) try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results) diff --git a/.gitignore b/.gitignore index 1476f24d..12624d10 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ .cbin/Caffeine/ .cbin/Du/ .cbin/Everything/ +.cbin/FirefoxExtensions/ .cbin/IObitUninstallerPortable/ .cbin/ProduKey/ .cbin/TestDisk/ @@ -31,3 +32,4 @@ .cbin/XYplorerFree/ .cbin/_Drivers/ .cbin/_Office/ +.cbin/_vcredists/