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

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
2Shirt 2021-10-14 20:22:06 -06:00
commit ef2919899b
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/Launch.cmd
View file

@ -98,6 +98,8 @@ rem Check for 64-bit prog (if running on 64-bit system)
set "prog=%_path%\%L_ITEM%" set "prog=%_path%\%L_ITEM%"
if %ARCH% equ 64 ( if %ARCH% equ 64 (
if exist "%_path%\%L_ITEM:.=64.%" set "prog=%_path%\%L_ITEM:.=64.%" if exist "%_path%\%L_ITEM:.=64.%" set "prog=%_path%\%L_ITEM:.=64.%"
) else (
if exist "%_path%\%L_ITEM:.=32.%" set "prog=%_path%\%L_ITEM:.=32.%"
) )
if not exist "%prog%" goto ErrorProgramNotFound if not exist "%prog%" goto ErrorProgramNotFound

17
scripts/wk/cfg/launchers.py
View file

@ -194,6 +194,11 @@ LAUNCHERS = {
r'call "%bin%\Scripts\init_client_dir.cmd" /Logs', r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
], ],
}, },
'FurMark': {
'L_TYPE': 'Executable',
'L_PATH': 'FurMark',
'L_ITEM': 'FurMark.exe',
},
'HWiNFO': { 'HWiNFO': {
'L_TYPE': 'Executable', 'L_TYPE': 'Executable',
'L_PATH': 'HWiNFO', 'L_PATH': 'HWiNFO',
@ -206,6 +211,18 @@ LAUNCHERS = {
r')', r')',
], ],
}, },
'HWiNFO (Sensors)': {
'L_TYPE': 'Executable',
'L_PATH': 'HWiNFO',
'L_ITEM': 'HWiNFO.exe',
'Extra Code': [
r'for %%a in (32 64) do (',
r' copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
r' (echo SensorsOnly=1)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
r' (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
r')',
],
},
'Prime95': { 'Prime95': {
'L_TYPE': 'Executable', 'L_TYPE': 'Executable',
'L_PATH': 'Prime95', 'L_PATH': 'Prime95',