v1.6.0

Main Kit
* Updated tool versions
  * Replaced TreeSizeFree with WizTree
  * Updated Python to 3.7
* New uBlock Origin installation method for Firefox
  * It is installed via the registry, similar to Google Chrome
  * It is now installed for existing profiles
* Fixed issue 51 and some minor bugs

Linux
* Added ddrescue-tui, a wrapper for ddrescue
  * Can be used to perform device-to-device and device-to-image clones
  * Can perform all three passes automatically (if certain thresholds are met)
  * Helps enforce safe(r) usage of ddrescue to reduce drive stress
  * Shows SMART data while running (updates every 5 minutes)
  * Shows SystemD journal while running
* Improved network support for some Broadcom network devices
* Improved I/O Benchmark test in HW-Diags
  * Shows current read speed with graph while running
    * Speeds under 65 Mb/s are red
    * Speeds under 135 Mb/s are yellow
    * Speeds above 750 Mb/s are green
  * Shows graph along with AVG (MIN, MAX) in summary report
  * Only reads a portion of the drive, spread out evenly, to speedup the test
    * (It reads either 10 Gb or 1% of the drive, whichever is larger)
* Added SMART attribute 199/C7 as an important value in HW-Diags
  * If present and non-zero it prompts for an override to continue testing
    * This includes the question "Have you tried swapping the drive cable?"
* The hostname is now set using the current IP and a reverse DNS lookup
  * Useful if run regularly on multiple permanent systems with static DHCP/DNS
* Added option to resume previous hw-diags `tmux` session
  * This allows you to more easily "move" the session to/from a SSH session
* Added a VNC server which runs at startup (unless booting CLI/nox)
* mount-all-volumes now supports non-encrypted CoreStorage volumes
* Added _limited_ support for HiDPI devices
* Fixed issue where the IP address was not shown in Conky
* Fixed issues #39, #41, #43, #44, #45, #46, #47, #48, #49, #50, #52, #53, & #54
* Various other minor bug fixes

WinPE
* Updated Python to 3.7

.bin/Scripts/Launch.cmd

@@ -150,7 +150,6 @@ goto Exit
 :LaunchOffice
 call "%bin%\Scripts\init_client_dir.cmd" /Office
 set "_odt=False"
