From 2d353cf4e623b7ce59fcaca651134c4c2595a5b1 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 15 Nov 2022 03:35:43 -0800 Subject: [PATCH 1/9] Add OpenSuperClone to Linux --- setup/linux/packages/aur | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/linux/packages/aur b/setup/linux/packages/aur index d09fed4f..4a10ed6d 100644 --- a/setup/linux/packages/aur +++ b/setup/linux/packages/aur @@ -5,6 +5,7 @@ hfsprogs iwgtk memtest86-efi mprime-bin +opensuperclone-git pipes.sh smartmontools-svn ttf-font-awesome-4 From b136462c75474a91ff3bf9a28075d6267b02ef79 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 15 Dec 2022 17:04:52 -0800 Subject: [PATCH 2/9] Add dependencies for opensuperclone --- setup/linux/packages/dependencies | 1 + setup/linux/packages/gui | 3 +++ 2 files changed, 4 insertions(+) diff --git a/setup/linux/packages/dependencies b/setup/linux/packages/dependencies index a306580a..dbd51917 100644 --- a/setup/linux/packages/dependencies +++ b/setup/linux/packages/dependencies @@ -20,6 +20,7 @@ qrencode scdoc # opensuperclone-git +libconfig libusb-compat # smartmontools-svn diff --git a/setup/linux/packages/gui b/setup/linux/packages/gui index f169bb79..f7842ed4 100644 --- a/setup/linux/packages/gui +++ b/setup/linux/packages/gui @@ -9,6 +9,7 @@ evince feh ffmpeg firefox +gcc gnome-keyring gparted gpicview @@ -18,6 +19,7 @@ iwgtk leafpad libinput libxft +make mesa-demos mkvtoolnix-cli mpv @@ -25,6 +27,7 @@ noto-fonts noto-fonts-cjk numlockx openbox +opensuperclone-git otf-font-awesome-4 papirus-icon-theme qemu-guest-agent From f21b95b0905e2c73d8e62c7cfe1dd4c5ff522d86 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 15 Dec 2022 17:05:29 -0800 Subject: [PATCH 3/9] Switch to LTS kernel --- setup/linux/packages/base | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/linux/packages/base b/setup/linux/packages/base index cb52761f..d37bb8c8 100644 --- a/setup/linux/packages/base +++ b/setup/linux/packages/base @@ -38,8 +38,9 @@ less lha libewf libldm -linux linux-firmware +linux-lts +linux-lts-headers lm_sensors lvm2 lzip From 302ad5881476526a7a0b743ac5fb70144f55ccd5 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Mon, 2 Jan 2023 13:22:07 -0800 Subject: [PATCH 4/9] Remove /utf8 arg from FastCopy launchers I seems that the FastCopy docs are outdated? --- scripts/wk/cfg/launchers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/wk/cfg/launchers.py b/scripts/wk/cfg/launchers.py index 8673c8d7..6d78a207 100644 --- a/scripts/wk/cfg/launchers.py +++ b/scripts/wk/cfg/launchers.py @@ -123,7 +123,6 @@ LAUNCHERS = { r' /logfile=%log_dir%\Tools\FastCopy.log' r' /acl' r' /cmd=noexist_only' - r' /utf8' r' /skip_empty_dir' r' /linkdest' r' /exclude=' @@ -172,7 +171,6 @@ LAUNCHERS = { r' /logfile=%log_dir%\Tools\FastCopy.log' r' /acl' r' /cmd=noexist_only' - r' /utf8' r' /skip_empty_dir' r' /linkdest' r' /exclude=' From 4a3bb2cc3f39ce798e777c8f2a5269c0ebef65e0 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 31 Jan 2023 22:36:42 -0800 Subject: [PATCH 5/9] Revert "Switch to LTS kernel" This reverts commit f21b95b0905e2c73d8e62c7cfe1dd4c5ff522d86. --- setup/linux/packages/base | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup/linux/packages/base b/setup/linux/packages/base index d37bb8c8..cb52761f 100644 --- a/setup/linux/packages/base +++ b/setup/linux/packages/base @@ -38,9 +38,8 @@ less lha libewf libldm +linux linux-firmware -linux-lts -linux-lts-headers lm_sensors lvm2 lzip From f371a4cb837defee4d9e437cde357b684abc0ac1 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 4 Feb 2023 17:20:06 -0800 Subject: [PATCH 6/9] Limit KVRT scan to Users and ProgramData folders --- scripts/wk/repairs/win.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py index 33cd7cbb..a26257a6 100644 --- a/scripts/wk/repairs/win.py +++ b/scripts/wk/repairs/win.py @@ -88,6 +88,7 @@ GPUPDATE_SUCCESS_STRINGS = ( ) IN_CONEMU = 'ConEmuPID' in os.environ MENU_PRESETS = Menu() +PROGRAMDATA = os.environ.get('{ALLUSERSPROFILE}', r'C:\ProgramData') PROGRAMFILES_32 = os.environ.get( 'PROGRAMFILES(X86)', os.environ.get( 'PROGRAMFILES', r'C:\Program Files (x86)', @@ -1031,12 +1032,18 @@ def run_kvrt(): log_path.parent.mkdir(parents=True, exist_ok=True) quarantine_path = set_quarantine_path('KVRT') quarantine_path.mkdir(parents=True, exist_ok=True) + report_path = quarantine_path.joinpath('Reports') + report_path.mkdir(parents=True, exist_ok=True) + scan_list = log_path.with_suffix('.lst') + scan_list.write_text( + f'{PROGRAMDATA}\n{SYSTEMDRIVE}\\Users', encoding='utf-8', + ) cmd_args = ( '-accepteula', '-d', str(quarantine_path), '-dontencrypt', '-fixednames', '-processlevel', '1', - '-custom', SYSTEMDRIVE, + '-customlist', str(scan_list), '-silent', '-adinsilent', ) From 9d76502421650543c90d0a4d4e9a9eeed2d9a79b Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 4 Feb 2023 17:22:00 -0800 Subject: [PATCH 7/9] Parse KVRT report to create human readable log --- scripts/wk/repairs/win.py | 45 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py index a26257a6..58603895 100644 --- a/scripts/wk/repairs/win.py +++ b/scripts/wk/repairs/win.py @@ -10,6 +10,7 @@ import sys import time from subprocess import CalledProcessError, DEVNULL +from xml.dom.minidom import parse as xml_parse from wk.cfg.main import KIT_NAME_FULL, KIT_NAME_SHORT, WINDOWS_TIME_ZONE from wk.cfg.repairs import ( @@ -992,6 +993,47 @@ def delete_registry_null_keys(): run_tool('RegDelNull', 'RegDelNull', '-s', '-y', download=True) +def log_kvrt_results(log_path, report_path): + """Parse KVRT report and log results in plain text.""" + log_text = '' + report_file = None + + # Get latest KVRT report + for item in reversed(sorted(report_path.iterdir())): + if item.name.startswith('report'): + report_file = item + break + if not report_file: + log_path.write_text('Failed to find KVRT report.', encoding='utf-8') + return + + # Parse report + dom_document = xml_parse(str(report_file)) + block_elements = dom_document.getElementsByTagName('Block0') + if not block_elements: + log_path.write_text('Failed to parse KVRT report.', encoding='utf-8') + return + attributes = block_elements[0].attributes + events = block_elements[0].getElementsByTagName('*') + + # Log summary + for key, value in attributes.items(): + log_text += f'{key+":":<14} {value}\n' + + # Log quarantined items + quarantined_items = [] + for event in events: + if not event.getAttribute('Action') == 'Quarantined': + continue + quarantined_items.append(event.getAttribute('Object')) + if quarantined_items: + log_text += '\nQuarantined Items:\n' + log_text += '\n'.join(quarantined_items) + + # Done + log_path.write_text(log_text, encoding='utf-8') + + def run_adwcleaner(): """Run AdwCleaner.""" settings_path = get_tool_path('AdwCleaner', 'AdwCleaner', check=False) @@ -1059,11 +1101,12 @@ def run_kvrt(): run_program(cmd, check=False) sleep(1) wait_for_procs('KVRT.exe') + log_kvrt_results(log_path, report_path) return # Run in background proc = run_tool('KVRT', 'KVRT', *cmd_args, download=True) - log_path.write_text(proc.stdout, encoding='utf-8') + log_kvrt_results(log_path, report_path) def run_microsoft_defender(full=True): From fd9d506ce556702bb0ad90d036060ac79c1a8aef Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 4 Feb 2023 17:29:09 -0800 Subject: [PATCH 8/9] Adjust package lists for OpenSuperClone --- setup/linux/packages/base | 1 + setup/linux/packages/dependencies | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/setup/linux/packages/base b/setup/linux/packages/base index 4f4a28ba..dfee4b07 100644 --- a/setup/linux/packages/base +++ b/setup/linux/packages/base @@ -23,6 +23,7 @@ ddrescue ddrescueview-bin device-mapper diffutils +dkms dmidecode dmraid dos2unix diff --git a/setup/linux/packages/dependencies b/setup/linux/packages/dependencies index 2632cfa7..7c7ba960 100644 --- a/setup/linux/packages/dependencies +++ b/setup/linux/packages/dependencies @@ -13,7 +13,7 @@ syslinux tigervnc wpa_supplicant -# hardinfo-gtk3 +# hardinfo-gtk3 / opensuperclone-git cmake # iwgtk @@ -22,10 +22,6 @@ meson qrencode scdoc -# opensuperclone-git -libconfig -libusb-compat - # smartmontools-svn subversion From ba1191e425181da0ef964bb27551ac0d3cd51cc9 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 4 Feb 2023 17:29:38 -0800 Subject: [PATCH 9/9] Add desktop file for OSCViewer --- .../airootfs/usr/share/applications/OSCViewer.desktop | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 setup/linux/profile/airootfs/usr/share/applications/OSCViewer.desktop diff --git a/setup/linux/profile/airootfs/usr/share/applications/OSCViewer.desktop b/setup/linux/profile/airootfs/usr/share/applications/OSCViewer.desktop new file mode 100644 index 00000000..7e6d939f --- /dev/null +++ b/setup/linux/profile/airootfs/usr/share/applications/OSCViewer.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=OSCViewer +Comment=OpenSuperClone viewer +Exec=oscviewer +Type=Application