From f097b98c8574f2829d210bba41022c456f99e4fb Mon Sep 17 00:00:00 2001 From: 2Shirt <1923621+2Shirt@users.noreply.github.com> Date: Sat, 6 Oct 2018 19:19:14 -0600 Subject: [PATCH] Fixed update_furmark() and add FurMark Launcher --- .bin/Scripts/functions/update.py | 6 +++--- .bin/Scripts/settings/launchers.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index c7b30474..16a23afa 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -416,7 +416,7 @@ def update_furmark(): remove_from_kit('FurMark') # Prep - install_dir = r'{}\FurMarkTemp"'.format(global_vars['TmpDir']) + install_dir = r'{}\FurMarkTemp'.format(global_vars['TmpDir']) dest = r'{}\FurMark'.format(global_vars['CBinDir']) uninstaller = None @@ -426,7 +426,7 @@ def update_furmark(): # Install to temp cmd = [ r'{}\furmark_setup.exe'.format(global_vars['TmpDir']), - '/DIR="{}"'.format(install_dir), + '/DIR={}'.format(install_dir), '/SILENT'] run_program(cmd) @@ -436,7 +436,7 @@ def update_furmark(): 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) + uninstaller = r'{}\{}'.format(install_dir, item.name) remove_item(item.path) # Uninstall from temp diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py index 34491575..85d8881d 100644 --- a/.bin/Scripts/settings/launchers.py +++ b/.bin/Scripts/settings/launchers.py @@ -314,6 +314,11 @@ LAUNCHERS = { r'call "%bin%\Scripts\init_client_dir.cmd" /Info', ], }, + 'FurMark': { + 'L_TYPE': 'Executable', + 'L_PATH': 'FurMark', + 'L_ITEM': 'FurMark.exe', + }, 'HitmanPro': { 'L_TYPE': 'Executable', 'L_PATH': 'HitmanPro',