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

Only show destination device, not all devices

Browse source
This commit is contained in:
2Shirt 2019-04-14 18:48:54 -07:00
parent 3310e3d253
commit 72cc33cb7e
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.bin/Scripts/functions/ufd.py
View file

@ -200,12 +200,14 @@ def show_selections(args, sources, ufd_dev, ufd_sources):
cmd = [ cmd = [
'lsblk', '--nodeps', '--noheadings', 'lsblk', '--nodeps', '--noheadings',
'--output', 'NAME,TRAN,SIZE,VENDOR,MODEL,SERIAL', '--output', 'NAME,TRAN,SIZE,VENDOR,MODEL,SERIAL',
ufd_dev,
] ]
result = run_program(cmd, check=False, encoding='utf-8', errors='ignore') result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
print_standard(result.stdout.strip()) print_standard(result.stdout.strip())
cmd = [ cmd = [
'lsblk', '--noheadings', 'lsblk', '--noheadings',
'--output', 'NAME,SIZE,FSTYPE,LABEL,MOUNTPOINT', '--output', 'NAME,SIZE,FSTYPE,LABEL,MOUNTPOINT',
ufd_dev,
] ]
result = run_program(cmd, check=False, encoding='utf-8', errors='ignore') result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
for line in result.stdout.splitlines()[1:]: for line in result.stdout.splitlines()[1:]:
@ -246,8 +248,7 @@ def verify_ufd(dev_path):
try: try:
ufd_dev = find_path(dev_path) ufd_dev = find_path(dev_path)
except FileNotFoundError: except FileNotFoundError:
print_error('ERROR: UFD device not found: {}'.format( print_error('ERROR: UFD device not found: {}'.format(dev_path))
args['--ufd-device']))
abort(False) abort(False)
if not is_valid_path(ufd_dev, 'UFD'): if not is_valid_path(ufd_dev, 'UFD'):