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-09-30 17:45:54 -06:00
commit 0ca6d17485
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/wk/repairs/win.py
View file

@ -160,8 +160,8 @@ REG_UAC_DEFAULT_SETTINGS = {
} }
SYSTEMDRIVE = os.environ.get('SYSTEMDRIVE', 'C:') SYSTEMDRIVE = os.environ.get('SYSTEMDRIVE', 'C:')
EMSISOFT_INSTALL_PATH = f'{SYSTEMDRIVE}/EmsisoftCmd' EMSISOFT_INSTALL_PATH = f'{SYSTEMDRIVE}/EmsisoftCmd'
WHITELIST = ( WHITELIST = '\n'.join((
CONEMU_EXE, str(CONEMU_EXE),
fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer.exe', fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer.exe',
fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer_Desktop.exe', fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer_Desktop.exe',
fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer_Note.exe', fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer_Note.exe',
@ -169,7 +169,7 @@ WHITELIST = (
fr'{PROGRAMFILES_32}\TeamViewer\tv_w32.exe', fr'{PROGRAMFILES_32}\TeamViewer\tv_w32.exe',
fr'{PROGRAMFILES_32}\TeamViewer\tv_x64.exe', fr'{PROGRAMFILES_32}\TeamViewer\tv_x64.exe',
sys.executable, sys.executable,
) ))
WIDTH = 50 WIDTH = 50
TRY_PRINT = TryAndPrint() TRY_PRINT = TryAndPrint()
TRY_PRINT.width = WIDTH TRY_PRINT.width = WIDTH
@ -1102,7 +1102,7 @@ def run_emsisoft_cmd_scan():
whitelist_path = log_path.with_suffix('.wl') whitelist_path = log_path.with_suffix('.wl')
# Create whitelist # Create whitelist
whitelist_path.write_text('\n'.join(map(str, WHITELIST))) whitelist_path.write_text(WHITELIST)
# Run Scan # Run Scan
cmd = [ cmd = [
@ -1230,9 +1230,7 @@ def run_rkill():
log_path = format_log_path(log_name='RKill', timestamp=True, tool=True) log_path = format_log_path(log_name='RKill', timestamp=True, tool=True)
log_path.parent.mkdir(parents=True, exist_ok=True) log_path.parent.mkdir(parents=True, exist_ok=True)
whitelist_path = log_path.with_suffix('.wl') whitelist_path = log_path.with_suffix('.wl')
whitelist_path.write_text( whitelist_path.write_text(WHITELIST, encoding='utf-8')
'\n'.join(map(str, WHITELIST)), encoding='utf-8',
)
cmd_args = ( cmd_args = (
'-l', log_path, '-l', log_path,
'-w', whitelist_path, '-w', whitelist_path,