diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index f0d1ed4f..388611c6 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -313,27 +313,27 @@ def update_bleachbit(): kill_process('bleachbit.exe') # Remove existing folders - remove_from_kit('BleachBit-Portable') + remove_from_kit('BleachBit') # Download download_to_temp('bleachbit.zip', SOURCE_URLS['BleachBit']) download_to_temp('Winapp2.zip', SOURCE_URLS['Winapp2']) # Extract files - extract_temp_to_cbin('bleachbit.zip', 'BleachBit-Portable') + extract_temp_to_cbin('bleachbit.zip', 'BleachBit') extract_generic( r'{}\Winapp2.zip'.format(global_vars['TmpDir']), - r'{}\BleachBit-Portable\cleaners'.format(global_vars['CBinDir']), + r'{}\BleachBit\cleaners'.format(global_vars['CBinDir']), mode='e', sz_args=[r'Winapp2-master\Non-CCleaner\Winapp2.ini']) # Move files into place - dest = r'{}\BleachBit-Portable'.format(global_vars['CBinDir']) - for item in os.scandir(r'{}\BleachBit-Portable'.format(dest)): + dest = r'{}\BleachBit'.format(global_vars['CBinDir']) + for item in os.scandir(r'{}\BleachBit'.format(dest)): dest_item = '{}\{}'.format(dest, item.name) if not os.path.exists(dest_item): shutil.move(item.path, dest_item) shutil.rmtree( - r'{}\BleachBit-Portable\BleachBit-Portable'.format(global_vars['CBinDir'])) + r'{}\BleachBit\BleachBit'.format(global_vars['CBinDir'])) # Cleanup remove_from_temp('bleachbit.zip') @@ -715,17 +715,17 @@ def update_treesizefree(): kill_process('TreeSizeFree.exe') # Remove existing folders - remove_from_kit('TreeSizeFree-Portable') + remove_from_kit('TreeSizeFree') # Download download_to_temp( - 'treesizefree.zip.gz', SOURCE_URLS['TreeSizeFree-Portable']) + 'treesizefree.zip.gz', SOURCE_URLS['TreeSizeFree']) # Extract files ## NOTE: When downloaded using requests it is a .zip.gz? source = r'{}\treesizefree.zip.gz'.format(global_vars['TmpDir']) extract_generic(source, global_vars['TmpDir']) - extract_temp_to_cbin('treesizefree.zip', 'TreeSizeFree-Portable') + extract_temp_to_cbin('treesizefree.zip', 'TreeSizeFree') # Cleanup remove_from_temp('treesizefree.zip') diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py index 928452c0..b87e0322 100644 --- a/.bin/Scripts/settings/launchers.py +++ b/.bin/Scripts/settings/launchers.py @@ -306,6 +306,8 @@ LAUNCHERS = { }, 'HitmanPro': { 'L_TYPE': 'Program', + 'L_PATH': 'HitmanPro', + 'L_ITEM': 'HitmanPro.exe', 'L_CHCK': 'True', 'L_NCMD': 'True', 'Extra Code': [ @@ -345,14 +347,14 @@ LAUNCHERS = { }, 'Intel SSD Toolbox': { 'L_TYPE': 'Program', - 'L_PATH': '_Drivers', + 'L_PATH': r'_Drivers\Intel SSD Toolbox', 'L_ITEM': 'Intel SSD Toolbox.exe', 'L_CHCK': 'True', 'L_NCMD': 'True', }, 'Samsing Magician': { 'L_TYPE': 'Program', - 'L_PATH': '_Drivers', + 'L_PATH': r'_Drivers\Samsung Magician', 'L_ITEM': 'Samsung Magician.exe', 'L_CHCK': 'True', 'L_NCMD': 'True', @@ -524,7 +526,7 @@ LAUNCHERS = { 'L_CHCK': 'True', 'L_NCMD': 'True', }, - 'TreeSizeFree-Portable': { + 'TreeSizeFree': { 'L_TYPE': 'Program', 'L_PATH': 'TreeSizeFree', 'L_ITEM': 'TreeSizeFree.exe', diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py index 41b7c493..35316108 100644 --- a/.bin/Scripts/settings/sources.py +++ b/.bin/Scripts/settings/sources.py @@ -36,7 +36,7 @@ SOURCE_URLS = { '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', + 'TreeSizeFree': 'https://www.jam-software.com/treesize_free/TreeSizeFree-Portable.zip', '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',