-if %L_PATH% equ 2013 (set "_odt=True")
 if %L_PATH% equ 2016 (set "_odt=True")
 if "%_odt%" == "True" (
     goto LaunchOfficeODT

.bin/Scripts/build-ufd

@@ -557,7 +557,9 @@ mount "${WINPE_ISO}" /mnt/WinPE -r >> "${LOG_FILE}" 2>&1
 echo "Copying Linux files..."
 rsync ${RSYNC_ARGS} /mnt/Linux/* /mnt/Dest/ >> "${LOG_FILE}" 2>&1
 sed -i "s/${ISO_LABEL}/${UFD_LABEL}/" /mnt/Dest/EFI/boot/refind.conf
+sed -i "s/#UFD#//" /mnt/Dest/EFI/boot/refind.conf
 sed -i "s/${ISO_LABEL}/${UFD_LABEL}/" /mnt/Dest/arch/boot/syslinux/*cfg
+sed -i "s/#UFD#//" /mnt/Dest/arch/boot/syslinux/*cfg
 
 echo "Copying WinPE files..."
 rsync ${RSYNC_ARGS} /mnt/WinPE/{Boot,bootmgr{,.efi},en-us,sources} /mnt/Dest/ >> "${LOG_FILE}" 2>&1

.bin/Scripts/build_kit.ps1

@@ -11,6 +11,7 @@ $Bin = (Get-Item $WD).Parent.FullName
 $Root = (Get-Item $Bin -Force).Parent.FullName
 $Temp = "$Bin\tmp"
 $System32 = "{0}\System32" -f $Env:SystemRoot
+$SysWOW64 = "{0}\SysWOW64" -f $Env:SystemRoot
 Push-Location "$WD"
 $Host.UI.RawUI.BackgroundColor = "black"
 $Host.UI.RawUI.ForegroundColor = "white"
@@ -82,25 +83,25 @@ if ($MyInvocation.InvocationName -ne ".") {
     DownloadFile -Path $Path -Name "7z-extra.7z" -Url "https://www.7-zip.org/a/7z1805-extra.7z"
 
     # ConEmu
-    $Url = "https://github.com/Maximus5/ConEmu/releases/download/v18.05.06/ConEmuPack.180506.7z"
+    $Url = "https://github.com/Maximus5/ConEmu/releases/download/v18.06.26/ConEmuPack.180626.7z"
     DownloadFile -Path $Path -Name "ConEmuPack.7z" -Url $Url
 
     # Notepad++
-    $Url = "https://notepad-plus-plus.org/repository/7.x/7.5.6/npp.7.5.6.bin.minimalist.7z"
+    $Url = "https://notepad-plus-plus.org/repository/7.x/7.5.8/npp.7.5.8.bin.minimalist.7z"
     DownloadFile -Path $Path -Name "npp.7z" -Url $Url
 
     # Python
-    $Url = "https://www.python.org/ftp/python/3.6.5/python-3.6.5-embed-win32.zip"
+    $Url = "https://www.python.org/ftp/python/3.7.0/python-3.7.0-embed-win32.zip"
     DownloadFile -Path $Path -Name "python32.zip" -Url $Url
-    $Url = "https://www.python.org/ftp/python/3.6.5/python-3.6.5-embed-amd64.zip"
+    $Url = "https://www.python.org/ftp/python/3.7.0/python-3.7.0-embed-amd64.zip"
     DownloadFile -Path $Path -Name "python64.zip" -Url $Url
 
     # Python: psutil
     $DownloadPage = "https://pypi.org/project/psutil/"
-    $RegEx = "href=.*-cp36-cp36m-win32.whl"
+    $RegEx = "href=.*-cp37-cp37m-win32.whl"
     $Url = FindDynamicUrl $DownloadPage $RegEx
     DownloadFile -Path $Path -Name "psutil32.whl" -Url $Url
-    $RegEx = "href=.*-cp36-cp36m-win_amd64.whl"
+    $RegEx = "href=.*-cp37-cp37m-win_amd64.whl"
     $Url = FindDynamicUrl $DownloadPage $RegEx
     DownloadFile -Path $Path -Name "psutil64.whl" -Url $Url
 
@@ -113,12 +114,25 @@ if ($MyInvocation.InvocationName -ne ".") {
         DownloadFile -Path $Path -Name $Name -Url $Url
     }
 
+    # Visual C++ Runtimes
+    $Url = "https://aka.ms/vs/15/release/vc_redist.x86.exe"
+    DownloadFile -Path $Path -Name "vcredist_x86.exe" -Url $Url
+    $Url = "https://aka.ms/vs/15/release/vc_redist.x64.exe"
+    DownloadFile -Path $Path -Name "vcredist_x64.exe" -Url $Url
+    
     ## Bail ##
     # If errors were encountered during downloads
     if ($DownloadErrors -gt 0) {
         Abort
     }
 
+    ## Install ##
+    # Visual C++ Runtimes
+    $ArgumentList = @("/install", "/passive", "/norestart")
+    Start-Process -FilePath "$Temp\vcredist_x86.exe" -ArgumentList $ArgumentList -Wait
+    Start-Process -FilePath "$Temp\vcredist_x64.exe" -ArgumentList $ArgumentList -Wait
+    Remove-Item "$Temp\vcredist*.exe"
+    
     ## Extract ##
     # 7-Zip
     Write-Host "Extracting: 7-Zip"
@@ -192,6 +206,13 @@ if ($MyInvocation.InvocationName -ne ".") {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
     }
+    try {
+        Copy-Item -Path "$System32\vcruntime140.dll" -Destination "$Bin\Python\x64\vcruntime140.dll" -Force
+        Copy-Item -Path "$SysWOW64\vcruntime140.dll" -Destination "$Bin\Python\x32\vcruntime140.dll" -Force
+    }
+    catch {
+        Write-Host ("  ERROR: Failed to copy Visual C++ Runtime DLLs." ) -ForegroundColor "Red"
+    }
     Remove-Item "$Temp\python*.zip"
     Remove-Item "$Temp\*.whl"
 

.bin/Scripts/build_pe.ps1

@@ -17,6 +17,7 @@ $Date = Get-Date -UFormat "%Y-%m-%d"
 $Host.UI.RawUI.BackgroundColor = "Black"
 $Host.UI.RawUI.ForegroundColor = "White"
 $HostSystem32 = "{0}\System32" -f $Env:SystemRoot
+$HostSysWOW64 = "{0}\SysWOW64" -f $Env:SystemRoot
 $DISM = "{0}\DISM.exe" -f $Env:DISMRoot
 #Enable TLS 1.2
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
@@ -136,20 +137,19 @@ if ($MyInvocation.InvocationName -ne ".") {
             @("bluescreenview32.zip", "http://www.nirsoft.net/utils/bluescreenview.zip"),
             @("bluescreenview64.zip", "http://www.nirsoft.net/utils/bluescreenview-x64.zip"),
             # ConEmu
-            @("ConEmuPack.7z", "https://github.com/Maximus5/ConEmu/releases/download/v18.05.06/ConEmuPack.180506.7z"),
+            @("ConEmuPack.7z", "https://github.com/Maximus5/ConEmu/releases/download/v18.06.26/ConEmuPack.180626.7z"),
             # Fast Copy
-            @("fastcopy32.zip", "http://ftp.vector.co.jp/69/93/2323/FastCopy341.zip"),
+            @("fastcopy.zip", "http://ftp.vector.co.jp/70/64/2323/FastCopy354_installer.zip"),
-            @("fastcopy64.zip", "http://ftp.vector.co.jp/69/93/2323/FastCopy341_x64.zip"),
             # HWiNFO
-            @("hwinfo.zip", "http://app.oldfoss.com:81/download/HWiNFO/hwi_582.zip"),
+            @("hwinfo.zip", "http://app.oldfoss.com:81/download/HWiNFO/hwi_588.zip"),
             # Killer Network Drivers
             @(
                 "killerinf.zip",
                 ("http://www.killernetworking.com"+(FindDynamicUrl "http://www.killernetworking.com/driver-downloads/item/killer-drivers-inf" "Download Killer-Ethernet").replace('&', '&'))
             ),
             # Notepad++
-            @("npp_x86.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.6/npp.7.5.6.bin.minimalist.7z"),
+            @("npp_x86.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.8/npp.7.5.8.bin.minimalist.7z"),
-            @("npp_amd64.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.6/npp.7.5.6.bin.minimalist.x64.7z"),
+            @("npp_amd64.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.8/npp.7.5.8.bin.minimalist.x64.7z"),
             # NT Password Editor
             @("ntpwed.zip", "http://cdslow.org.ru/files/ntpwedit/ntpwed07.zip"),
             # Prime95
@@ -159,16 +159,16 @@ if ($MyInvocation.InvocationName -ne ".") {
             @("produkey32.zip", "http://www.nirsoft.net/utils/produkey.zip"),
             @("produkey64.zip", "http://www.nirsoft.net/utils/produkey-x64.zip"),
             # Python
-            @("python32.zip", "https://www.python.org/ftp/python/3.6.5/python-3.6.5-embed-win32.zip"),
+            @("python32.zip", "https://www.python.org/ftp/python/3.7.0/python-3.7.0-embed-win32.zip"),
-            @("python64.zip", "https://www.python.org/ftp/python/3.6.5/python-3.6.5-embed-amd64.zip"),
+            @("python64.zip", "https://www.python.org/ftp/python/3.7.0/python-3.7.0-embed-amd64.zip"),
             # Python: psutil
             @(
                 "psutil64.whl",
-                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp36-cp36m-win_amd64.whl")
+                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp37-cp37m-win_amd64.whl")
             ),
             @(
                 "psutil32.whl",
-                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp36-cp36m-win32.whl")
+                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp37-cp37m-win32.whl")
             ),
             # Q-Dir
             @("qdir32.zip", "https://www.softwareok.com/Download/Q-Dir_Portable.zip"),
@@ -178,6 +178,9 @@ if ($MyInvocation.InvocationName -ne ".") {
             @("testdisk64.zip", "https://www.cgsecurity.org/testdisk-7.1-WIP.win64.zip"),
             # VirtIO drivers
             @("virtio-win.iso", "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso"),
+            # Visual C++ Runtimes
+            @("vcredist_x86.exe", "https://aka.ms/vs/15/release/vc_redist.x86.exe"),
+            @("vcredist_x64.exe", "https://aka.ms/vs/15/release/vc_redist.x64.exe"),
             # wimlib-imagex
             @("wimlib32.zip", "https://wimlib.net/downloads/wimlib-1.12.0-windows-i686-bin.zip"),
             @("wimlib64.zip", "https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip")
@@ -192,6 +195,13 @@ if ($MyInvocation.InvocationName -ne ".") {
             Abort
         }
 
+        ## Install ##
+        # Visual C++ Runtimes
+        Write-Host "Installing: Visual C++ Runtimes"
+        $ArgumentList = @("/install", "/passive", "/norestart")
+        Start-Process -FilePath "$Temp\vcredist_x86.exe" -ArgumentList $ArgumentList -Wait
+        Start-Process -FilePath "$Temp\vcredist_x64.exe" -ArgumentList $ArgumentList -Wait
+        
         ## Extract ##
         # 7-Zip
         Write-Host "Extracting: 7-Zip"
@@ -255,21 +265,31 @@ if ($MyInvocation.InvocationName -ne ".") {
         # Fast Copy
         Write-Host "Extracting: FastCopy"
         try {
+            # Extract Installer
             $ArgumentList = @(
-                "x", "$Temp\fastcopy64.zip", "-o$Build\bin\amd64\FastCopy",
+                "e", "$Temp\fastcopy.zip", "-o$Temp",
-                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
-                "-x!setup.exe", "-x!*.dll")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+
+            # Extract 64-bit
             $ArgumentList = @(
-                "e", "$Temp\fastcopy32.zip", "-o$Build\bin\x86\FastCopy",
+                "/NOSUBDIR", "/DIR=$Build\bin\amd64\FastCopy",
-                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "/EXTRACT64")
-                "-x!setup.exe", "-x!*.dll")
+            Start-Process -FilePath "$TEMP\FastCopy354_installer.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
-            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Build\bin\amd64\FastCopy\setup.exe" -Force
+
+            # Extract 32-bit
+            $ArgumentList = @(
+                "/NOSUBDIR", "/DIR=$Build\bin\x86\FastCopy",
+                "/EXTRACT32")
+            Start-Process -FilePath "$TEMP\FastCopy354_installer.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Build\bin\x86\FastCopy\setup.exe" -Force
         }
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
 
+        
         # Killer Network Driver
         Write-Host "Extracting: Killer Network Driver"
         try {
@@ -414,6 +434,12 @@ if ($MyInvocation.InvocationName -ne ".") {
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
+        try {
+            Copy-Item -Path "$HostSystem32\vcruntime140.dll" -Destination "$Build\bin\amd64\python\vcruntime140.dll" -Force
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to copy Visual C++ Runtime DLL." ) -ForegroundColor "Red"
+        }
 
         # Python (x32)
         Write-Host "Extracting: Python (x32)"
@@ -431,6 +457,12 @@ if ($MyInvocation.InvocationName -ne ".") {
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
+        try {
+            Copy-Item -Path "$HostSysWOW64\vcruntime140.dll" -Destination "$Build\bin\x86\python\vcruntime140.dll" -Force
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to copy Visual C++ Runtime DLL." ) -ForegroundColor "Red"
+        }
     
         # Q-Dir
         Write-Host "Extracting: Q-Dir"

.bin/Scripts/ddrescue-tui

@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+## Wizard Kit: ddrescue TUI Launcher
+
+SESSION_NAME="ddrescue-tui"
+WINDOW_NAME="GNU ddrescue TUI"
+MENU="ddrescue-tui-menu"
+
+function ask() {
+    while :; do
+        read -p "$1 " -r answer
+        if echo "$answer" | egrep -iq '^(y|yes|sure)$'; then
+            return 0
+        elif echo "$answer" | egrep -iq '^(n|no|nope)$'; then
+            return 1
+        fi
+    done
+}
+
+die () {
+    echo "$0:" "$@" >&2
+    exit 1
+}
+
+# Check for running session
+if tmux list-session | grep -q "$SESSION_NAME"; then
+    echo "WARNING: tmux session $SESSION_NAME already exists."
+    echo ""
+    if ask "Kill current session?"; then
+        tmux kill-session -t "$SESSION_NAME" || \
+            die "Failed to kill session: $SESSION_NAME"
+    else
+        echo "Aborted."
+        echo ""
+        echo -n "Press Enter to exit... "
+        read -r
+        exit 0
+    fi
+fi
+
+# Start session
+tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$MENU" $*
+

.bin/Scripts/ddrescue-tui-menu

@@ -0,0 +1,63 @@
+#!/bin/python3
+#
+## Wizard Kit: TUI for ddrescue cloning and imaging
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+
+from functions.ddrescue import *
+from functions.hw_diags import *
+init_global_vars()
+
+if __name__ == '__main__':
+    try:
+        # Prep
+        clear_screen()
+        args = list(sys.argv)
+        run_mode = ''
+        source_path = None
+        dest_path = None
+
+        # Parse args
+        try:
+            script_name = os.path.basename(args.pop(0))
+            run_mode = str(args.pop(0)).lower()
+            source_path = args.pop(0)
+            dest_path = args.pop(0)
+        except IndexError:
+            # We'll set the missing paths later
+            pass
+
+        # Show usage
+        if re.search(r'-+(h|help)', str(sys.argv), re.IGNORECASE):
+            show_usage(script_name)
+            exit_script()
+
+        # Start cloning/imaging
+        if run_mode in ('clone', 'image'):
+            menu_ddrescue(source_path, dest_path, run_mode)
+        else:
+            if not re.search(r'^-*(h|help\?)', run_mode, re.IGNORECASE):
+                print_error('Invalid mode.')
+        
+        # Done
+        print_standard('\nDone.')
+        pause("Press Enter to exit...")
+        exit_script()
+    except GenericAbort:
+        abort()
+    except GenericError as ge:
+        msg = 'Generic Error'
+        if str(ge):
+            msg = str(ge)
+        print_error(msg)
+        abort()
+    except SystemExit:
+        pass
+    except:
+        major_exception()
+
+# vim: sts=4 sw=4 ts=4

.bin/Scripts/ddrescue-tui-smart-display

@@ -0,0 +1,39 @@
+#!/bin/python3
+#
+## Wizard Kit: SMART attributes display for ddrescue TUI
+
+import os
+import sys
+import time
+
+# Init
+os.chdir(os.path.dirname(os.path.realpath(__file__)))
+sys.path.append(os.getcwd())
+from functions.hw_diags import *
+#init_global_vars()
+
+if __name__ == '__main__':
+    try:
+        # Prep
+        clear_screen()
+        dev_path = sys.argv[1]
+        devs = scan_disks(True, dev_path)
+        
+        # Warn if SMART unavailable
+        if dev_path not in devs:
+            print_error('SMART data not available')
+            exit_script()
+        
+        # Initial screen
+        dev = devs[dev_path]
+        clear_screen()
+        show_disk_details(dev, only_attributes=True)
+        
+        # Done
+        exit_script()
+    except SystemExit:
+        pass
+    except:
+        major_exception()
+
+# vim: sts=4 sw=4 ts=4

.bin/Scripts/echo-and-hold

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+## Wizard Kit: "echo" text to screen and "hold" by waiting for user input
+
+function usage {
+    echo "Usage: $(basename "$0") \"text\""
+    echo "  e.g. $(basename "$0") \"Some text to show\""
+}
+
+echo -en "$@" && read -r __dont_care
+exit 0
+

.bin/Scripts/functions/browsers.py

@@ -46,6 +46,9 @@ UBO_CHROME_REG =        r'Software\Wow6432Node\Google\Chrome\Extensions\cjpalhdl
 UBO_EXTRA_CHROME =      'https://chrome.google.com/webstore/detail/ublock-origin-extra/pgdnlhfefecpicbbihgmbmffkjpaplco?hl=en'
 UBO_EXTRA_CHROME_REG =  r'Software\Wow6432Node\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco'
 UBO_MOZILLA =           'https://addons.mozilla.org/en-us/firefox/addon/ublock-origin/'
+UBO_MOZZILA_PATH =      r'{}\Mozilla Firefox\distribution\extensions\ublock_origin.xpi'.format(os.environ.get('PROGRAMFILES'))
+UBO_MOZILLA_REG =       r'Software\Mozilla\Firefox\Extensions'
+UBO_MOZILLA_REG_NAME =  'uBlock0@raymondhill.net'
 UBO_OPERA =             'https://addons.opera.com/en/extensions/details/ublock/?display=en'
 SUPPORTED_BROWSERS = {
     'Internet Explorer': {
@@ -285,6 +288,9 @@ def get_ie_homepages():
         homepages.append(main_page)
     if len(extra_pages) > 0:
         homepages.extend(extra_pages)
+
+    # Remove all curly braces
+    homepages = [h.replace('{', '').replace('}', '') for h in homepages]
     return homepages
 
 def get_mozilla_homepages(prefs_path):
@@ -366,14 +372,17 @@ def install_adblock(indent=8, width=32):
                     urls.append(UBO_EXTRA_CHROME)
             
             elif browser_data[browser]['base'] == 'mozilla':
-                # Assume UBO is not installed first and change if it is
+                # Check for system extensions
-                urls.append(UBO_MOZILLA)
+                try:
-                if browser == 'Mozilla Firefox':
+                    with winreg.OpenKey(HKLM, UBO_MOZILLA_REG) as key:
-                    ubo = browser_data[browser]['exe_path'].replace(
+                        winreg.QueryValueEx(key, UBO_MOZILLA_REG_NAME)
-                        'firefox.exe',
+                except FileNotFoundError:
-                        r'distribution\extensions\uBlock0@raymondhill.net')
+                    urls = [UBO_MOZILLA]
-                    if os.path.exists(ubo):
+                else:
+                    if os.path.exists(UBO_MOZZILA_PATH):
                         urls = ['about:addons']
+                    else:
+                        urls = [UBO_MOZILLA]
             
             elif browser_data[browser]['base'] == 'ie':
                 urls.append(IE_GALLERY)

.bin/Scripts/functions/common.py

@@ -197,6 +197,30 @@ def extract_item(item, filter='', silent=False):
         if not silent:
             print_warning('WARNING: Errors encountered while exctracting data')
 
+def get_process(name=None):
+    """Get process by name, returns psutil.Process obj."""
+    proc = None
+    if not name:
+        raise GenericError
+
+    for p in psutil.process_iter():
+        try:
+            if p.name() == name:
+                proc = p
+        except psutil._exceptions.NoSuchProcess:
+            # Process finished during iteration? Going to ignore
+            pass
+    return proc
+
+def get_simple_string(prompt='Enter string'):
+    """Get string from user (minimal allowed character set) and return as str."""
+    simple_string = None
+    while simple_string is None:
+        _input = input('{}: '.format(prompt))
+        if re.match(r"^(\w|-| |\.|')+$", _input, re.ASCII):
+            simple_string = _input.strip()
+    return simple_string
+
 def get_ticket_number():
     """Get TicketNumber from user, save in LogDir, and return as str."""
     if not ENABLED_TICKET_NUMBERS:
@@ -213,15 +237,6 @@ def get_ticket_number():
                 f.write(ticket_number)
     return ticket_number
 
-def get_simple_string(prompt='Enter string'):
-    """Get string from user (only alphanumeric/space chars) and return as str."""
-    simple_string = None
-    while simple_string is None:
-        _input = input('{}: '.format(prompt))
-        if re.match(r'^(\w|-| )+$', _input, re.ASCII):
-            simple_string = _input.strip()
-    return simple_string
-
 def human_readable_size(size, decimals=0):
     """Convert size in bytes to a human-readable format and return a str."""
     # Prep string formatting
@@ -234,6 +249,8 @@ def human_readable_size(size, decimals=0):
         size = int(size)
     except ValueError:
         size = convert_to_bytes(size)
+    except TypeError:
+        size = -1
 
     # Verify we have a valid size
     if size < 0:

.bin/Scripts/functions/data.py

@@ -153,6 +153,67 @@ def cleanup_transfer(dest_path):
                 except Exception:
                     pass
 
+def find_core_storage_volumes():
+    """Try to create block devices for any Apple CoreStorage volumes."""
+    corestorage_uuid = '53746f72-6167-11aa-aa11-00306543ecac'
+    dmsetup_cmd_file = '{TmpDir}/dmsetup_command'.format(**global_vars)
+
+    # Get CoreStorage devices
+    cmd = [
+        'lsblk', '--json', '--list', '--paths',
+        '--output', 'NAME,PARTTYPE']
+    result = run_program(cmd)
+    json_data = json.loads(result.stdout.decode())
+    devs = json_data.get('blockdevices', [])
+    devs = [d for d in devs if d.get('parttype', '') == corestorage_uuid]
+    if devs:
+        print_standard(' ')
+        print_standard('Detected CoreStorage partition{}'.format(
+            '' if len(devs) == 1 else 's'))
+        print_standard('    Scanning for inner volume(s)....')
+
+    # Search for inner volumes and setup dev mappers
+    for dev in devs:
+        dev_path = dev.get('name', '')
+        if not dev_path:
+            # Can't setup block device without the dev path
+            continue
+        dev_name = re.sub(r'.*/', '', dev_path)
+        log_path = '{LogDir}/testdisk_{dev_name}.log'.format(
+            dev_name=dev_name, **global_vars)
+
+        # Run TestDisk
+        cmd = [
+            'sudo', 'testdisk',
+            '/logname', log_path, '/debug', '/log',
+            '/cmd', dev_path, 'partition_none,analyze']
+        result = run_program(cmd, check=False)
+        if result.returncode:
+            # i.e. return code is non-zero
+            continue
+        if not os.path.exists(log_path):
+            # TestDisk failed to write log
+            continue
+
+        # Check log for found volumes
+        cs_vols = {}
+        with open(log_path, 'r') as f:
+            for line in f.readlines():
+                r = re.match(
+                    r'^.*echo "([^"]+)" . dmsetup create test(\d)$',
+                    line.strip(),
+                    re.IGNORECASE)
+                if r:
+                    cs_name = 'CoreStorage_{}_{}'.format(dev_name, r.group(2))
+                    cs_vols[cs_name] = r.group(1)
+
+        # Create mapper device(s)
+        for name, dm_cmd in sorted(cs_vols.items()):
+            with open(dmsetup_cmd_file, 'w') as f:
+                f.write(dm_cmd)
+            cmd = ['sudo', 'dmsetup', 'create', name, dmsetup_cmd_file]
+            run_program(cmd, check=False)
+
 def fix_path_sep(path_str):
     """Replace non-native and duplicate dir separators, returns str."""
     return re.sub(r'(\\|/)+', lambda s: os.sep, path_str)
@@ -187,14 +248,20 @@ def get_mounted_volumes():
         mounted_volumes.extend(item.get('children', []))
     return {item['source']: item for item in mounted_volumes}
 
-def mount_all_volumes():
+def mount_volumes(all_devices=True, device_path=None, read_write=False):
     """Mount all detected filesystems."""
     report = {}
+    cmd = [
+        'lsblk', '--json', '--paths',
+        '--output', 'NAME,FSTYPE,LABEL,UUID,PARTTYPE,TYPE,SIZE']
+    if not all_devices and device_path:
+        # Only mount volumes for specific device
+        cmd.append(device_path)
+    else:
+        # Check for Apple CoreStorage volumes first
+        find_core_storage_volumes()
 
     # Get list of block devices
-    cmd = [
-        'lsblk', '-J', '-p',
-        '-o', 'NAME,FSTYPE,LABEL,UUID,PARTTYPE,TYPE,SIZE']
     result = run_program(cmd)
     json_data = json.loads(result.stdout.decode())
     devs = json_data.get('blockdevices', [])
@@ -233,8 +300,11 @@ def mount_all_volumes():
                 vol_data['show_data']['warning'] = True
             else:
                 # Mount volume
+                cmd = ['udevil', 'mount',
+                    '-o', 'rw' if read_write else 'ro',
+                    vol_path]
                 try:
-                    run_program(['udevil', 'mount', '-o', 'ro', vol_path])
+                    run_program(cmd)
                 except subprocess.CalledProcessError:
                     vol_data['show_data']['data'] = 'Failed to mount'
                     vol_data['show_data']['error'] = True
@@ -242,11 +312,16 @@ def mount_all_volumes():
             mounted_volumes = get_mounted_volumes()
 
             # Format pretty result string
-            if vol_data['show_data']['data'] != 'Failed to mount':
+            if vol_data['show_data']['data'] == 'Failed to mount':
+                vol_data['mount_point'] = None
+            else:
                 size_used = human_readable_size(
                     mounted_volumes[vol_path]['used'])
                 size_avail = human_readable_size(
                     mounted_volumes[vol_path]['avail'])
+                vol_data['size_avail'] = size_avail
+                vol_data['size_used'] = size_used
+                vol_data['mount_point'] = mounted_volumes[vol_path]['target']
                 vol_data['show_data']['data'] = 'Mounted on {}'.format(
                     mounted_volumes[vol_path]['target'])
                 vol_data['show_data']['data'] = '{:40} ({} used, {} free)'.format(

.bin/Scripts/functions/hw_diags.py

@@ -1,6 +1,7 @@
 # Wizard Kit: Functions - HW Diagnostics
 
 import json
+import time
 
 from functions.common import *
 
@@ -19,11 +20,37 @@ ATTRIBUTES = {
         184: {'Error': 1},
         187: {'Warning': 1},
         188: {'Warning': 1},
+        196: {'Warning': 1, 'Error': 10, 'Ignore': True},
         197: {'Error': 1},
         198: {'Error': 1},
+        199: {'Error': 1, 'Ignore': True},
         201: {'Warning': 1},
         },
     }
+IO_VARS = {
+    'Block Size': 512*1024,
+    'Chunk Size': 16*1024**2,
+    'Minimum Dev Size': 8*1024**3,
+    'Minimum Test Size': 10*1024**3,
+    'Alt Test Size Factor': 0.01,
+    'Progress Refresh Rate': 5,
+    'Scale 16': [2**(0.6*x)+(16*x) for x in range(1,17)],
+    'Scale 32': [2**(0.6*x/2)+(16*x/2) for x in range(1,33)],
+    'Threshold Fail': 65*1024**2,
+    'Threshold Warn': 135*1024**2,
+    'Threshold Great': 750*1024**2,
+    'Graph Horizontal': ('▁', '▂', '▃', '▄', '▅', '▆', '▇', '█'),
+    'Graph Horizontal Width': 40,
+    'Graph Vertical': (
+        '▏',    '▎',    '▍',    '▌',
+        '▋',    '▊',    '▉',    '█',
+        '█▏',   '█▎',   '█▍',   '█▌',
+        '█▋',   '█▊',   '█▉',   '██',
+        '██▏',  '██▎',  '██▍',  '██▌',
+        '██▋',  '██▊',  '██▉',  '███',
+        '███▏', '███▎', '███▍', '███▌',
+        '███▋', '███▊', '███▉', '████'),
+    }
 TESTS = {
     'Prime95': {
         'Enabled': False,
@@ -46,6 +73,45 @@ TESTS = {
         },
     }
 
+def generate_horizontal_graph(rates):
+    """Generate two-line horizontal graph from rates, returns str."""
+    line_top = ''
+    line_bottom = ''
+    for r in rates:
+        step = get_graph_step(r, scale=16)
+
+        # Set color
+        r_color = COLORS['CLEAR']
+        if r < IO_VARS['Threshold Fail']:
+            r_color = COLORS['RED']
+        elif r < IO_VARS['Threshold Warn']:
+            r_color = COLORS['YELLOW']
+        elif r > IO_VARS['Threshold Great']:
+            r_color = COLORS['GREEN']
+
+        # Build graph
+        if step < 8:
+            line_top += ' '
+            line_bottom += '{}{}'.format(r_color, IO_VARS['Graph Horizontal'][step])
+        else:
+            line_top += '{}{}'.format(r_color, IO_VARS['Graph Horizontal'][step-8])
+            line_bottom += '{}{}'.format(r_color, IO_VARS['Graph Horizontal'][-1])
+    line_top += COLORS['CLEAR']
+    line_bottom += COLORS['CLEAR']
+    return '{}\n{}'.format(line_top, line_bottom)
+
+def get_graph_step(rate, scale=16):
+    """Get graph step based on rate and scale, returns int."""
+    m_rate = rate / (1024**2)
+    step = 0
+    scale_name = 'Scale {}'.format(scale)
+    for x in range(scale-1, -1, -1):
+        # Iterate over scale backwards
+        if m_rate >= IO_VARS[scale_name][x]:
+            step = x
+            break
+    return step
+
 def get_read_rate(s):
     """Get read rate in bytes/s from dd progress output."""
     real_rate = None
@@ -56,7 +122,9 @@ def get_read_rate(s):
 
 def get_smart_details(dev):
     """Get SMART data for dev if possible, returns dict."""
-    cmd = 'sudo smartctl --all --json /dev/{}'.format(dev).split()
+    cmd = 'sudo smartctl --all --json {}{}'.format(
+        '' if '/dev/' in dev else '/dev/',
+        dev).split()
     result = run_program(cmd, check=False)
     try:
         return json.loads(result.stdout.decode())
@@ -64,12 +132,21 @@ def get_smart_details(dev):
         # Let other sections deal with the missing data
         return {}
 
+def get_smart_value(smart_data, smart_id):
+    """Get SMART value from table, returns int or None."""
+    value = None
+    table = smart_data.get('ata_smart_attributes', {}).get('table', [])
+    for row in table:
+        if str(row.get('id', '?')) == str(smart_id):
+            value = row.get('raw', {}).get('value', None)
+    return value
+
 def get_status_color(s):
     """Get color based on status, returns str."""
     color = COLORS['CLEAR']
-    if s in ['Denied', 'NS', 'OVERRIDE', 'Unknown']:
+    if s in ['Denied', 'NS', 'OVERRIDE']:
         color = COLORS['RED']
-    elif s in ['Aborted', 'Working', 'Skipped']:
+    elif s in ['Aborted', 'Unknown', 'Working', 'Skipped']:
         color = COLORS['YELLOW']
     elif s in ['CS']:
         color = COLORS['GREEN']
@@ -147,9 +224,9 @@ def menu_diags(*args):
                 'pipes -t 0 -t 1 -t 2 -t 3 -p 5 -R -r 4000'.split(),
                 check=False, pipe=False)
         elif selection == 'R':
-            run_program(['reboot'])
+            run_program(['systemctl', 'reboot'])
         elif selection == 'S':
-            run_program(['poweroff'])
+            run_program(['systemctl', 'poweroff'])
         elif selection == 'Q':
             break
 
@@ -194,6 +271,7 @@ def run_badblocks():
             print_standard('Done', timestamp=False)
 
             # Check results
+            if os.path.exists(progress_file):
                 with open(progress_file, 'r') as f:
                     text = f.read()
                     TESTS['badblocks']['Results'][name] = text
@@ -206,6 +284,8 @@ def run_badblocks():
                 # Move temp file
                 shutil.move(progress_file, '{}/badblocks-{}.log'.format(
                     global_vars['LogDir'], name))
+            else:
+                TESTS['badblocks']['Status'][name] = 'NS'
         update_progress()
 
     # Done
@@ -249,32 +329,120 @@ def run_iobenchmark():
             TESTS['iobenchmark']['Status'][name] = 'Working'
             update_progress()
             print_standard('  /dev/{:11}  '.format(name+'...'), end='', flush=True)
-            run_program('tmux split-window -dl 5 {} {} {}'.format(
+
-                'hw-diags-iobenchmark',
+            # Get dev size
-                '/dev/{}'.format(name),
+            cmd = 'sudo lsblk -bdno size /dev/{}'.format(name)
-                progress_file).split())
+            try:
-            wait_for_process('dd')
+                result = run_program(cmd.split())
+                dev_size = result.stdout.decode().strip()
+                dev_size = int(dev_size)
+            except:
+                # Failed to get dev size, requires manual testing instead
+                TESTS['iobenchmark']['Status'][name] = 'Unknown'
+                continue
+            if dev_size < IO_VARS['Minimum Dev Size']:
+                TESTS['iobenchmark']['Status'][name] = 'Unknown'
+                continue
+
+            # Calculate dd values
+            ## test_size is the area to be read in bytes
+            ##      If the dev is < 10Gb then it's the whole dev
+            ##      Otherwise it's the larger of 10Gb or 1% of the dev
+            ##
+            ## test_chunks is the number of groups of "Chunk Size" in test_size
+            ##      This number is reduced to a multiple of the graph width in
+            ##      order to allow for the data to be condensed cleanly
+            ##
+            ## skip_blocks is the number of "Block Size" groups not tested
+            ## skip_count is the number of blocks to skip per test_chunk
+            ## skip_extra is how often to add an additional skip block
+            ##      This is needed to ensure an even testing across the dev
+            ##      This is calculated by using the fractional amount left off
+            ##      of the skip_count variable
+            test_size = min(IO_VARS['Minimum Test Size'], dev_size)
+            test_size = max(
+                test_size, dev_size*IO_VARS['Alt Test Size Factor'])
+            test_chunks = int(test_size // IO_VARS['Chunk Size'])
+            test_chunks -= test_chunks % IO_VARS['Graph Horizontal Width']
+            test_size = test_chunks * IO_VARS['Chunk Size']
+            skip_blocks = int((dev_size - test_size) // IO_VARS['Block Size'])
+            skip_count = int((skip_blocks / test_chunks) // 1)
+            skip_extra = 0
+            try:
+                skip_extra = 1 + int(1 / ((skip_blocks / test_chunks) % 1))
+            except ZeroDivisionError:
+                # skip_extra == 0 is fine
+                pass
+
+            # Open dd progress pane after initializing file
+            with open(progress_file, 'w') as f:
+                f.write('')
+            sleep(1)
+            cmd = 'tmux split-window -dp 75 -PF #D tail -f {}'.format(
+                progress_file)
+            result = run_program(cmd.split())
+            bottom_pane = result.stdout.decode().strip()
+
+            # Run dd read tests
+            offset = 0
+            read_rates = []
+            for i in range(test_chunks):
+                i += 1
+                s = skip_count
+                c = int(IO_VARS['Chunk Size'] / IO_VARS['Block Size'])
+                if skip_extra and i % skip_extra == 0:
+                    s += 1
+                cmd = 'sudo dd bs={b} skip={s} count={c} if=/dev/{n} of={o}'.format(
+                    b=IO_VARS['Block Size'],
+                    s=offset+s,
+                    c=c,
+                    n=name,
+                    o='/dev/null')
+                result = run_program(cmd.split())
+                result_str = result.stderr.decode().replace('\n', '')
+                read_rates.append(get_read_rate(result_str))
+                if i % IO_VARS['Progress Refresh Rate'] == 0:
+                    # Update vertical graph
+                    update_io_progress(
+                        percent=i/test_chunks*100,
+                        rate=read_rates[-1],
+                        progress_file=progress_file)
+                # Update offset
+                offset += s + c
             print_standard('Done', timestamp=False)
 
-            # Check results
+            # Close bottom pane
-            with open(progress_file, 'r') as f:
+            run_program(['tmux', 'kill-pane', '-t', bottom_pane])
-                text = f.read()
-                io_stats = text.replace('\r', '\n').split('\n')
-                try:
-                    io_stats = [get_read_rate(s) for s in io_stats]
-                    io_stats = [float(s/1048576) for s in io_stats if s]
-                    TESTS['iobenchmark']['Results'][name] = 'Read speed: {:3.1f} MB/s (Min: {:3.1f}, Max: {:3.1f})'.format(
-                        sum(io_stats) / len(io_stats),
-                        min(io_stats),
-                        max(io_stats))
-                    TESTS['iobenchmark']['Status'][name] = 'CS'
-                except:
-                    # Requires manual testing
-                    TESTS['iobenchmark']['Status'][name] = 'NS'
 
-            # Move temp file
+            # Build report
-            shutil.move(progress_file, '{}/iobenchmark-{}.log'.format(
+            h_graph_rates = []
-                global_vars['LogDir'], name))
+            pos = 0
+            width = int(test_chunks / IO_VARS['Graph Horizontal Width'])
+            for i in range(IO_VARS['Graph Horizontal Width']):
+                # Append average rate for WIDTH number of rates to new array
+                h_graph_rates.append(sum(read_rates[pos:pos+width])/width)
+                pos += width
+            report = generate_horizontal_graph(h_graph_rates)
+            report += '\nRead speed: {:3.1f} MB/s (Min: {:3.1f}, Max: {:3.1f})'.format(
+                sum(read_rates)/len(read_rates)/(1024**2),
+                min(read_rates)/(1024**2),
+                max(read_rates)/(1024**2))
+            TESTS['iobenchmark']['Results'][name] = report
+
+            # Set CS/NS
+            if min(read_rates) <= IO_VARS['Threshold Fail']:
+                TESTS['iobenchmark']['Status'][name] = 'NS'
+            elif min(read_rates) <= IO_VARS['Threshold Warn']:
+                TESTS['iobenchmark']['Status'][name] = 'Unknown'
+            else:
+                TESTS['iobenchmark']['Status'][name] = 'CS'
+
+            # Save logs
+            dest_filename = '{}/iobenchmark-{}.log'.format(global_vars['LogDir'], name)
+            shutil.move(progress_file, dest_filename)
+            with open(dest_filename.replace('.', '-raw.'), 'a') as f:
+                for rate in read_rates:
+                    f.write('{} MB/s\n'.format(rate/(1024**2)))
         update_progress()
 
     # Done
@@ -284,7 +452,6 @@ def run_iobenchmark():
 def run_mprime():
     """Run Prime95 for MPRIME_LIMIT minutes while showing the temps."""
     aborted = False
-    clear_screen()
     print_log('\nStart Prime95 test')
     TESTS['Prime95']['Status'] = 'Working'
     update_progress()
@@ -299,12 +466,15 @@ def run_mprime():
     
     # Start test
     run_program(['apple-fans', 'max'])
-    print_standard('Running Prime95 for {} minutes'.format(MPRIME_LIMIT))
-    print_warning('If running too hot, press CTL+c to abort the test')
     try:
-        sleep(int(MPRIME_LIMIT)*60)
+        for i in range(int(MPRIME_LIMIT)):
+            clear_screen()
+            print_standard('Running Prime95 ({} minutes left)'.format(
+                int(MPRIME_LIMIT)-i))
+            print_warning('If running too hot, press CTRL+c to abort the test')
+            sleep(60)
     except KeyboardInterrupt:
-        # Catch CTL+C
+        # Catch CTRL+C
         aborted = True
 
     # Save "final" temps
@@ -479,6 +649,8 @@ def run_tests(tests):
 
     # Initialize
     if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled'] or TESTS['iobenchmark']['Enabled']:
+        print_standard(' ')
+        print_standard('Scanning disks...')
         scan_disks()
     update_progress()
 
@@ -509,12 +681,17 @@ def run_tests(tests):
                 global_vars['LogFile']))
             pause('Press Enter to exit...')
 
-def scan_disks():
+def scan_disks(full_paths=False, only_path=None):
     """Scan for disks eligible for hardware testing."""
     clear_screen()
 
     # Get eligible disk list
-    result = run_program(['lsblk', '-J', '-O'])
+    cmd = ['lsblk', '-J', '-O']
+    if full_paths:
+        cmd.append('-p')
+    if only_path:
+        cmd.append(only_path)
+    result = run_program(cmd)
     json_data = json.loads(result.stdout.decode())
     devs = {}
     for d in json_data.get('blockdevices', []):
@@ -536,13 +713,18 @@ def scan_disks():
     for dev, data in devs.items():
         # Get SMART attributes
         run_program(
-            cmd = 'sudo smartctl -s on /dev/{}'.format(dev).split(),
+            cmd = 'sudo smartctl -s on {}{}'.format(
+              '' if full_paths else '/dev/',
+              dev).split(),
             check = False)
         data['smartctl'] = get_smart_details(dev)
     
         # Get NVMe attributes
         if data['lsblk']['tran'] == 'nvme':
             cmd = 'sudo nvme smart-log /dev/{} -o json'.format(dev).split()
+            cmd = 'sudo nvme smart-log {}{} -o json'.format(
+                '' if full_paths else '/dev/',
+                dev).split()
             result = run_program(cmd, check=False)
             try:
                 data['nvme-cli'] = json.loads(result.stdout.decode())
@@ -571,10 +753,20 @@ def scan_disks():
             data['SMART Support'] = False
             
         # Ask for manual overrides if necessary
-        if not data['Quick Health OK'] and (TESTS['badblocks']['Enabled'] or TESTS['iobenchmark']['Enabled']):
+        if TESTS['badblocks']['Enabled'] or TESTS['iobenchmark']['Enabled']:
             show_disk_details(data)
-            print_warning("WARNING: Health can't be confirmed for: {}".format(
+            needs_override = False
-                '/dev/{}'.format(dev)))
+            if not data['Quick Health OK']:
+                needs_override = True
+                print_warning(
+                    "WARNING: Health can't be confirmed for: /dev/{}".format(dev))
+            if get_smart_value(data['smartctl'], '199'):
+                # SMART attribute present and it's value is non-zero
+                needs_override = True
+                print_warning(
+                    'WARNING: SMART 199/C7 error detected on /dev/{}'.format(dev))
+                print_standard('    (Have you tried swapping the drive cable?)')
+            if needs_override:
                 dev_name = data['lsblk']['name']
                 print_standard(' ')
                 if ask('Run tests on this device anyway?'):
@@ -588,12 +780,16 @@ def scan_disks():
     TESTS['NVMe/SMART']['Devices'] = devs
     TESTS['badblocks']['Devices'] = devs
     TESTS['iobenchmark']['Devices'] = devs
+    return devs
 
-def show_disk_details(dev):
+def show_disk_details(dev, only_attributes=False):
     """Display disk details."""
     dev_name = dev['lsblk']['name']
+    if not only_attributes:
       # Device description
-    print_info('Device: /dev/{}'.format(dev['lsblk']['name']))
+      print_info('Device: {}{}'.format(
+          '' if '/dev/' in dev['lsblk']['name'] else '/dev/',
+          dev['lsblk']['name']))
       print_standard(' {:>4} ({}) {} {}'.format(
           str(dev['lsblk'].get('size', '???b')).strip(),
           str(dev['lsblk'].get('tran', '???')).strip().upper().replace(
@@ -615,6 +811,11 @@ def show_disk_details(dev):
 
     # Attributes
     if dev.get('NVMe Disk', False):
+        if only_attributes:
+            print_info('SMART Attributes:', end='')
+            print_warning('             Updated: {}'.format(
+                time.strftime('%Y-%m-%d %H:%M %Z')))
+        else:
             print_info('Attributes:')
         for attrib, threshold in sorted(ATTRIBUTES['NVMe'].items()):
             if attrib in dev['nvme-cli']:
@@ -636,6 +837,11 @@ def show_disk_details(dev):
                     print_success(raw_str, timestamp=False)
     elif dev['smartctl'].get('ata_smart_attributes', None):
         # SMART attributes
+        if only_attributes:
+            print_info('SMART Attributes:', end='')
+            print_warning('             Updated: {}'.format(
+                time.strftime('%Y-%m-%d %H:%M %Z')))
+        else:
             print_info('Attributes:')
         s_table = dev['smartctl'].get('ata_smart_attributes', {}).get(
             'table', {})
@@ -730,13 +936,38 @@ def show_results():
                 and io_status not in ['Denied', 'OVERRIDE', 'Skipped']):
                 print_info('Benchmark:')
                 result = TESTS['iobenchmark']['Results'].get(name, '')
-                print_standard('  {}'.format(result))
+                for line in result.split('\n'):
+                    print_standard('  {}'.format(line))
             print_standard(' ')
 
     # Done
     pause('Press Enter to return to main menu... ')
     run_program('tmux kill-pane -a'.split())
 
+def update_io_progress(percent, rate, progress_file):
+    """Update I/O progress file."""
+    bar_color = COLORS['CLEAR']
+    rate_color = COLORS['CLEAR']
+    step = get_graph_step(rate, scale=32)
+    if rate < IO_VARS['Threshold Fail']:
+        bar_color = COLORS['RED']
+        rate_color = COLORS['YELLOW']
+    elif rate < IO_VARS['Threshold Warn']:
+        bar_color = COLORS['YELLOW']
+        rate_color = COLORS['YELLOW']
+    elif rate > IO_VARS['Threshold Great']:
+        bar_color = COLORS['GREEN']
+        rate_color = COLORS['GREEN']
+    line = '  {p:5.1f}%  {b_color}{b:<4}  {r_color}{r:6.1f} Mb/s{c}\n'.format(
+        p=percent,
+        b_color=bar_color,
+        b=IO_VARS['Graph Vertical'][step],
+        r_color=rate_color,
+        r=rate/(1024**2),
+        c=COLORS['CLEAR'])
+    with open(progress_file, 'a') as f:
+        f.write(line)
+
 def update_progress():
     """Update progress file."""
     if 'Progress Out' not in TESTS:
@@ -792,3 +1023,4 @@ def update_progress():
 if __name__ == '__main__':
     print("This file is not meant to be called directly.")
 
+# vim: sts=4 sw=4 ts=4

.bin/Scripts/functions/network.py

@@ -3,6 +3,7 @@
 ## Wizard Kit: Functions - Network
 
 import os
+import shutil
 import sys
 
 # Init
@@ -26,13 +27,8 @@ def connect_to_network():
     if is_connected():
         return
     
-    # LAN
-    if 'en' in net_ifs:
-        # Reload the tg3/broadcom driver (known fix for some Dell systems)
-        try_and_print(message='Reloading drivers...', function=reload_tg3)
-    
     # WiFi
-    if not is_connected() and 'wl' in net_ifs:
+    if 'wl' in net_ifs:
         cmd = [
             'nmcli', 'dev', 'wifi',
             'connect', WIFI_SSID,
@@ -71,13 +67,6 @@ def speedtest():
     output = [(a, float(b), c) for a, b, c in output]
     return ['{:10}{:6.2f} {}'.format(*line) for line in output]
 
-def reload_tg3():
-    """Reload tg3 module as a workaround for some Dell systems."""
-    run_program(['sudo', 'modprobe', '-r', 'tg3'])
-    run_program(['sudo', 'modprobe', 'broadcom'])
-    run_program(['sudo', 'modprobe', 'tg3'])
-    sleep(5)
-
 if __name__ == '__main__':
     print("This file is not meant to be called directly.")
 

.bin/Scripts/functions/setup.py

@@ -5,6 +5,9 @@ from functions.common import *
 # STATIC VARIABLES
 HKCU = winreg.HKEY_CURRENT_USER
 HKLM = winreg.HKEY_LOCAL_MACHINE
+MOZILLA_FIREFOX_UBO_PATH = r'{}\{}\ublock_origin.xpi'.format(
+    os.environ.get('PROGRAMFILES'),
+    r'Mozilla Firefox\distribution\extensions')
 OTHER_RESULTS = {
     'Error': {
         'CalledProcessError':   'Unknown Error',
@@ -76,9 +79,6 @@ SETTINGS_EXPLORER_USER = {
         },
     }
 SETTINGS_GOOGLE_CHROME = {
-    r'Software\Google\Chrome\Extensions': {
-        'WOW64_32': True,
-        },
     r'Software\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm': {
         'SZ Items': {
             'update_url': 'https://clients2.google.com/service/update2/crx'},
@@ -90,6 +90,19 @@ SETTINGS_GOOGLE_CHROME = {
         'WOW64_32': True,
         },
     }
+SETTINGS_MOZILLA_FIREFOX_32 = {
+    r'Software\Mozilla\Firefox\Extensions': {
+        'SZ Items': {
+            'uBlock0@raymondhill.net': MOZILLA_FIREFOX_UBO_PATH},
+        'WOW64_32': True,
+        },
+    }
+SETTINGS_MOZILLA_FIREFOX_64 = {
+    r'Software\Mozilla\Firefox\Extensions': {
+        'SZ Items': {
+            'uBlock0@raymondhill.net': MOZILLA_FIREFOX_UBO_PATH},
+        },
+    }
 VCR_REDISTS = [
     {'Name': 'Visual C++ 2008 SP1 x32...',
         'Cmd': [r'2008sp1\x32\vcredist.exe', '/qb! /norestart']},
@@ -221,7 +234,7 @@ def install_adobe_reader():
     run_program(cmd)
 
 def install_chrome_extensions():
-    """Update registry to 'install' Google Chrome extensions for all users."""
+    """Update registry to install Google Chrome extensions for all users."""
     write_registry_settings(SETTINGS_GOOGLE_CHROME, all_users=True)
 
 def install_classicstart_skin():
@@ -238,16 +251,20 @@ def install_classicstart_skin():
     shutil.copy(source, dest)
 
 def install_firefox_extensions():
-    """Extract Firefox extensions to installation folder."""
+    """Update registry to install Firefox extensions for all users."""
     dist_path = r'{PROGRAMFILES}\Mozilla Firefox\distribution\extensions'.format(
         **global_vars['Env'])
     source_path = r'{CBinDir}\FirefoxExtensions.7z'.format(**global_vars)
     if not os.path.exists(source_path):
         raise FileNotFoundError
 
+    # Update registry
+    write_registry_settings(SETTINGS_MOZILLA_FIREFOX_32, all_users=True)
+    write_registry_settings(SETTINGS_MOZILLA_FIREFOX_64, all_users=True)
+    
     # Extract extension(s) to distribution folder
     cmd = [
-        global_vars['Tools']['SevenZip'], 'x', '-aos', '-bso0', '-bse0',
+        global_vars['Tools']['SevenZip'], 'e', '-aos', '-bso0', '-bse0',
         '-p{ArchivePassword}'.format(**global_vars),
         '-o{dist_path}'.format(dist_path=dist_path),
         source_path]

.bin/Scripts/functions/update.py

@@ -235,19 +235,34 @@ def update_fastcopy():
     remove_from_kit('FastCopy')
     
     # Download
-    download_to_temp('FastCopy32.zip', SOURCE_URLS['FastCopy32'])
+    download_to_temp('FastCopy.zip', SOURCE_URLS['FastCopy'])
-    download_to_temp('FastCopy64.zip', SOURCE_URLS['FastCopy64'])
 
-    # Extract
+    # Extract installer
-    extract_temp_to_bin('FastCopy64.zip', 'FastCopy', sz_args=['FastCopy.exe'])
+    extract_temp_to_bin('FastCopy.zip', 'FastCopy')
+    _path = r'{}\FastCopy'.format(global_vars['BinDir'])
+    _installer = 'FastCopy354_installer.exe'
+
+    # Extract 64-bit
+    cmd = [
+        r'{}\{}'.format(_path, _installer),
+        '/NOSUBDIR', '/DIR={}'.format(_path),
+        '/EXTRACT64']
+    run_program(cmd)
     shutil.move(
         r'{}\FastCopy\FastCopy.exe'.format(global_vars['BinDir']),
         r'{}\FastCopy\FastCopy64.exe'.format(global_vars['BinDir']))
-    extract_temp_to_bin('FastCopy32.zip', 'FastCopy', sz_args=[r'-x!setup.exe', r'-x!*.dll'])
+
+    # Extract 32-bit
+    cmd = [
+        r'{}\{}'.format(_path, _installer),
+        '/NOSUBDIR', '/DIR={}'.format(_path),
+        '/EXTRACT32']
+    run_program(cmd)
 
     # Cleanup
-    remove_from_temp('FastCopy32.zip')
+    os.remove(r'{}\{}'.format(_path, _installer))
-    remove_from_temp('FastCopy64.zip')
+    os.remove(r'{}\setup.exe'.format(_path, _installer))
+    remove_from_temp('FastCopy.zip')
 
 def update_wimlib():
     # Stop running processes
@@ -474,10 +489,18 @@ def update_samsung_magician():
     remove_from_kit('Samsung Magician.exe')
     
     # Download
-    download_generic(
+    download_to_temp('Samsung Magician.zip', SOURCE_URLS['Samsung Magician'])
-        r'{}\_Drivers\Samsung Magician'.format(global_vars['CBinDir']),
+
-        'Samsung Magician.exe',
+    # Extract
-        SOURCE_URLS['Samsung Magician'])
+    extract_temp_to_cbin('Samsung Magician.zip', '_Drivers\Samsung Magician')
+    shutil.move(
+        r'{}\_Drivers\Samsung Magician\Samsung_Magician_Installer.exe'.format(
+            global_vars['CBinDir']),
+        r'{}\_Drivers\Samsung Magician\Samsung Magician.exe'.format(
+            global_vars['CBinDir']))
+
+    # Cleanup
+    remove_from_temp('Samsung Magician.zip')
 
 def update_sdi_origin():
     # Download aria2
@@ -561,8 +584,8 @@ def update_office():
     if os.path.exists(include_path):
         shutil.copytree(include_path, dest)
     
+    for year in ['2016']:
         # Download and extract
-    for year in ['2013', '2016']:
         name = 'odt{}.exe'.format(year)
         url = 'Office Deployment Tool {}'.format(year)
         download_to_temp(name, SOURCE_URLS[url])
@@ -577,8 +600,7 @@ def update_office():
             r'{}\_Office\{}'.format(global_vars['CBinDir'], year))
     
         # Cleanup
-    remove_from_temp('odt2013.exe')
+        remove_from_temp('odt{}.exe'.format(year))
-    remove_from_temp('odt2016.exe')
 
 def update_classic_start_skin():
     # Remove existing folders
@@ -698,16 +720,10 @@ def update_firefox_ublock_origin():
     remove_from_kit('FirefoxExtensions')
     
     # Download
-    download_to_temp('ff-uBO.xpi', SOURCE_URLS['Firefox uBO'])
+    download_generic(
-    
+        r'{}\FirefoxExtensions'.format(global_vars['CBinDir']),
-    # Extract files
+        'ublock_origin.xpi',
-    extract_generic(
+        SOURCE_URLS['Firefox uBO'])
-        r'{}\ff-uBO.xpi'.format(global_vars['TmpDir']),
-        r'{}\FirefoxExtensions\uBlock0@raymondhill.net'.format(
-            global_vars['CBinDir']))
-    
-    # Cleanup
-    remove_from_temp('ff-uBO.xpi')
 
 def update_notepadplusplus():
     # Stop running processes
@@ -745,22 +761,23 @@ def update_putty():
     # Cleanup
     remove_from_temp('putty.zip')
 
-def update_treesizefree():
+def update_wiztree():
     # Stop running processes
-    kill_process('TreeSizeFree.exe')
+    for process in ['WizTree.exe', 'WizTree64.exe']:
+        kill_process(process)
     
     # Remove existing folders
-    remove_from_kit('TreeSizeFree')
+    remove_from_kit('WizTree')
     
     # Download
     download_to_temp(
-        'treesizefree.zip', SOURCE_URLS['TreeSizeFree'])
+        'wiztree.zip', SOURCE_URLS['WizTree'])
     
     # Extract files
-    extract_temp_to_cbin('treesizefree.zip', 'TreeSizeFree')
+    extract_temp_to_cbin('wiztree.zip', 'WizTree')
     
     # Cleanup
-    remove_from_temp('treesizefree.zip')
+    remove_from_temp('wiztree.zip')
 
 def update_xmplay():
     # Stop running processes
@@ -826,11 +843,10 @@ def update_adwcleaner():
     remove_from_kit('AdwCleaner')
     
     # Download
-    url = resolve_dynamic_url(
-        SOURCE_URLS['AdwCleaner'],
-        'id="downloadLink"')
     download_generic(
-        r'{}\AdwCleaner'.format(global_vars['CBinDir']), 'AdwCleaner.exe', url)
+        r'{}\AdwCleaner'.format(global_vars['CBinDir']),
+        'AdwCleaner.exe',
+        SOURCE_URLS['AdwCleaner'])
 
 def update_kvrt():
     # Stop running processes

.bin/Scripts/hw-diags

@@ -8,7 +8,7 @@ MENU="hw-diags-menu"
 
 function ask() {
     while :; do
-        read -p "$1 " -r answer
+        read -p "$1 [Y/N] " -r answer
         if echo "$answer" | egrep -iq '^(y|yes|sure)$'; then
             return 0
         elif echo "$answer" | egrep -iq '^(n|no|nope)$'; then
@@ -24,9 +24,12 @@ die () {
 
 # Check for running session
 if tmux list-session | grep -q "$SESSION_NAME"; then
-    echo "WARNING: hw-diags tmux session already exists."
+    echo "WARNING: tmux session $SESSION_NAME already exists."
     echo ""
-    if ask "Kill current session?"; then
+    if ask "Connect to current session?"; then
+        # Do nothing, the command below will attach/connect
+        echo ""
+    elif ask "Kill current session and start new session?"; then
         tmux kill-session -t "$SESSION_NAME" || \
             die "Failed to kill session: $SESSION_NAME"
     else
@@ -39,5 +42,5 @@ if tmux list-session | grep -q "$SESSION_NAME"; then
 fi
 
 # Start session
-tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$MENU" $*
+tmux new-session -A -s "$SESSION_NAME" -n "$WINDOW_NAME" "$MENU" $*
 

.bin/Scripts/mount-all-volumes

@@ -18,7 +18,7 @@ if __name__ == '__main__':
         print_standard('{}: Volume mount tool'.format(KIT_NAME_FULL))
 
         # Mount volumes
-        report = mount_all_volumes()
+        report = mount_volumes(all_devices=True)
 
         # Print report
         print_info('\nResults')

.bin/Scripts/mount-raw-image

@@ -24,7 +24,7 @@ if [[ -f "${1:-}" ]]; then
         done
     else
         # losetup did not detect partitions, attempt whole image
-        udevil mount -o to "${LOOPDEV}" || true
+        udevil mount -o ro "${LOOPDEV}" || true
     fi
 else
     usage

.bin/Scripts/settings/launchers.py

@@ -282,8 +282,8 @@ LAUNCHERS = {
         'Intel RST (Current Release)': {
             'L_TYPE': 'Executable',
             'L_PATH': '_Drivers\Intel RST',
-            'L_ITEM': 'SetupRST_16.0.exe',
+            'L_ITEM': 'SetupRST_16.5.exe',
-            'L_7ZIP': 'SetupRST_16.0.exe',
+            'L_7ZIP': 'SetupRST_16.5.exe',
             },
         'Intel RST (Previous Releases)': {
             'L_TYPE': 'Folder',
@@ -356,32 +356,6 @@ LAUNCHERS = {
             'L_ELEV': 'True',
             },
         },
-    r'Installers\Extras\Office\2013': {
-        'Home and Business 2013 (x32)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2013',
-            'L_ITEM': 'hb_32.xml',
-            'L_NCMD': 'True',
-            },
-        'Home and Business 2013 (x64)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2013',
-            'L_ITEM': 'hb_64.xml',
-            'L_NCMD': 'True',
-            },
-        'Home and Student 2013 (x32)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2013',
-            'L_ITEM': 'hs_32.xml',
-            'L_NCMD': 'True',
-            },
-        'Home and Student 2013 (x64)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2013',
-            'L_ITEM': 'hs_64.xml',
-            'L_NCMD': 'True',
-            },
-        },
     r'Installers\Extras\Office\2016': {
         'Home and Business 2016 (x32)': {
             'L_TYPE': 'Office',
@@ -475,10 +449,10 @@ LAUNCHERS = {
             'L_PATH': 'PuTTY',
             'L_ITEM': 'PUTTY.EXE',
             },
-        'TreeSizeFree': {
+        'WizTree': {
             'L_TYPE': 'Executable',
-            'L_PATH': 'TreeSizeFree',
+            'L_PATH': 'WizTree',
-            'L_ITEM': 'TreeSizeFree.exe',
+            'L_ITEM': 'WizTree.exe',
             'L_ELEV': 'True',
             },
         'Update Kit': {

.bin/Scripts/settings/sources.py

@@ -1,9 +1,10 @@
 # Wizard Kit: Settings - Sources
 
 SOURCE_URLS = {
+    'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1801120058/AcroRdrDC1801120058_en_US.exe',
+    'AdwCleaner': 'https://downloads.malwarebytes.com/file/adwcleaner',
     'AIDA64': 'http://download.aida64.com/aida64engineer597.zip',
-    'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1801120040/AcroRdrDC1801120040_en_US.exe',
+    'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0-win-32bit-build1.zip',
-    'AdwCleaner': 'https://toolslib.net/downloads/finish/1-adwcleaner/',
     'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip',
     'BleachBit': 'https://download.bleachbit.org/BleachBit-2.0-portable.zip',
     'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip',
@@ -14,44 +15,37 @@ SOURCE_URLS = {
     'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
     'Everything32': 'https://www.voidtools.com/Everything-1.4.1.895.x86.zip',
     'Everything64': 'https://www.voidtools.com/Everything-1.4.1.895.x64.zip',
-    'FastCopy32': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341.zip',
+    'FastCopy': 'http://ftp.vector.co.jp/70/64/2323/FastCopy354_installer.zip',
-    'FastCopy64': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341_x64.zip',
+    'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/1056733/ublock_origin-1.16.20-an+fx.xpi',
-    'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/956394/ublock_origin-1.16.6-an+fx.xpi',
-    'HWiNFO': 'http://app.oldfoss.com:81/download/HWiNFO/hwi_582.zip',
     'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
     'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
-    'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.3.0.13.paf.exe',
+    'HWiNFO': 'http://app.oldfoss.com:81/download/HWiNFO/hwi_588.zip',
     'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27656/eng/Intel%20SSD%20Toolbox%20-%20v3.5.2.exe',
+    'IOBit_Uninstaller': 'https://portableapps.duckduckgo.com/IObitUninstallerPortable_7.5.0.7.paf.exe',
     'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
-    'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.6/npp.7.5.6.bin.minimalist.7z',
+    'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.8/npp.7.5.8.bin.minimalist.7z',
-    'Office Deployment Tool 2013': 'https://download.microsoft.com/download/6/2/3/6230F7A2-D8A9-478B-AC5C-57091B632FCF/officedeploymenttool_x86_4827-1000.exe',
+    'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_10810.33603.exe',
-    'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_9326.3600.exe',
     'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip',
     'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip',
     'PuTTY': 'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip',
     'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/',
+    'Samsung Magician': 'https://s3.ap-northeast-2.amazonaws.com/global.semi.static/SAMSUNG_SSD_v5_2_1_180523/CD0CFAC4675B9E502899B41BE00525C3909ECE3AD57CC1A2FB6B74A766B2A1EA/Samsung_Magician_Installer.zip',
     'SDIO Themes': 'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip',
     'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
-    'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201801/20180123130636806/Samsung_Magician_Installer.exe',
     'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
     'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
-    'TreeSizeFree': 'https://www.jam-software.com/treesize_free/TreeSizeFree-Portable.zip',
     'wimlib32': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-i686-bin.zip',
     'wimlib64': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip',
     'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
-    'XMPlay 7z': 'http://support.xmplay.com/files/16/xmp-7z.zip?v=800962',
+    'WizTree': 'https://antibody-software.com/files/wiztree_3_26_portable.zip',
-    'XMPlay Game': 'http://support.xmplay.com/files/12/xmp-gme.zip?v=515637',
+    'XMPlay 7z': 'https://support.xmplay.com/files/16/xmp-7z.zip?v=800962',
-    'XMPlay RAR': 'http://support.xmplay.com/files/16/xmp-rar.zip?v=409646',
+    'XMPlay Game': 'https://support.xmplay.com/files/12/xmp-gme.zip?v=515637',
-    'XMPlay WAModern': 'http://support.xmplay.com/files/10/WAModern.zip?v=207099',
+    'XMPlay RAR': 'https://support.xmplay.com/files/16/xmp-rar.zip?v=409646',
-    'XMPlay': 'http://support.xmplay.com/files/20/xmplay383.zip?v=298195',
+    'XMPlay WAModern': 'https://support.xmplay.com/files/10/WAModern.zip?v=207099',
+    'XMPlay': 'https://support.xmplay.com/files/20/xmplay383.zip?v=298195',
     'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip',
-    'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip',
     }
 VCREDIST_SOURCES = {
-    '2008sp1': {
-        '32': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe',
-        '64': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe',
-        },
     '2010sp1': {
         '32': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe',
         '64': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe',
@@ -65,15 +59,14 @@ VCREDIST_SOURCES = {
         '64': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe',
         },
     '2017': {
-        '32': 'https://download.visualstudio.microsoft.com/download/pr/100349138/88b50ce70017bf10f2d56d60fcba6ab1/VC_redist.x86.exe',
+        '32': 'https://aka.ms/vs/15/release/vc_redist.x86.exe',
-        '64': 'https://download.visualstudio.microsoft.com/download/pr/100349091/2cd2dba5748dc95950a5c42c2d2d78e4/VC_redist.x64.exe',
+        '64': 'https://aka.ms/vs/15/release/vc_redist.x64.exe',
         },
     }
 NINITE_SOURCES = {
     'Bundles': {
-        'Runtimes.exe': '.net4.7.1-air-java8-silverlight',
+        'Legacy.exe': '.net4.7.2-7zip-chrome-firefox-vlc',
-        'Legacy.exe': '.net4.7.1-7zip-air-chrome-firefox-java8-silverlight-vlc',
+        'Modern.exe': '.net4.7.2-7zip-chrome-classicstart-firefox-vlc',
-        'Modern.exe': '.net4.7.1-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc',
         },
     'Audio-Video': {
         'AIMP.exe': 'aimp',
@@ -98,6 +91,7 @@ NINITE_SOURCES = {
         'SugarSync.exe': 'sugarsync',
         },
     'Communication': {
+        'Discord': 'discord',
         'Pidgin.exe': 'pidgin',
         'Skype.exe': 'skype',
         'Trillian.exe': 'trillian',
@@ -109,7 +103,6 @@ NINITE_SOURCES = {
         },
     'Developer': {
         'Eclipse.exe': 'eclipse',
-        'FileZilla.exe': 'filezilla',
         'JDK 8.exe': 'jdk8',
         'JDK 8 (x64).exe': 'jdkx8',
         'Notepad++.exe': 'notepadplusplus',
@@ -153,7 +146,7 @@ NINITE_SOURCES = {
         },
     'Runtimes': {
         'Adobe Air.exe': 'air',
-        'dotNET.exe': '.net4.7.1',
+        'dotNET.exe': '.net4.7.2',
         'Java 8.exe': 'java8',
         'Shockwave.exe': 'shockwave',
         'Silverlight.exe': 'silverlight',
@@ -197,6 +190,7 @@ RST_SOURCES = {
     'SetupRST_15.8.exe': 'https://downloadmirror.intel.com/27442/eng/SetupRST.exe',
     'SetupRST_15.9.exe': 'https://downloadmirror.intel.com/27400/eng/SetupRST.exe',
     'SetupRST_16.0.exe': 'https://downloadmirror.intel.com/27681/eng/SetupRST.exe',
+    'SetupRST_16.5.exe': 'https://downloadmirror.intel.com/27984/eng/SetupRST.exe',
     }
 
 

.bin/Scripts/update_kit.py

@@ -70,7 +70,7 @@ if __name__ == '__main__':
         try_and_print(message='FirefoxExtensions...', function=update_firefox_ublock_origin, other_results=other_results, width=40)
         try_and_print(message='PuTTY...', function=update_putty, other_results=other_results, width=40)
         try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results, width=40)
-        try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results, width=40)
+        try_and_print(message='WizTree...', function=update_wiztree, other_results=other_results, width=40)
         try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results, width=40)
         
         # Repairs

.bin/Scripts/wk-power-command

@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+## Wizard Kit: Wrapper for logout, reboot, & poweroff
+
+# Unmount filesystems
+find /media -maxdepth 1 -mindepth 1 -type d \
+  -exec udevil umount "{}" \;
+
+# Flush write cache
+sudo sync
+
+# Perform requested action
+case "${1:-x}" in
+  poweroff)
+    sudo systemctl poweroff;;
+  reboot)
+    sudo systemctl reboot;;
+  *)
+    openbox --exit;;
+esac
+exit 0

.cbin/_include/_vcredists/InstallAll.bat

@@ -1,9 +1,6 @@
 @echo off
 setlocal
 
-start "" /wait "2008sp1\x32\vcredist.exe" /qb! /norestart
-start "" /wait "2008sp1\x64\vcredist.exe" /qb! /norestart
-
 start "" /wait "2010\x32\vcredist.exe" /passive /norestart
 start "" /wait "2010\x64\vcredist.exe" /passive /norestart
 

.linux_items/authorized_keys

@@ -0,0 +1 @@
+#Put SSH keys here

.linux_items/include/EFI/boot/refind.conf

@@ -32,8 +32,8 @@ menuentry "Linux" {
         add_options "nox"
     }
 }
-menuentry "WindowsPE" {
+#UFD#menuentry "WindowsPE" {
-    ostype windows
+#UFD#    ostype windows
-    icon /EFI/boot/icons/wk_win.png
+#UFD#    icon /EFI/boot/icons/wk_win.png
-    loader /EFI/microsoft/bootx64.efi
+#UFD#    loader /EFI/microsoft/bootx64.efi
-}
+#UFD#}

.linux_items/include/airootfs/etc/modprobe.d/broadcom.conf

@@ -0,0 +1 @@
+softdep tg3 pre: broadcom

.linux_items/include/airootfs/etc/oblogout.conf

@@ -15,6 +15,6 @@ restart = R
 logout = L
 
 [commands]
-shutdown = systemctl poweroff
+shutdown = /usr/local/bin/wk-power-command poweroff
-restart = systemctl reboot
+restart = /usr/local/bin/wk-power-command reboot
-logout = openbox --exit
+logout = /usr/local/bin/wk-power-command logout

.linux_items/include/airootfs/etc/pydfrc

@@ -0,0 +1,24 @@
+normal_colour = 'default'
+header_colour = 'blue'
+local_fs_colour = 'default'
+remote_fs_colour = 'green'
+special_fs_colour = 'yellow'
+readonly_fs_colour = 'cyan'
+filled_fs_colour = 'red'
+full_fs_colour = 'on_red', 'green', 'blink'
+sizeformat = "-h"
+column_separator = ' '
+column_separator_colour = 'none'
+stretch_screen = 0.3
+FILL_THRESH = 75.0
+FULL_THRESH = 85.0
+format = [    
+            ('fs', 10, "l"), ('size', 5, "r"), 
+            ('used', 5, "r"), ('avail', 5, "r"), ('perc', 5, "r"),
+            ('bar', 0.1, "l"), ('on', 11, "l")
+         ]
+barchar = '#'
+bar_fillchar = '.'
+hidebinds = True
+mountfile = ['/etc/mtab', '/etc/mnttab', '/proc/mounts']
+

.linux_items/include/airootfs/etc/skel/.Xresources

@@ -53,6 +53,7 @@ URxvt.transparent:	true
 *.color15:      #ffffff
 
 ! fonts
+!Xft.dpi: 192
 Xft.autohint: 0
 Xft.antialias: 1
 Xft.hinting: true

.linux_items/include/airootfs/etc/skel/.aliases

@@ -4,9 +4,11 @@ alias 7z3='7z a -t7z -mx=3'
 alias 7z5='7z a -t7z -mx=5'
 alias 7z7='7z a -t7z -mx=7'
 alias 7z9='7z a -t7z -mx=9'
+alias ddrescue='sudo ddrescue --ask --min-read-rate=64k -vvvv'
 alias diff='colordiff -ur'
 alias du='du -sch --apparent-size'
 alias fix-perms='find -type d -exec chmod 755 "{}" \; && find -type f -exec chmod 644 "{}" \;'
+alias hexedit='hexedit --color'
 alias hw-info='sudo hw-info | less -S'
 alias inxi='echo -e "\e[33mWARNING: inxi is being replaced and will be removed in a future WizardKit release\e[0m"; echo -e "    \e[32mReplacements include:\e[0m 'hw-drive-info', 'hw-info', & 'hw-sensors'"; echo ""; inxi'
 alias less='less -S'
@@ -34,3 +36,5 @@ alias srsz='sudo rsync -avhzPS --stats --exclude-from="$HOME/.rsync_exclusions"'
 alias testdisk='sudo testdisk'
 alias umount='sudo umount'
 alias unmount='sudo umount'
+alias wkclone='sudo ddrescue-tui clone'
+alias wkimage='sudo ddrescue-tui image'

.linux_items/include/airootfs/etc/skel/.config/i3/config

@@ -73,7 +73,7 @@ bindsym $mod+f exec "thunar ~"
 bindsym $mod+i exec "hardinfo"
 bindsym $mod+m exec "urxvt -title 'Mount All Volumes' -e mount-all-volumes gui"
 bindsym $mod+s exec "urxvt -title 'Hardware Diagnostics' -e hw-diags quick"
-bindsym $mod+t exec "urxvt"
+bindsym $mod+t exec "urxvt -e zsh -c 'tmux new-session -A -t general; zsh'"
 bindsym $mod+v exec "urxvt -title 'Hardware Sensors' -e watch -c -n1 -t hw-sensors"
 bindsym $mod+w exec "firefox"
 

.linux_items/include/airootfs/etc/skel/.config/openbox/autostart

@@ -17,3 +17,4 @@
 #xfce-mcs-manager &
 
 tint2 &
+cbatticon --hide-notification &

.linux_items/include/airootfs/etc/skel/.config/openbox/rc.xml

@@ -329,7 +329,7 @@
     </keybind>
     <keybind key="W-t">
       <action name="Execute">
-        <command>urxvt</command>
+        <command>urxvt -e zsh -c 'tmux new-session -A -t general; zsh'</command>
       </action>
     </keybind>
     <keybind key="W-v">

.linux_items/include/airootfs/etc/skel/.conkyrc

@@ -37,7 +37,7 @@ minimum_size 180 0  ### width | height
 maximum_width 180
 
 gap_x 20    ### left | right
-gap_y 45    ### up | down
+gap_y 24    ### up | down
 
 alignment tr
 #######################  End Window Settings  ###
@@ -143,15 +143,14 @@ Uptime:${alignr}${uptime_short}
 CPU: ${if_match ${cpu cpu0}<10}  ${cpu cpu0}\
 ${else}${if_match ${cpu cpu0}<100} ${cpu cpu0}\
 ${else}${cpu cpu0}${endif}${endif}% Used${alignr}${freq_g} GHz
-${cpugraph cpu0 20,180 ${color} ${color}}
+${cpugraph cpu0 ${gap_x},${width} ${color} ${color}}
 RAM: ${mem} Used${alignr}${memmax}
-${memgraph 20,180 ${color} ${color}}
+${memgraph ${gap_x},${width} ${color} ${color}}
 Disk I/O:
-${diskiograph 20,180 ${color} ${color}}
+${diskiograph ${gap_x},${width} ${color} ${color}}
 Down:  ${downspeed}${goto 115}Up:${alignr}${upspeed}
 
 #Network
-
 ${alignc}S H O R T C U T    K E Y S
 ${hr}
 [Super] + d${alignr}HW Diagnostics

.linux_items/include/airootfs/etc/skel/.update_conky

@@ -3,14 +3,16 @@
 IF_LIST=($(ip l | egrep '^[0-9]+:\s+(eth|en|wl)' | sed -r 's/^[0-9]+:\s+(\w+):.*/\1/' | sort))
 
 # Add interfaces to conkyrc
-for i in "${IF_LIST[@]}"; do
+if fgrep '#Network' $HOME/.conkyrc; then
+    for i in "${IF_LIST[@]}"; do
         if [[ "${i:0:1}" == "e" ]]; then
-        sed -i -r "s/#Network/Wired:\${alignr}\${addr $i}\n#Network/" ~/.conkyrc
+            sed -i -r "s/#Network/Wired:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc
         else
-        sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" ~/.conkyrc
+            sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc
         fi
-done
+    done
 
-# Remove '#Network' line to prevent duplicating lines if this script is re-run
+    # Remove '#Network' line to prevent duplicating lines if this script is re-run
-sed -i -r "s/#Network//" ~/.conkyrc
+    sed -i -r "s/#Network//" $HOME/.conkyrc
+fi
 

.linux_items/include/airootfs/etc/skel/.update_dpi_settings

@@ -0,0 +1,68 @@
+#!/bin/env bash
+#
+## Calculate DPI and adjust display settings if necesary
+
+REGEX_XRANDR='^.* ([0-9]+)x([0-9]+)\+[0-9]+\+[0-9]+.* ([0-9]+)mm x ([0-9]+)mm.*$'
+REGEX_URXVT='(URxvt.geometry:\s+).*'
+
+# Get screen data
+xrandr_str="$(xrandr | grep mm | head -1)"
+width_px="$(echo "${xrandr_str}" | sed -r "s/${REGEX_XRANDR}/\1/")"
+height_px="$(echo "${xrandr_str}" | sed -r "s/${REGEX_XRANDR}/\2/")"
+width_mm="$(echo "${xrandr_str}" | sed -r "s/${REGEX_XRANDR}/\3/")"
+height_mm="$(echo "${xrandr_str}" | sed -r "s/${REGEX_XRANDR}/\4/")"
+
+# Convert to in
+width_in="$(echo "${width_mm} * 0.03937" | bc)"
+height_in="$(echo "${height_mm} * 0.03937" | bc)"
+
+# Calculate diagonals
+diag_px="$(echo "sqrt(${width_px}^2 + ${height_px}^2)" | bc)"
+diag_in="$(echo "sqrt(${width_in}^2 + ${height_in}^2)" | bc)"
+
+# Calculate DPI
+dpi="$(echo "${diag_px} / ${diag_in}" | bc 2>/dev/null || True)"
+dpi="${dpi:-0}"
+
+# Calculate URxvt default window size
+width_urxvt="$(echo "${width_px} * 112/1280" | bc)"
+height_urxvt="$(echo "${height_px} * 33/720" | bc)"
+offset_urxvt="24"
+
+# Update settings if necessary
+if [[ "${dpi}" -ge 192 ]]; then
+  # Conky
+  sed -i 's/minimum_size 180 0/minimum_size 360 0/' "${HOME}/.conkyrc"
+  sed -i 's/maximum_width 180/maximum_width 360/' "${HOME}/.conkyrc"
+  sed -i 's/gap_x 20/gap_x 40/' "${HOME}/.conkyrc"
+  sed -i 's/gap_y 24/gap_y 48/' "${HOME}/.conkyrc"
+
+  # Fonts
+  sed -i 's/!Xft.dpi: 192/Xft.dpi: 192/' "${HOME}/.Xresources"
+
+  # GDK
+  export GDK_SCALE=2
+  export GDK_DPI_SCALE=0.5
+
+  # i3
+  sed -i -r 's/(height\s+) 26/\1 52/' "${HOME}/.config/i3/config"
+
+  # Tint2
+  sed -i 's/panel_size = 100% 30/panel_size = 100% 60/' \
+    "${HOME}/.config/tint2/tint2rc"
+  sed -i 's/Inconsolata 10/Inconsolata 20/g' \
+    "${HOME}/.config/tint2/tint2rc"
+  sed -i 's/Inconsolata 12/Inconsolata 24/g' \
+    "${HOME}/.config/tint2/tint2rc"
+  sed -i 's/systray_icon_size = 24/systray_icon_size = 48/' \
+    "${HOME}/.config/tint2/tint2rc"
+
+  # URxvt
+  width_urxvt="$(echo "${width_urxvt} / 2" | bc)"
+  height_urxvt="$(echo "${height_urxvt} / 2" | bc)"
+  offset_urxvt="$(echo "${offset_urxvt} * 2" | bc)"
+fi
+
+# Update URxvt (Always)
+urxvt_geometry="${width_urxvt}x${height_urxvt}+${offset_urxvt}+${offset_urxvt}"
+sed -i -r "s/${REGEX_URXVT}/\1${urxvt_geometry}/" "${HOME}/.Xresources"

.linux_items/include/airootfs/etc/skel/.update_hostname

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+IP="$(ip a show scope global \
+  | grep inet \
+  | head -1 \
+  | sed -r 's#.*inet ([0-9]+.[0-9]+.[0-9]+.[0-9]+.)/.*#\1#')"
+HOSTNAME="$(dig +noall +answer +short -x "$IP" \
+  | head -1 \
+  | sed 's/\.$//')"
+
+# Set hostname and renew DHCP lease
+sudo hostnamectl set-hostname "${HOSTNAME}"
+sudo dhclient -r
+sleep 1
+sudo dhclient
+

.linux_items/include/airootfs/etc/skel/.update_wallpaper

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-BOOT_PATH="/run/archiso/bootmnt/arch/"
-BURNED_IN="/usr/share/wallpaper/burned.in"
-WALLPAPER="$HOME/.wallpaper.png"
-
-function link_wall() {
-    sudo rm "$WALLPAPER"
-    sudo ln -s "$1" "$WALLPAPER"
-}
-
-# Check for wallpaper
-## Checks BOOT_PATH and uses the BURNED_IN file if nothing is found
-for f in "$BOOT_PATH"/{Arch,arch}.{jpg,png} "$BURNED_IN"; do
-    if [[ -f "$f" ]]; then
-        link_wall "$f"
-        break
-    fi
-done
-
-feh --bg-fill "$WALLPAPER"

.linux_items/include/airootfs/etc/skel/.urxvt_default_res

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-XWIDTH="$(xrandr 2>/dev/null | grep '*' | sed -r 's/^\s+([0-9]+)x.*/\1/')"
-XHEIGHT="$(xrandr 2>/dev/null | grep '*' | sed -r 's/^\s+[0-9]+x([0-9]+).*/\1/')"
-
-WIDTH="$(echo "${XWIDTH}*92/1024" | bc)"
-HEIGHT="$(echo "${XHEIGHT}*32/768" | bc)"
-
-sed -i -r "s/(URxvt.geometry:\s+).*/\1${WIDTH}x${HEIGHT}+24+24/" ~/.Xresources
-xrdb -merge ~/.Xresources

.linux_items/include/airootfs/etc/skel/.wallpaper

@@ -0,0 +1 @@
+/usr/share/wallpaper/burned.in

.linux_items/include/airootfs/etc/skel/.xinitrc

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 dbus-update-activation-environment --systemd DISPLAY
+$HOME/.update_dpi_settings
 xrdb -merge $HOME/.Xresources
 xset s off
 xset -dpms
@@ -10,11 +11,9 @@ compton --backend xrender --xrender-sync --xrender-sync-fence &
 sleep 1s
 conky -d
 nm-applet &
-cbatticon &
 volumeicon &
 connect-to-network &
-(sleep 5s && killall dunst) &
+$HOME/.update_hostname &
-$HOME/.urxvt_default_res &
+feh --bg-fill "$HOME/.wallpaper" &
-$HOME/.update_wallpaper &
+x0vncserver -display :0 -passwordfile $HOME/.vnc/passwd -AlwaysShared &
-$HOME/.update_conky &
 exec openbox-session

.linux_items/include/airootfs/etc/skel/.zlogin

@@ -1,9 +1,15 @@
 setterm -blank 0 -powerdown 0
 if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
+    # Update settings if using i3
     if fgrep -q "i3" /proc/cmdline; then
         sed -i -r 's/#(own_window_type override)/\1/' ~/.conkyrc
         sed -i -r 's/openbox-session/i3/' ~/.xinitrc
     fi
+
+    # Update Conky
+    $HOME/.update_conky
+
+    # Start X or HW-diags
     if ! fgrep -q "nox" /proc/cmdline; then
         startx >/dev/null
     else

.linux_items/include/airootfs/etc/ufw/user.rules

@@ -21,6 +21,9 @@
 -A ufw-user-input -p tcp --dport 22 -j ACCEPT
 -A ufw-user-input -p udp --dport 22 -j ACCEPT
 
+### tuple ### allow tcp 5900 0.0.0.0/0 any 0.0.0.0/0 VNC - in
+-A ufw-user-input -p tcp --dport 5900 -j ACCEPT -m comment --comment 'dapp_VNC'
+
 ### END RULES ###
 
 ### LOGGING ###

.linux_items/include/airootfs/etc/ufw/user6.rules

@@ -21,6 +21,9 @@
 -A ufw6-user-input -p tcp --dport 22 -j ACCEPT
 -A ufw6-user-input -p udp --dport 22 -j ACCEPT
 
+### tuple ### allow tcp 5900 ::/0 any ::/0 VNC - in
+-A ufw6-user-input -p tcp --dport 5900 -j ACCEPT -m comment --comment 'dapp_VNC'
+
 ### END RULES ###
 
 ### LOGGING ###

.linux_items/include/syslinux/wk_pxe.cfg

@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/wk_head.cfg
 MENU BACKGROUND pxelinux.png
 
 INCLUDE boot/syslinux/wk_pxe_linux.cfg
-INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
 INCLUDE boot/syslinux/wk_pxe_extras_entry.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg

.linux_items/include/syslinux/wk_pxe_extras.cfg

@@ -3,7 +3,7 @@ MENU BACKGROUND pxelinux.png
 
 INCLUDE boot/syslinux/wk_pxe_linux.cfg
 INCLUDE boot/syslinux/wk_pxe_linux_extras.cfg
-INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
 INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg

.linux_items/include/syslinux/wk_sys.cfg

@@ -1,7 +1,7 @@
 INCLUDE boot/syslinux/wk_head.cfg
 
 INCLUDE boot/syslinux/wk_sys_linux.cfg
-INCLUDE boot/syslinux/wk_sys_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 INCLUDE boot/syslinux/wk_sys_extras_entry.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg

.linux_items/include/syslinux/wk_sys_extras.cfg

@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/wk_head.cfg
 
 INCLUDE boot/syslinux/wk_sys_linux.cfg
 INCLUDE boot/syslinux/wk_sys_linux_extras.cfg
-INCLUDE boot/syslinux/wk_sys_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg

.linux_items/packages/live_add

@@ -76,6 +76,7 @@ spice-vdagent
 terminus-font
 testdisk-wip
 thunar
+tigervnc
 tint2
 tk
 tmux

Build Linux

@@ -190,9 +190,9 @@ function update_live_env() {
     
     # Live packages
     while read -r p; do
-        sed -i "/$p/d" "$LIVE_DIR/packages.both"
+        sed -i "/$p/d" "$LIVE_DIR/packages.x86_64"
     done < "$ROOT_DIR/.linux_items/packages/live_remove"
-    cat "$ROOT_DIR/.linux_items/packages/live_add" >> "$LIVE_DIR/packages.both"
+    cat "$ROOT_DIR/.linux_items/packages/live_add" >> "$LIVE_DIR/packages.x86_64"
     echo "[custom]" >> "$LIVE_DIR/pacman.conf"
     echo "SigLevel = Optional TrustAll" >> "$LIVE_DIR/pacman.conf"
     echo "Server = file://$REPO_DIR" >> "$LIVE_DIR/pacman.conf"
@@ -220,12 +220,17 @@ function update_live_env() {
     sed -i -r 's/^(.*pacman-init.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     sed -i -r 's/^(.*choose-mirror.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
 
+    # Shutdown stall fix
+    echo "sed -i -r 's/^.*(DefaultTimeoutStartSec)=.*$/\1=15s/' /etc/systemd/system.conf" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    echo "sed -i -r 's/^.*(DefaultTimeoutStopSec)=.*$/\1=15s/' /etc/systemd/system.conf" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    
     # SSH
     mkdir -p "$SKEL_DIR/.ssh"
     ssh-keygen -b 4096 -C "$username@$hostname" -N "" -f "$SKEL_DIR/.ssh/id_rsa"
     echo 'rm /root/.ssh/id*' >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     echo 'rm /root/.zlogin' >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
-    sed -i -r 's/^(.*PermitRootLogin.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    sed -r '/.*PermitRootLogin.*/d' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    cp "$ROOT_DIR/.linux_items/authorized_keys" "$SKEL_DIR/.ssh/authorized_keys"
     
     # Root user
     echo "echo 'root:$ROOT_PASSWORD' | chpasswd" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
@@ -251,6 +256,10 @@ function update_live_env() {
     # udevil fix
     echo "mkdir /media" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
 
+    # VNC password
+    echo "mkdir '/home/$username/.vnc'" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+    echo "echo '$TECH_PASSWORD' | vncpasswd -f > '/home/$username/.vnc/passwd'" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
+
     # Wallpaper
     mkdir -p "$LIVE_DIR/airootfs/usr/share/wallpaper"
     cp "$ROOT_DIR/Images/Linux.png" "$LIVE_DIR/airootfs/usr/share/wallpaper/burned.in"
@@ -317,10 +326,12 @@ function build_iso() {
 
     # Removing cached (and possibly outdated) custom repo packages
     for package in $(cat "$ROOT_DIR/.linux_items/packages/aur"); do
-        if [[ -f /var/cache/pacman/pkg/${package}* ]]; then
+        for p in /var/cache/pacman/pkg/*${package}*; do
-            rm /var/cache/pacman/pkg/${package}*
+            if [[ -f "${p}" ]]; then
+                rm "${p}"
             fi
         done
+    done
     
     # Build ISO
     prefix="${KIT_NAME_SHORT}-Linux"