2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fixed update_furmark() and add FurMark Launcher

Browse source
This commit is contained in:
2Shirt 2018-10-06 19:19:14 -06:00
parent e642bfd2d3
commit f097b98c85
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.bin/Scripts/functions/update.py
View file

@ -416,7 +416,7 @@ def update_furmark():
remove_from_kit('FurMark') remove_from_kit('FurMark')
# Prep # Prep
install_dir = r'{}\FurMarkTemp"'.format(global_vars['TmpDir']) install_dir = r'{}\FurMarkTemp'.format(global_vars['TmpDir'])
dest = r'{}\FurMark'.format(global_vars['CBinDir']) dest = r'{}\FurMark'.format(global_vars['CBinDir'])
uninstaller = None uninstaller = None
@ -426,7 +426,7 @@ def update_furmark():
# Install to temp # Install to temp
cmd = [ cmd = [
r'{}\furmark_setup.exe'.format(global_vars['TmpDir']), r'{}\furmark_setup.exe'.format(global_vars['TmpDir']),
'/DIR="{}"'.format(install_dir), '/DIR={}'.format(install_dir),
'/SILENT'] '/SILENT']
run_program(cmd) run_program(cmd)
@ -436,7 +436,7 @@ def update_furmark():
r = re.search(r'^unins\d+\.(dat|exe)$', item.name, re.IGNORECASE) r = re.search(r'^unins\d+\.(dat|exe)$', item.name, re.IGNORECASE)
if r: if r:
if 'exe' in item.name: if 'exe' in item.name:
uninstaller = r'{}\{}'.format(dest, item.name) uninstaller = r'{}\{}'.format(install_dir, item.name)
remove_item(item.path) remove_item(item.path)
# Uninstall from temp # Uninstall from temp

5
.bin/Scripts/settings/launchers.py
View file

@ -314,6 +314,11 @@ LAUNCHERS = {
r'call "%bin%\Scripts\init_client_dir.cmd" /Info', r'call "%bin%\Scripts\init_client_dir.cmd" /Info',
], ],
}, },
'FurMark': {
'L_TYPE': 'Executable',
'L_PATH': 'FurMark',
'L_ITEM': 'FurMark.exe',
},
'HitmanPro': { 'HitmanPro': {
'L_TYPE': 'Executable', 'L_TYPE': 'Executable',
'L_PATH': 'HitmanPro', 'L_PATH': 'HitmanPro',