From 460fd9c952ed4145851636a782f9cdb93ca8b655 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 20 Aug 2023 16:09:47 -0700
Subject: [PATCH] Fix misc typos

---
 scripts/wk/clone/block_pair.py |  5 ++---
 scripts/wk/clone/state.py      | 14 +++++++-------
 scripts/wk/hw/diags.py         |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/wk/clone/block_pair.py b/scripts/wk/clone/block_pair.py
index 65e8cd62..5e330a51 100644
--- a/scripts/wk/clone/block_pair.py
+++ b/scripts/wk/clone/block_pair.py
@@ -255,7 +255,6 @@ def add_clone_block_pairs(state) -> None:
 
   # Add pairs from previous run
   if settings['Partition Mapping']:
-    # Resume previous run, load pairs from settings file
     for part_map in settings['Partition Mapping']:
       bp_source = hw_disk.Disk(
         f'{state.source.path}{source_sep}{part_map[0]}',
@@ -304,8 +303,8 @@ def add_clone_block_pairs(state) -> None:
     source_num = re.sub(r'^.*?(\d+)$', r'\1', part.path.name)
     settings['Partition Mapping'].append([source_num, dest_num])
 
-    # Save settings
-    state.save_settings(settings)
+  # Save settings
+  state.save_settings(settings)
 
 
 def add_image_block_pairs(state) -> None:
diff --git a/scripts/wk/clone/state.py b/scripts/wk/clone/state.py
index a5ae6325..bb0d6c26 100644
--- a/scripts/wk/clone/state.py
+++ b/scripts/wk/clone/state.py
@@ -48,6 +48,13 @@ CLONE_SETTINGS = {
     # (5, 1) ## Clone source partition #5 to destination partition #1
     ],
   }
+PLATFORM = std.PLATFORM
+RECOMMENDED_FSTYPES = re.compile(r'^(ext[234]|ntfs|xfs)$')
+if PLATFORM == 'Darwin':
+  RECOMMENDED_FSTYPES = re.compile(r'^(apfs|hfs.?)$')
+RECOMMENDED_MAP_FSTYPES = re.compile(
+  r'^(apfs|cifs|ext[234]|hfs.?|ntfs|smbfs|vfat|xfs)$'
+  )
 REGEX_REMAINING_TIME = re.compile(
   r'remaining time:'
   r'\s*((?P<days>\d+)d)?'
@@ -57,13 +64,6 @@ REGEX_REMAINING_TIME = re.compile(
   r'\s*(?P<na>n/a)?',
   re.IGNORECASE
   )
-PLATFORM = std.PLATFORM
-RECOMMENDED_FSTYPES = re.compile(r'^(ext[234]|ntfs|xfs)$')
-if PLATFORM == 'Darwin':
-  RECOMMENDED_FSTYPES = re.compile(r'^(apfs|hfs.?)$')
-RECOMMENDED_MAP_FSTYPES = re.compile(
-  r'^(apfs|cifs|ext[234]|hfs.?|ntfs|smbfs|vfat|xfs)$'
-  )
 STATUS_COLORS = {
   'Passed':   'GREEN',
   'Aborted':  'YELLOW',
diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 38baf73e..5e032a41 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -226,7 +226,7 @@ class State():
         proc = exe.run_program(['smc', '-l'])
         data.extend(proc.stdout.splitlines())
       except Exception:
-        LOG.ERROR('Error(s) encountered while exporting SMC data')
+        LOG.error('Error(s) encountered while exporting SMC data')
       data = [line.strip() for line in data]
       with open(f'{debug_dir}/smc.data', 'a', encoding='utf-8') as _f:
         _f.write('\n'.join(data))