Merge remote-tracking branch 'upstream/dev' into dev

Addresses issue #12

README.md

@@ -1,6 +1,6 @@
 # WizardKit #
 
-A collection of scripts to help technicians service computers.
+A collection of tools to help technicians service computers.
 
 ## Overview ##
 

scripts/wk/hw/ddrescue.py

@@ -133,6 +133,11 @@ class BlockPair():
       'trim': 'Pending',
       'scrape': 'Pending',
       })
+    self.view_proc = 'Disabled'
+    if 'DISPLAY' in os.environ or 'WAYLAND_DISPLAY' in os.environ:
+      # Enable opening ddrescueview during recovery
+      self.view_proc = None
+
 
     # Set map file
     # e.g. '(Clone|Image)_Model[_p#]_Size[_Label].map'
@@ -2105,6 +2110,16 @@ def run_ddrescue(state, block_pair, pass_name, settings, dry_run=True):
         exe.stop_process(proc)
         std.print_error(warning_message)
         break
+
+      # Open ddrescueview
+      ## NOTE: This needs to be started a bit into the recovery since it needs
+      ##       a non-zero map file to read
+      if not block_pair.view_proc and _i > 1:
+        block_pair.view_proc = exe.popen_program(
+          ['ddrescueview', '-r', '5s', block_pair.map_path],
+          pipe=True,
+          )
+
     if _i % 60 == 0:
       # Clear ddrescue pane
       tmux.clear_pane()

setup/linux/packages/aur

@@ -1,4 +1,5 @@
 aic94xx-firmware
+ddrescueview-bin
 hfsprogs
 iwgtk
 memtest86-efi

setup/linux/packages/dependencies

@@ -34,4 +34,5 @@ startup-notification
 subversion
 syslinux
 tigervnc
+unzip
 wpa_supplicant