From 6bd29e402c62fadfaaf2a109852823cd0212c60d Mon Sep 17 00:00:00 2001 From: 2Shirt <1923621+2Shirt@users.noreply.github.com> Date: Wed, 3 Oct 2018 14:32:29 -0600 Subject: [PATCH] Add Furmark * Fixes issue #10 --- .bin/Scripts/functions/update.py | 40 ++++++++++++++++++++++++++++++++ .bin/Scripts/settings/sources.py | 1 + .bin/Scripts/update_kit.py | 1 + 3 files changed, 42 insertions(+) diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index 893c7cdf..35ed1255 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -407,6 +407,46 @@ def update_erunt(): # Cleanup remove_from_temp('erunt.zip') +def update_furmark(): + # Stop running processes + for exe in ['cpuburner.exe', 'FurMark.exe', 'gpushark.exe', 'gpuz.exe']: + kill_process(exe) + + # Remove existing folders + remove_from_kit('FurMark') + + # Prep + install_dir = r'{}\FurMarkTemp"'.format(global_vars['TmpDir']) + dest = r'{}\FurMark'.format(global_vars['CBinDir']) + uninstaller = None + + # Download + download_to_temp('furmark_setup.exe', SOURCE_URLS['FurMark']) + + # Install to temp + cmd = [ + r'{}\furmark_setup.exe'.format(global_vars['TmpDir']), + '/DIR="{}"'.format(install_dir), + '/SILENT'] + run_program(cmd) + + # Copy files + shutil.copytree(install_dir, dest) + for item in os.scandir(dest): + r = re.search(r'^unins\d+\.(dat|exe)$', item.name, re.IGNORECASE) + if r: + if 'exe' in item.name: + uninstaller = r'{}\{}'.format(dest, item.name) + remove_item(item.path) + + # Uninstall from temp + if uninstaller: + cmd = [uninstaller, '/SILENT'] + run_program(cmd) + + # Cleanup + remove_from_temp('furmark_setup.exe') + def update_hitmanpro(): # Stop running processes for exe in ['HitmanPro.exe', 'HitmanPro64.exe']: diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py index 031e6757..6eb8e0d2 100644 --- a/.bin/Scripts/settings/sources.py +++ b/.bin/Scripts/settings/sources.py @@ -17,6 +17,7 @@ SOURCE_URLS = { 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.895.x86.zip', 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.895.x64.zip', 'FastCopy': 'http://ftp.vector.co.jp/70/64/2323/FastCopy354_installer.zip', + 'FurMark': 'https://geeks3d.com/dl/get/569', 'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/1056733/ublock_origin-1.16.20-an+fx.xpi', 'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe', 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe', diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index 10f481e3..88489181 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -42,6 +42,7 @@ if __name__ == '__main__': try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results, width=40) try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results, width=40) try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results, width=40) + try_and_print(message='FurMark...', function=update_furmark, other_results=other_results, width=40) try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results, width=40) try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results, width=40) try_and_print(message='NirCmd...', function=update_nircmd, other_results=other_results, width=40)