Fixed a few launchers
This commit is contained in:
parent
ef844d510c
commit
e28492f32f
3 changed files with 15 additions and 13 deletions
|
|
@ -313,27 +313,27 @@ def update_bleachbit():
|
||||||
kill_process('bleachbit.exe')
|
kill_process('bleachbit.exe')
|
||||||
|
|
||||||
# Remove existing folders
|
# Remove existing folders
|
||||||
remove_from_kit('BleachBit-Portable')
|
remove_from_kit('BleachBit')
|
||||||
|
|
||||||
# Download
|
# Download
|
||||||
download_to_temp('bleachbit.zip', SOURCE_URLS['BleachBit'])
|
download_to_temp('bleachbit.zip', SOURCE_URLS['BleachBit'])
|
||||||
download_to_temp('Winapp2.zip', SOURCE_URLS['Winapp2'])
|
download_to_temp('Winapp2.zip', SOURCE_URLS['Winapp2'])
|
||||||
|
|
||||||
# Extract files
|
# Extract files
|
||||||
extract_temp_to_cbin('bleachbit.zip', 'BleachBit-Portable')
|
extract_temp_to_cbin('bleachbit.zip', 'BleachBit')
|
||||||
extract_generic(
|
extract_generic(
|
||||||
r'{}\Winapp2.zip'.format(global_vars['TmpDir']),
|
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'])
|
mode='e', sz_args=[r'Winapp2-master\Non-CCleaner\Winapp2.ini'])
|
||||||
|
|
||||||
# Move files into place
|
# Move files into place
|
||||||
dest = r'{}\BleachBit-Portable'.format(global_vars['CBinDir'])
|
dest = r'{}\BleachBit'.format(global_vars['CBinDir'])
|
||||||
for item in os.scandir(r'{}\BleachBit-Portable'.format(dest)):
|
for item in os.scandir(r'{}\BleachBit'.format(dest)):
|
||||||
dest_item = '{}\{}'.format(dest, item.name)
|
dest_item = '{}\{}'.format(dest, item.name)
|
||||||
if not os.path.exists(dest_item):
|
if not os.path.exists(dest_item):
|
||||||
shutil.move(item.path, dest_item)
|
shutil.move(item.path, dest_item)
|
||||||
shutil.rmtree(
|
shutil.rmtree(
|
||||||
r'{}\BleachBit-Portable\BleachBit-Portable'.format(global_vars['CBinDir']))
|
r'{}\BleachBit\BleachBit'.format(global_vars['CBinDir']))
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
remove_from_temp('bleachbit.zip')
|
remove_from_temp('bleachbit.zip')
|
||||||
|
|
@ -715,17 +715,17 @@ def update_treesizefree():
|
||||||
kill_process('TreeSizeFree.exe')
|
kill_process('TreeSizeFree.exe')
|
||||||
|
|
||||||
# Remove existing folders
|
# Remove existing folders
|
||||||
remove_from_kit('TreeSizeFree-Portable')
|
remove_from_kit('TreeSizeFree')
|
||||||
|
|
||||||
# Download
|
# Download
|
||||||
download_to_temp(
|
download_to_temp(
|
||||||
'treesizefree.zip.gz', SOURCE_URLS['TreeSizeFree-Portable'])
|
'treesizefree.zip.gz', SOURCE_URLS['TreeSizeFree'])
|
||||||
|
|
||||||
# Extract files
|
# Extract files
|
||||||
## NOTE: When downloaded using requests it is a .zip.gz?
|
## NOTE: When downloaded using requests it is a .zip.gz?
|
||||||
source = r'{}\treesizefree.zip.gz'.format(global_vars['TmpDir'])
|
source = r'{}\treesizefree.zip.gz'.format(global_vars['TmpDir'])
|
||||||
extract_generic(source, 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
|
# Cleanup
|
||||||
remove_from_temp('treesizefree.zip')
|
remove_from_temp('treesizefree.zip')
|
||||||
|
|
|
||||||
|
|
@ -306,6 +306,8 @@ LAUNCHERS = {
|
||||||
},
|
},
|
||||||
'HitmanPro': {
|
'HitmanPro': {
|
||||||
'L_TYPE': 'Program',
|
'L_TYPE': 'Program',
|
||||||
|
'L_PATH': 'HitmanPro',
|
||||||
|
'L_ITEM': 'HitmanPro.exe',
|
||||||
'L_CHCK': 'True',
|
'L_CHCK': 'True',
|
||||||
'L_NCMD': 'True',
|
'L_NCMD': 'True',
|
||||||
'Extra Code': [
|
'Extra Code': [
|
||||||
|
|
@ -345,14 +347,14 @@ LAUNCHERS = {
|
||||||
},
|
},
|
||||||
'Intel SSD Toolbox': {
|
'Intel SSD Toolbox': {
|
||||||
'L_TYPE': 'Program',
|
'L_TYPE': 'Program',
|
||||||
'L_PATH': '_Drivers',
|
'L_PATH': r'_Drivers\Intel SSD Toolbox',
|
||||||
'L_ITEM': 'Intel SSD Toolbox.exe',
|
'L_ITEM': 'Intel SSD Toolbox.exe',
|
||||||
'L_CHCK': 'True',
|
'L_CHCK': 'True',
|
||||||
'L_NCMD': 'True',
|
'L_NCMD': 'True',
|
||||||
},
|
},
|
||||||
'Samsing Magician': {
|
'Samsing Magician': {
|
||||||
'L_TYPE': 'Program',
|
'L_TYPE': 'Program',
|
||||||
'L_PATH': '_Drivers',
|
'L_PATH': r'_Drivers\Samsung Magician',
|
||||||
'L_ITEM': 'Samsung Magician.exe',
|
'L_ITEM': 'Samsung Magician.exe',
|
||||||
'L_CHCK': 'True',
|
'L_CHCK': 'True',
|
||||||
'L_NCMD': 'True',
|
'L_NCMD': 'True',
|
||||||
|
|
@ -524,7 +526,7 @@ LAUNCHERS = {
|
||||||
'L_CHCK': 'True',
|
'L_CHCK': 'True',
|
||||||
'L_NCMD': 'True',
|
'L_NCMD': 'True',
|
||||||
},
|
},
|
||||||
'TreeSizeFree-Portable': {
|
'TreeSizeFree': {
|
||||||
'L_TYPE': 'Program',
|
'L_TYPE': 'Program',
|
||||||
'L_PATH': 'TreeSizeFree',
|
'L_PATH': 'TreeSizeFree',
|
||||||
'L_ITEM': 'TreeSizeFree.exe',
|
'L_ITEM': 'TreeSizeFree.exe',
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ SOURCE_URLS = {
|
||||||
'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe',
|
'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201710/20171019164455812/Samsung_Magician_Installer.exe',
|
||||||
'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
|
'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
|
||||||
'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
|
'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',
|
'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',
|
'wimlib64': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip',
|
||||||
'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
|
'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue