2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 3 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 2022-05-24 12:45:08 -07:00
commit 49417e4148
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/wk/os/linux.py
View file

@ -26,7 +26,7 @@ def build_volume_report(device_path=None) -> list:
""" """
def _get_volumes(dev, indent=0) -> list: def _get_volumes(dev, indent=0) -> list:
"""Convert lsblk JSON tree to a flat list of items, returns list.""" """Convert lsblk JSON tree to a flat list of items, returns list."""
dev['name'] = f'{" "*indent}{dev["name"].replace("/dev/mapper/", "")}' dev['name'] = f'{" "*indent}{dev["name"]}'
volumes = [dev] volumes = [dev]
for child in dev.get('children', []): for child in dev.get('children', []):
volumes.extend(_get_volumes(child, indent=indent+1)) volumes.extend(_get_volumes(child, indent=indent+1))

1
setup/linux/packages/gui
View file

@ -3,6 +3,7 @@ arc-gtk-theme
cbatticon cbatticon
compton compton
conky conky
ddrescueview-bin
dunst dunst
evince evince
feh feh