.bin/Scripts/Launch.cmd

@@ -263,7 +263,6 @@ call :ExtractOrFindPath || goto ErrorProgramNotFound
 set "script=%_path%\%L_ITEM%"
 
 rem Verify
-"%PYTHON%" --version >nul || goto ErrorPythonUnsupported
 if not exist "%script%" goto ErrorScriptNotFound
 
 rem Run
@@ -436,16 +435,6 @@ echo ERROR: Office version not supported by this script.
 start "" "explorer.exe" "%client_dir%\Office"
 goto Abort
 
-:ErrorPythonUnsupported
-rem The Windows installation lacks Windows update KB2999226 needed to run Python
-echo.
-echo ERROR: Failed to run Python, try installing Windows update KB2999226.
-echo NOTE: That update is from October 2015 so this system is SEVERELY outdated
-if exist "%bin%\..\Installers\Extras\Windows Updates" (
-  start "" "explorer.exe" "%bin%\..\Installers\Extras\Windows Updates"
-)
-goto Abort
-
 :ErrorQuickBooksSourceNotFound
 echo.
 echo ERROR: QuickBooks source "%L_ITEM%" not found.
@@ -497,7 +486,7 @@ echo Press any key to exit...
 pause>nul
 rem reset color and reset errorlevel to 0
 rem NOTE: This is done to avoid causing a ErrorLaunchCMD in the launcher.cmd
-color 07
+color
 goto Exit
 
 :: Cleanup and exit ::

.bin/Scripts/activate.py

@@ -55,8 +55,8 @@ if __name__ == '__main__':
     print_success('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/add-known-networks

@@ -1,81 +0,0 @@
-#!/bin/env python3
-#
-## Convert saved WiFi connections for NetworkManager
-
-import os
-import re
-import sys
-import uuid
-
-KNOWN_NETWORKS = '/root/known_networks'
-TEMPLATE = '''[connection]
-id={ssid}
-uuid={uuid}
-type=wifi
-permissions=user:{user}:;
-
-[wifi]
-mac-address-blacklist=
-mode=infrastructure
-ssid={ssid}
-
-[wifi-security]
-auth-alg=open
-key-mgmt=wpa-psk
-psk={password}
-
-[ipv4]
-dns-search=
-method=auto
-
-[ipv6]
-addr-gen-mode=stable-privacy
-dns-search=
-method=auto
-'''
-
-def get_user_name():
-  """Get user name, returns str."""
-  user = None
-
-  # Get running user
-  if 'SUDO_USER' in os.environ:
-    user = os.environ.get('SUDO_USER')
-  else:
-    user = os.environ.get('USER')
-
-  # Check if user manually specified
-  for a in sys.argv:
-    a = a.strip().lower()
-    if a.startswith('--user='):
-      user = a.replace('--user=', '')
-
-  return user
-
-if __name__ == '__main__':
-  known_networks = {}
-  #try:
-  with open('/root/known_networks', 'r') as f:
-    for line in f.readlines():
-      r = re.search(r"^'(.*)':\s+'(.*)'", line.strip())
-      if r:
-        known_networks[r.group(1)] = r.group(2)
-  for ssid, password in known_networks.items():
-    out_path = '{}/{}.nmconnection'.format(
-      '/etc/NetworkManager/system-connections',
-      ssid,
-      )
-    if not os.path.exists(out_path):
-      with open(out_path, 'w') as f:
-        f.write(TEMPLATE.format(
-          user=get_user_name(),
-          ssid=ssid,
-          password=password,
-          uuid=uuid.uuid4(),
-          ))
-    os.chmod(out_path, 0o600)
-  #except:
-  #  # Meh
-  #  pass
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/build-ufd

@@ -1,149 +1,622 @@
-#!/bin/env python3
+#!/usr/bin/env bash
 #
-# pylint: disable=no-name-in-module,wildcard-import,wrong-import-position
-# vim: sts=2 sw=2 ts=2
-"""Wizard Kit: UFD build tool"""
+## Wizard Kit: UFD Build Tool
+#
+# Based on a template by BASH3 Boilerplate v2.3.0
+# http://bash3boilerplate.sh/#authors
+#
+# The MIT License (MIT)
+# Copyright (c) 2013 Kevin van Zonneveld and contributors
+# You are not obligated to bundle the LICENSE file with your b3bp projects as long
+# as you leave these references intact in the header comments of your source files.
 
-import os
-import sys
+# Exit on error. Append "|| true" if you expect an error.
+set -o errexit
+# Exit on error inside any functions or subshells.
+set -o errtrace
+# Do not allow use of undefined vars. Use ${VAR:-} to use an undefined VAR
+set -o nounset
+# Catch the error in case mysqldump fails (but gzip succeeds) in `mysqldump |gzip`
+set -o pipefail
+# Turn on traces, useful while debugging but commented out by default
+# set -o xtrace
 
-# Init
-sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from docopt import docopt
-from functions.common import *
-from functions.ufd import *
-from settings.ufd import *
-init_global_vars(silent=True)
+if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
+  __i_am_main_script="0" # false
 
-# Main section
-if __name__ == '__main__':
-  # pylint: disable=invalid-name
-  # Set log
-  try:
-    global_vars['LogDir'] = '{}/Logs'.format(
-      get_user_home(get_user_name()))
-    set_log_file('Build UFD ({Date-Time}).log'.format(**global_vars))
-  except: # pylint: disable=bare-except
-    major_exception()
+  if [[ "${__usage+x}" ]]; then
+    if [[ "${BASH_SOURCE[1]}" = "${0}" ]]; then
+      __i_am_main_script="1" # true
+    fi
 
-  # Header
-  print_success(KIT_NAME_FULL)
-  print_standard('UFD Build Tool')
-  print_standard(' ')
+    __b3bp_external_usage="true"
+    __b3bp_tmp_source_idx=1
+  fi
+else
+  __i_am_main_script="1" # true
+  [[ "${__usage+x}" ]] && unset -v __usage
+  [[ "${__helptext+x}" ]] && unset -v __helptext
+fi
 
-  # Check if running as root
-  if not running_as_root():
-    print_error('ERROR: This script is meant to be run as root.')
-    abort(False)
+# Set magic variables for current file, directory, os, etc.
+__dir="$(cd "$(dirname "${BASH_SOURCE[${__b3bp_tmp_source_idx:-0}]}")" && pwd)"
+__file="${__dir}/$(basename "${BASH_SOURCE[${__b3bp_tmp_source_idx:-0}]}")"
+__base="$(basename "${__file}" .sh)"
+__wd="$(pwd)"
+__usage_example="Usage: sudo $(basename "${0}") --ufd-device [device] --linux-iso [path] --main-kit [path] --winpe-iso [path]"
+__all_args=""
+for a in "${@}"; do
+    if [[ "${a:0:1}" == "-" ]]; then
+        __all_args="${__all_args} ${a}"
+    else
+        __all_args="${__all_args} \"${a}\""
+    fi
+done
 
-  # Docopt
-  try:
-    args = docopt(DOCSTRING)
-  except SystemExit as sys_exit:
-    # Catch docopt exits
-    exit_script(sys_exit.code)
-  except: # pylint: disable=bare-except
-    major_exception()
 
-  try:
-    # Verify selections
-    ufd_dev = verify_ufd(args['--ufd-device'])
-    sources = verify_sources(args, UFD_SOURCES)
-    show_selections(args, sources, ufd_dev, UFD_SOURCES)
-    if not args['--force']:
-      confirm_selections(args)
+# Define the environment variables (and their defaults) that this script depends on
+LOG_LEVEL="${LOG_LEVEL:-6}" # 7 = debug -> 0 = emergency
+NO_COLOR="${NO_COLOR:-}"    # true = disable color. otherwise autodetected
 
-    # Prep UFD
-    if not args['--update']:
-      print_info('Prep UFD')
-      prep_device(ufd_dev, UFD_LABEL, use_mbr=args['--use-mbr'])
 
-    # Mount UFD
-    try_and_print(
-      indent=2,
-      message='Mounting UFD...',
-      function=mount,
-      mount_source=find_first_partition(ufd_dev),
-      mount_point='/mnt/UFD',
-      read_write=True,
-      )
+### Functions
+##############################################################################
 
-    # Remove Arch folder
-    if args['--update']:
-      try_and_print(
-        indent=2,
-        message='Removing Linux...',
-        function=remove_arch,
-        )
+function __b3bp_log () {
+  local log_level="${1}"
+  shift
 
-    # Copy sources
-    print_standard(' ')
-    print_info('Copy Sources')
-    for s_label, s_path in sources.items():
-      try_and_print(
-        indent=2,
-        message='Copying {}...'.format(s_label),
-        function=copy_source,
-        source=s_path,
-        items=ITEMS[s_label],
-        overwrite=True,
-        )
+  # shellcheck disable=SC2034
+  local color_debug="\x1b[35m"
+  # shellcheck disable=SC2034
+  local color_info="\x1b[32m"
+  # shellcheck disable=SC2034
+  local color_notice="\x1b[34m"
+  # shellcheck disable=SC2034
+  local color_warning="\x1b[33m"
+  # shellcheck disable=SC2034
+  local color_error="\x1b[31m"
+  # shellcheck disable=SC2034
+  local color_critical="\x1b[1;31m"
+  # shellcheck disable=SC2034
+  local color_alert="\x1b[1;33;41m"
+  # shellcheck disable=SC2034
+  local color_emergency="\x1b[1;4;5;33;41m"
 
-    # Update boot entries
-    print_standard(' ')
-    print_info('Boot Setup')
-    try_and_print(
-      indent=2,
-      message='Updating boot entries...',
-      function=update_boot_entries,
-      boot_entries=BOOT_ENTRIES,
-      boot_files=BOOT_FILES,
-      iso_label=ISO_LABEL,
-      ufd_label=UFD_LABEL,
-      )
+  local colorvar="color_${log_level}"
 
-    # Install syslinux (to partition)
-    try_and_print(
-      indent=2,
-      message='Syslinux (partition)...',
-      function=install_syslinux_to_partition,
-      partition=find_first_partition(ufd_dev),
-      )
+  local color="${!colorvar:-${color_error}}"
+  local color_reset="\x1b[0m"
 
-    # Unmount UFD
-    try_and_print(
-      indent=2,
-      message='Unmounting UFD...',
-      function=unmount,
-      mount_point='/mnt/UFD',
-      )
+  if [[ "${NO_COLOR:-}" = "true" ]] || ( [[ "${TERM:-}" != *"256color"* ]] && [[ "${TERM:-}" != "xterm"* ]] && [[ "${TERM:-}" != "screen"* ]] ) || [[ ! -t 2 ]]; then
+    if [[ "${NO_COLOR:-}" != "false" ]]; then
+      # Don't use colors on pipes or non-recognized terminals
+      color=""; color_reset=""
+    fi
+  fi
 
-    # Install syslinux (to device)
-    try_and_print(
-      indent=2,
-      message='Syslinux (device)...',
-      function=install_syslinux_to_dev,
-      ufd_dev=ufd_dev,
-      use_mbr=args['--use-mbr'],
-      )
+  # all remaining arguments are to be printed
+  local log_line=""
 
-    # Hide items
-    print_standard(' ')
-    print_info('Final Touches')
-    try_and_print(
-      indent=2,
-      message='Hiding items...',
-      function=hide_items,
-      ufd_dev=ufd_dev,
-      items=ITEMS_HIDDEN,
-      )
+  while IFS=$'\n' read -r log_line; do
+    echo -e "$(date -u +"%Y-%m-%d %H:%M:%S UTC") ${color}$(printf "[%9s]" "${log_level}")${color_reset} ${log_line}" 1>&2
+  done <<< "${@:-}"
+}
 
-    # Done
-    if not args['--force']:
-      print_standard('\nDone.')
-      pause('Press Enter to exit...')
-    exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
-  except: # pylint: disable=bare-except
-    major_exception()
+function emergency () {                                __b3bp_log emergency "${@}"; exit 1; }
+function alert ()     { [[ "${LOG_LEVEL:-0}" -ge 1 ]] && __b3bp_log alert "${@}"; true; }
+function critical ()  { [[ "${LOG_LEVEL:-0}" -ge 2 ]] && __b3bp_log critical "${@}"; true; }
+function error ()     { [[ "${LOG_LEVEL:-0}" -ge 3 ]] && __b3bp_log error "${@}"; true; }
+function warning ()   { [[ "${LOG_LEVEL:-0}" -ge 4 ]] && __b3bp_log warning "${@}"; true; }
+function notice ()    { [[ "${LOG_LEVEL:-0}" -ge 5 ]] && __b3bp_log notice "${@}"; true; }
+function info ()      { [[ "${LOG_LEVEL:-0}" -ge 6 ]] && __b3bp_log info "${@}"; true; }
+function debug ()     { [[ "${LOG_LEVEL:-0}" -ge 7 ]] && __b3bp_log debug "${@}"; true; }
+
+function help () {
+  echo "" 1>&2
+  echo " ${*}" 1>&2
+  echo "" 1>&2
+  echo "  ${__usage:-No usage available}" 1>&2
+  echo "" 1>&2
+
+  if [[ "${__helptext:-}" ]]; then
+    echo " ${__helptext}" 1>&2
+    echo "" 1>&2
+  fi
+
+  exit 1
+}
+
+
+### Parse commandline options
+##############################################################################
+
+# Commandline options. This defines the usage page, and is used to parse cli
+# opts & defaults from. The parsing is unforgiving so be precise in your syntax
+# - A short option must be preset for every long option; but every short option
+#   need not have a long option
+# - `--` is respected as the separator between options and arguments
+# - We do not bash-expand defaults, so setting '~/app' as a default will not resolve to ${HOME}.
+#   you can use bash variables to work around this (so use ${HOME} instead)
+
+# shellcheck disable=SC2015
+[[ "${__usage+x}" ]] || read -r -d '' __usage <<-'EOF' || true # exits non-zero when EOF encountered
+  OPTIONS:
+  -u --ufd-device [arg] Device to which the kit will be applied
+  -m --main-kit   [arg] Path to the Main Kit
+  -l --linux-iso  [arg] Path to the Linux ISO
+  -w --winpe-iso  [arg] Path to the WinPE ISO
+
+  -e --extra-dir  [arg] Path to the Extra folder (optional)
+  -h --help             This page
+
+  ADVANCED:
+  -d --debug            Enable debug mode
+  -v --verbose          Enable verbose mode
+  -M --use-mbr          Use real MBR instead of GPT w/ Protective MBR
+  -F --force            Bypass all confirmation messages. USE WITH EXTREME CAUTION!
+EOF
+
+# shellcheck disable=SC2015
+[[ "${__helptext+x}" ]] || read -r -d '' __helptext <<-'EOF' || true # exits non-zero when EOF encountered
+ Paths can be relative to the current working directory or absolute
+EOF
+
+# Translate usage string -> getopts arguments, and set $arg_<flag> defaults
+while read -r __b3bp_tmp_line; do
+  if [[ "${__b3bp_tmp_line}" =~ ^- ]]; then
+    # fetch single character version of option string
+    __b3bp_tmp_opt="${__b3bp_tmp_line%% *}"
+    __b3bp_tmp_opt="${__b3bp_tmp_opt:1}"
+
+    # fetch long version if present
+    __b3bp_tmp_long_opt=""
+
+    if [[ "${__b3bp_tmp_line}" = *"--"* ]]; then
+      __b3bp_tmp_long_opt="${__b3bp_tmp_line#*--}"
+      __b3bp_tmp_long_opt="${__b3bp_tmp_long_opt%% *}"
+    fi
+
+    # map opt long name to+from opt short name
+    printf -v "__b3bp_tmp_opt_long2short_${__b3bp_tmp_long_opt//-/_}" '%s' "${__b3bp_tmp_opt}"
+    printf -v "__b3bp_tmp_opt_short2long_${__b3bp_tmp_opt}" '%s' "${__b3bp_tmp_long_opt//-/_}"
+
+    # check if option takes an argument
+    if [[ "${__b3bp_tmp_line}" =~ \[.*\] ]]; then
+      __b3bp_tmp_opt="${__b3bp_tmp_opt}:" # add : if opt has arg
+      __b3bp_tmp_init=""  # it has an arg. init with ""
+      printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "1"
+    elif [[ "${__b3bp_tmp_line}" =~ \{.*\} ]]; then
+      __b3bp_tmp_opt="${__b3bp_tmp_opt}:" # add : if opt has arg
+      __b3bp_tmp_init=""  # it has an arg. init with ""
+      # remember that this option requires an argument
+      printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "2"
+    else
+      __b3bp_tmp_init="0" # it's a flag. init with 0
+      printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "0"
+    fi
+    __b3bp_tmp_opts="${__b3bp_tmp_opts:-}${__b3bp_tmp_opt}"
+  fi
+
+  [[ "${__b3bp_tmp_opt:-}" ]] || continue
+
+  if [[ "${__b3bp_tmp_line}" =~ (^|\.\ *)Default= ]]; then
+    # ignore default value if option does not have an argument
+    __b3bp_tmp_varname="__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}"
+
+    if [[ "${!__b3bp_tmp_varname}" != "0" ]]; then
+      __b3bp_tmp_init="${__b3bp_tmp_line##*Default=}"
+      __b3bp_tmp_re='^"(.*)"$'
+      if [[ "${__b3bp_tmp_init}" =~ ${__b3bp_tmp_re} ]]; then
+        __b3bp_tmp_init="${BASH_REMATCH[1]}"
+      else
+        __b3bp_tmp_re="^'(.*)'$"
+        if [[ "${__b3bp_tmp_init}" =~ ${__b3bp_tmp_re} ]]; then
+          __b3bp_tmp_init="${BASH_REMATCH[1]}"
+        fi
+      fi
+    fi
+  fi
+
+  if [[ "${__b3bp_tmp_line}" =~ (^|\.\ *)Required\. ]]; then
+    # remember that this option requires an argument
+    printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "2"
+  fi
+
+  printf -v "arg_${__b3bp_tmp_opt:0:1}" '%s' "${__b3bp_tmp_init}"
+done <<< "${__usage:-}"
+
+# run getopts only if options were specified in __usage
+if [[ "${__b3bp_tmp_opts:-}" ]]; then
+  # Allow long options like --this
+  __b3bp_tmp_opts="${__b3bp_tmp_opts}-:"
+
+  # Reset in case getopts has been used previously in the shell.
+  OPTIND=1
+
+  # start parsing command line
+  set +o nounset # unexpected arguments will cause unbound variables
+                 # to be dereferenced
+  # Overwrite $arg_<flag> defaults with the actual CLI options
+  while getopts "${__b3bp_tmp_opts}" __b3bp_tmp_opt; do
+    [[ "${__b3bp_tmp_opt}" = "?" ]] && help "Invalid use of script: ${*} "
+
+    if [[ "${__b3bp_tmp_opt}" = "-" ]]; then
+      # OPTARG is long-option-name or long-option=value
+      if [[ "${OPTARG}" =~ .*=.* ]]; then
+        # --key=value format
+        __b3bp_tmp_long_opt=${OPTARG/=*/}
+        # Set opt to the short option corresponding to the long option
+        __b3bp_tmp_varname="__b3bp_tmp_opt_long2short_${__b3bp_tmp_long_opt//-/_}"
+        printf -v "__b3bp_tmp_opt" '%s' "${!__b3bp_tmp_varname}"
+        OPTARG=${OPTARG#*=}
+      else
+        # --key value format
+        # Map long name to short version of option
+        __b3bp_tmp_varname="__b3bp_tmp_opt_long2short_${OPTARG//-/_}"
+        printf -v "__b3bp_tmp_opt" '%s' "${!__b3bp_tmp_varname}"
+        # Only assign OPTARG if option takes an argument
+        __b3bp_tmp_varname="__b3bp_tmp_has_arg_${__b3bp_tmp_opt}"
+        printf -v "OPTARG" '%s' "${@:OPTIND:${!__b3bp_tmp_varname}}"
+        # shift over the argument if argument is expected
+        ((OPTIND+=__b3bp_tmp_has_arg_${__b3bp_tmp_opt}))
+      fi
+      # we have set opt/OPTARG to the short value and the argument as OPTARG if it exists
+    fi
+    __b3bp_tmp_varname="arg_${__b3bp_tmp_opt:0:1}"
+    __b3bp_tmp_default="${!__b3bp_tmp_varname}"
+
+    __b3bp_tmp_value="${OPTARG}"
+    if [[ -z "${OPTARG}" ]] && [[ "${__b3bp_tmp_default}" = "0" ]]; then
+      __b3bp_tmp_value="1"
+    fi
+
+    printf -v "${__b3bp_tmp_varname}" '%s' "${__b3bp_tmp_value}"
+    debug "cli arg ${__b3bp_tmp_varname} = (${__b3bp_tmp_default}) -> ${!__b3bp_tmp_varname}"
+  done
+  set -o nounset # no more unbound variable references expected
+
+  shift $((OPTIND-1))
+
+  if [[ "${1:-}" = "--" ]] ; then
+    shift
+  fi
+fi
+
+
+### Automatic validation of required option arguments
+##############################################################################
+
+for __b3bp_tmp_varname in ${!__b3bp_tmp_has_arg_*}; do
+  # validate only options which required an argument
+  [[ "${!__b3bp_tmp_varname}" = "2" ]] || continue
+
+  __b3bp_tmp_opt_short="${__b3bp_tmp_varname##*_}"
+  __b3bp_tmp_varname="arg_${__b3bp_tmp_opt_short}"
+  [[ "${!__b3bp_tmp_varname}" ]] && continue
+
+  __b3bp_tmp_varname="__b3bp_tmp_opt_short2long_${__b3bp_tmp_opt_short}"
+  printf -v "__b3bp_tmp_opt_long" '%s' "${!__b3bp_tmp_varname}"
+  [[ "${__b3bp_tmp_opt_long:-}" ]] && __b3bp_tmp_opt_long=" (--${__b3bp_tmp_opt_long//_/-})"
+
+  help "Option -${__b3bp_tmp_opt_short}${__b3bp_tmp_opt_long:-} requires an argument"
+done
+
+
+### Cleanup Environment variables
+##############################################################################
+
+for __tmp_varname in ${!__b3bp_tmp_*}; do
+  unset -v "${__tmp_varname}"
+done
+
+unset -v __tmp_varname
+
+
+### Externally supplied __usage. Nothing else to do here
+##############################################################################
+
+if [[ "${__b3bp_external_usage:-}" = "true" ]]; then
+  unset -v __b3bp_external_usage
+  return
+fi
+
+
+### Signal trapping and backtracing
+##############################################################################
+
+function __b3bp_cleanup_before_exit () {
+  if [[ "$EUID" -eq 0 ]]; then
+    for d in Dest Linux WinPE; do
+      if [[ -d "/mnt/${d}" ]]; then
+        umount "/mnt/${d}" || true
+        rmdir "/mnt/${d}" || true
+      fi
+    done
+  fi
+  if [[ "${?}" != "0" ]]; then
+    info "Sources unmounted"
+  fi
+  if [[ ${arg_F:-} == 0 && "${SILENT:-False}" == "False" ]]; then
+    read -r -p "Press Enter to exit... " ignored_var 2>&1
+  fi
+}
+trap __b3bp_cleanup_before_exit EXIT
+
+# requires `set -o errtrace`
+__b3bp_err_report() {
+    local error_code
+    error_code=${?}
+    error "Error in ${__file} in function ${1} on line ${2}"
+    exit ${error_code}
+}
+# Uncomment the following line for always providing an error backtrace
+trap '__b3bp_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
+
+
+### Command-line argument switches (like -d for debugmode, -h for showing helppage)
+##############################################################################
+
+# debug mode
+if [[ "${arg_d:?}" = "1" ]]; then
+  set -o xtrace
+  LOG_LEVEL="7"
+  # Enable error backtracing
+  trap '__b3bp_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
+fi
+
+# verbose mode
+if [[ "${arg_v:?}" = "1" ]]; then
+  set -o verbose
+fi
+
+
+### Validation. Error out if the things required for your script are not present
+##############################################################################
+
+if [[ "${arg_F:?}" == 1 ]]; then
+    SILENT="True"
+else
+    SILENT="False"
+fi
+if [[ "${arg_M:?}" == 1 ]]; then
+    USE_MBR="True"
+else
+    USE_MBR="False"
+fi
+
+if [[ "${arg_h:?}" == 1 ]]; then
+    help "${__usage_example}"
+else
+    # Print warning line
+    [[ "${arg_u:-}" ]] || echo " -u or --ufd-device is required"
+    [[ "${arg_m:-}" ]] || echo " -m or --main-kit is required"
+    [[ "${arg_l:-}" ]] || echo " -l or --linux-iso is required"
+    [[ "${arg_w:-}" ]] || echo " -w or --winpe-iso is required"
+
+    # Bail if necessary
+    [[ "${arg_u:-}" ]] || help "${__usage_example}"
+    [[ "${arg_l:-}" ]] || help "${__usage_example}"
+    [[ "${arg_m:-}" ]] || help "${__usage_example}"
+    [[ "${arg_w:-}" ]] || help "${__usage_example}"
+fi
+[[ "${LOG_LEVEL:-}" ]] || emergency "Cannot continue without LOG_LEVEL. "
+
+
+### More functions
+##############################################################################
+
+function abort () {
+    local abort_message="Aborted"
+    [[ "${1:-}" ]] && abort_message="${1}" || true
+    error "${abort_message}"
+    #echo -e "${YELLOW}${abort_message}${CLEAR}"
+    exit 1
+}
+
+function ask() {
+    if [[ "${SILENT}" == "True" ]]; then
+        echo -e "${1:-} Yes ${BLUE}(Silent)${CLEAR}"
+        return 0
+    fi
+    while :; do
+        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
+            return 1
+        fi
+    done
+}
+
+
+### Runtime
+##############################################################################
+
+# VARIABLES
+DEST_DEV="${arg_u}"
+DEST_PAR="${DEST_DEV}1"
+LOG_FILE="$(getent passwd "$SUDO_USER" | cut -d: -f6)/Logs/build-ufd_${DEST_DEV##*/}_$(date +%Y-%m-%d_%H%M_%z).log"
+MAIN_PY="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/settings/main.py"
+RSYNC_ARGS="-hrtuvS --modify-window=1 --progress"
+MAIN_KIT="$(realpath "${arg_m:-}" 2>/dev/null || true)"
+LINUX_ISO="$(realpath "${arg_l:-}" 2>/dev/null || true)"
+WINPE_ISO="$(realpath "${arg_w:-}" 2>/dev/null || true)"
+EXTRA_DIR="$(realpath "${arg_e:-}" 2>/dev/null || true)"
+mkdir -p "$(dirname "$LOG_FILE")"
+chown "$SUDO_USER:$SUDO_USER" -R "$(dirname "$LOG_FILE")"
+
+# COLORS
+CLEAR="\e[0m"
+RED="\e[31m"
+GREEN="\e[32m"
+YELLOW="\e[33m"
+BLUE="\e[34m"
+
+# Load main.py settings
+if [ ! -f "${MAIN_PY}" ]; then
+    echo -e "${RED}ERROR${CLEAR}: ${MAIN_PY} not found."
+    abort
+fi
+while read line; do
+    if echo "${line}" | egrep -q "^\w+='"; then
+        line="$(echo "${line}" | sed -r 's/[\r\n]+//')"
+        eval "${line}"
+    fi
+done < "${MAIN_PY}"
+if [ -z ${KIT_NAME_FULL+x} ]; then
+    # KIT_NAME_FULL is not set, assume main.py missing or malformatted
+    echo -e "${RED}ERROR${CLEAR}: failed to load settings from ${MAIN_PY}"
+    abort
+fi
+ISO_LABEL="${KIT_NAME_SHORT}_LINUX"
+UFD_LABEL="${KIT_NAME_SHORT}_UFD"
+
+# Check if root
+if [[ "$EUID" -ne 0 ]]; then
+    echo -e "${RED}ERROR${CLEAR}: This script must be run as root."
+    abort
+fi
+
+# Check if in tmux
+if ! tmux list-session 2>/dev/null | grep -q "build-ufd"; then
+    # Reload in tmux
+    eval tmux new-session -s "build-ufd" "${0:-}" ${__all_args}
+    SILENT="True" # avoid two "Press Enter to exit..." prompts
+    exit 0
+fi
+
+# Header
+echo -e "${GREEN}${KIT_NAME_FULL}${CLEAR}: UFD Build Tool"
+echo ""
+
+# Verify sources
+[[ -b "${DEST_DEV}" ]] || abort "${DEST_DEV} is not a valid device."
+[[ -d "${MAIN_KIT}/.bin" ]] || abort "Invalid Main Kit, ${MAIN_KIT}/.bin not found."
+[[ -e "${LINUX_ISO}" ]] || abort "Linux ISO not found."
+[[ -e "${WINPE_ISO}" ]] || abort "WinPE ISO not found."
+if [[ ! -z "${arg_e:-}" ]]; then
+    [[ -d "${EXTRA_DIR}" ]] || abort "Extra Dir not found."
+fi
+
+# Print Info
+echo -e "${BLUE}Sources${CLEAR}"
+echo "Main Kit:  ${MAIN_KIT}"
+echo "Linux ISO: ${LINUX_ISO}"
+echo "WinPE ISO: ${WINPE_ISO}"
+echo "Extra Dir: ${EXTRA_DIR:-(Not Specified)}"
+echo ""
+echo -e "${BLUE}Destination${CLEAR}"
+lsblk -n -o NAME,LABEL,SIZE,MODEL,SERIAL "${DEST_DEV}"
+if [[ "${USE_MBR}" == "True" ]]; then
+    echo -e "${YELLOW}Formatting using legacy MBR${CLEAR}"
+fi
+echo ""
+
+# Ask before starting job
+echo ""
+if ask "Is the above information correct?"; then
+    echo ""
+    echo -e "${YELLOW}SAFETY CHECK${CLEAR}"
+    echo "All data will be DELETED from the disk and partition(s) listed above."
+    echo -e "This is irreversible and will lead to ${RED}DATA LOSS.${CLEAR}"
+    if ! ask "Asking again to confirm, is this correct?"; then
+        abort
+    fi
+else
+    abort
+fi
+
+# Start Build
+echo ""
+echo -e "${GREEN}Building Kit${CLEAR}"
+touch "${LOG_FILE}"
+tmux split-window -dl 10 tail -f "${LOG_FILE}"
+
+# Zero beginning of device
+dd bs=4M count=16 if=/dev/zero of="${DEST_DEV}" >> "${LOG_FILE}" 2>&1
+
+# Format
+echo "Formatting drive..."
+if [[ "${USE_MBR}" == "True" ]]; then
+    parted "${DEST_DEV}" --script -- mklabel msdos mkpart primary fat32 4MiB -1s >> "${LOG_FILE}" 2>&1
+    parted "${DEST_DEV}" set 1 boot on >> "${LOG_FILE}" 2>&1
+else
+    parted "${DEST_DEV}" --script -- mklabel gpt mkpart primary fat32 4MiB -4MiB >> "${LOG_FILE}" 2>&1
+    parted "${DEST_DEV}" set 1 legacy_boot on >> "${LOG_FILE}" 2>&1
+    #parted "${DEST_DEV}" disk_set pmbr_boot on >> "${LOG_FILE}" 2>&1
+    # pmbr_boot breaks detection on some UEFI MOBOs
+fi
+mkfs.vfat -F 32 -n "${UFD_LABEL}" "${DEST_PAR}" >> "${LOG_FILE}" 2>&1
+
+# Mount sources and dest
+echo "Mounting sources and destination..."
+mkdir /mnt/{Dest,Linux,WinPE} -p >> "${LOG_FILE}" 2>&1
+mount ${DEST_PAR} /mnt/Dest >> "${LOG_FILE}" 2>&1
+mount "${LINUX_ISO}" /mnt/Linux -r >> "${LOG_FILE}" 2>&1
+mount "${WINPE_ISO}" /mnt/WinPE -r >> "${LOG_FILE}" 2>&1
+
+# Copy files
+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
+rsync ${RSYNC_ARGS} /mnt/WinPE/EFI/Microsoft /mnt/Dest/EFI/ >> "${LOG_FILE}" 2>&1
+rsync ${RSYNC_ARGS} /mnt/WinPE/EFI/Boot/* /mnt/Dest/EFI/Microsoft/ >> "${LOG_FILE}" 2>&1
+rsync ${RSYNC_ARGS} /mnt/WinPE/{Boot/{BCD,boot.sdi},bootmgr} /mnt/Dest/sources/ >> "${LOG_FILE}" 2>&1
+
+echo "Copying Main Kit..."
+rsync ${RSYNC_ARGS} "${MAIN_KIT}/" "/mnt/Dest/${KIT_NAME_FULL}/" >> "${LOG_FILE}" 2>&1
+
+if [[ ! -z "${EXTRA_DIR:-}" ]]; then
+    echo "Copying Extra files..."
+    rsync ${RSYNC_ARGS} "${EXTRA_DIR}"/ /mnt/Dest/ >> "${LOG_FILE}" 2>&1
+fi
+
+# Install syslinux
+echo "Copying Syslinux files..."
+rsync ${RSYNC_ARGS} /usr/lib/syslinux/bios/*.c32 /mnt/Dest/arch/boot/syslinux/ >> "${LOG_FILE}" 2>&1
+syslinux --install -d /arch/boot/syslinux/ ${DEST_PAR} >> "${LOG_FILE}" 2>&1
+
+echo "Unmounting destination..."
+umount /mnt/Dest >> "${LOG_FILE}" 2>&1
+rmdir /mnt/Dest >> "${LOG_FILE}" 2>&1
+sync
+
+echo "Installing Syslinux MBR..."
+if [[ "${USE_MBR}" == "True" ]]; then
+    dd bs=440 count=1 if=/usr/lib/syslinux/bios/mbr.bin of=${DEST_DEV} >> "${LOG_FILE}" 2>&1
+else
+    dd bs=440 count=1 if=/usr/lib/syslinux/bios/gptmbr.bin of=${DEST_DEV} >> "${LOG_FILE}" 2>&1
+fi
+sync
+
+# Cleanup
+echo "Hiding boot files..."
+echo "drive s: file=\"${DEST_PAR}\"" > /root/.mtoolsrc
+echo 'mtools_skip_check=1' >> /root/.mtoolsrc
+for item in arch Boot bootmgr{,.efi} EFI en-us images isolinux sources "${KIT_NAME_FULL}"/{.bin,.cbin}; do
+    yes | mattrib +h "S:/${item}" >> "${LOG_FILE}" 2>&1 || true
+done
+sync
+
+# Unmount Sources
+echo "Unmounting sources..."
+for d in Linux WinPE; do
+    umount "/mnt/${d}" >> "${LOG_FILE}" 2>&1 || true
+    rmdir "/mnt/${d}" >> "${LOG_FILE}" 2>&1 || true
+done
+
+# Close progress pane
+pkill -f "tail.*${LOG_FILE}"
+
+# Done
+echo ""
+echo "Done."
+echo ""
+exit 0

.bin/Scripts/build_kit.ps1

@@ -79,15 +79,15 @@ if ($MyInvocation.InvocationName -ne ".") {
     $Path = $Temp
 
     # 7-Zip
-    DownloadFile -Path $Path -Name "7z-installer.msi" -Url "https://www.7-zip.org/a/7z1900.msi"
-    DownloadFile -Path $Path -Name "7z-extra.7z" -Url "https://www.7-zip.org/a/7z1900-extra.7z"
+    DownloadFile -Path $Path -Name "7z-installer.msi" -Url "https://www.7-zip.org/a/7z1806.msi"
+    DownloadFile -Path $Path -Name "7z-extra.7z" -Url "https://www.7-zip.org/a/7z1806-extra.7z"
 
     # ConEmu
-    $Url = "https://github.com/Maximus5/ConEmu/releases/download/v19.03.10/ConEmuPack.190310.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.6.4/npp.7.6.4.bin.minimalist.7z"
+    $Url = "https://notepad-plus-plus.org/repository/7.x/7.6.2/npp.7.6.2.bin.minimalist.7z"
     DownloadFile -Path $Path -Name "npp.7z" -Url $Url
 
     # Python

.bin/Scripts/build_pe.ps1

@@ -131,25 +131,25 @@ if ($MyInvocation.InvocationName -ne ".") {
         ## Download Tools ##
         $ToolSources = @(
             # 7-Zip
-            @("7z-installer.msi", "https://www.7-zip.org/a/7z1900.msi"),
-            @("7z-extra.7z", "https://www.7-zip.org/a/7z1900-extra.7z"),
+            @("7z-installer.msi", "https://www.7-zip.org/a/7z1806.msi"),
+            @("7z-extra.7z", "https://www.7-zip.org/a/7z1806-extra.7z"),
             # Blue Screen View
             @("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/v19.03.10/ConEmuPack.190310.7z"),
+            @("ConEmuPack.7z", "https://github.com/Maximus5/ConEmu/releases/download/v18.06.26/ConEmuPack.180626.7z"),
             # Fast Copy
-            @("fastcopy.zip", "http://ftp.vector.co.jp/71/31/2323/FastCopy363_installer.exe"),
+            @("fastcopy.zip", "http://ftp.vector.co.jp/70/93/2323/FastCopy361_installer.exe"),
             # HWiNFO
-            @("hwinfo.zip", "http://files2.majorgeeks.com/377527622c5325acc1cb937fb149d0de922320c0/systeminfo/hwi_602.zip"),
+            @("hwinfo.zip", "https://www.fosshub.com/HWiNFO.html?dwl=hwi_600.zip"),
             # Killer Network Drivers
             @(
                 "killerinf.zip",
                 ("https://www.killernetworking.com"+(FindDynamicUrl "https://www.killernetworking.com/killersupport/category/other-downloads" "Download Killer-Ethernet").replace('&', '&'))
             ),
             # Notepad++
-            @("npp_x86.7z", "https://notepad-plus-plus.org/repository/7.x/7.6.4/npp.7.6.4.bin.minimalist.7z"),
-            @("npp_amd64.7z", "https://notepad-plus-plus.org/repository/7.x/7.6.4/npp.7.6.4.bin.minimalist.x64.7z"),
+            @("npp_x86.7z", "https://notepad-plus-plus.org/repository/7.x/7.6.2/npp.7.6.2.bin.minimalist.7z"),
+            @("npp_amd64.7z", "https://notepad-plus-plus.org/repository/7.x/7.6.2/npp.7.6.2.bin.minimalist.x64.7z"),
             # NT Password Editor
             @("ntpwed.zip", "http://cdslow.org.ru/files/ntpwedit/ntpwed07.zip"),
             # Prime95

.bin/Scripts/cbs_fix.py

@@ -35,8 +35,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/check_disk.py

@@ -38,7 +38,7 @@ if __name__ == '__main__':
       if repair:
         cs = 'Scheduled'
       else:
-        cs = 'No issues'
+        cs = 'CS'
       message = 'CHKDSK ({SYSTEMDRIVE})...'.format(**global_vars['Env'])
       try_and_print(message=message, function=run_chkdsk,
         cs=cs, other_results=other_results, repair=repair)
@@ -49,8 +49,8 @@ if __name__ == '__main__':
     print_success('Done.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/connect-to-network

@@ -0,0 +1,30 @@
+#!/bin/python3
+#
+## Wizard Kit: Network connection tool
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.network import *
+init_global_vars()
+
+if __name__ == '__main__':
+  try:
+    # Prep
+    clear_screen()
+
+    # Connect
+    connect_to_network()
+
+    # Done
+    print_standard('\nDone.')
+    #pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit:
+    pass
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/ddrescue-tui

@@ -2,10 +2,42 @@
 #
 ## Wizard Kit: ddrescue TUI Launcher
 
-source launch-in-tmux
-
 SESSION_NAME="ddrescue-tui"
 WINDOW_NAME="ddrescue TUI"
-TMUX_CMD="ddrescue-tui-menu"
+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" $*
 
-launch_in_tmux "$@"

.bin/Scripts/ddrescue-tui-menu

@@ -45,7 +45,6 @@ if __name__ == '__main__':
     # Done
     print_standard('\nDone.')
     pause("Press Enter to exit...")
-    tmux_switch_client()
     exit_script()
   except GenericAbort:
     abort()
@@ -55,9 +54,8 @@ if __name__ == '__main__':
       msg = str(ge)
     print_error(msg)
     abort()
-  except SystemExit as sys_exit:
-    tmux_switch_client()
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/debug/hw_diags.py

@@ -1,186 +0,0 @@
-# Wizard Kit: Debug - HW Diagnostics
-
-import base64
-import requests
-
-from functions.common import *
-
-def debug_report_cpu(cpu_obj):
-  """Generate report for CpuObj, returns list."""
-  report = []
-
-  # CPU Info
-  report.append('CPU: {}'.format(cpu_obj.name))
-  report.append('lscpu:')
-  for k, v in sorted(cpu_obj.lscpu.items()):
-    report.append('  {}: {}'.format(k, v))
-
-  # Tests
-  report.append('Tests:')
-  for k, v in cpu_obj.tests.items():
-    report.extend(debug_report_test(v, k))
-
-  # Done
-  return report
-
-
-def debug_report_disk(disk_obj):
-  """Generate report for DiskObj, returns list."""
-  report = []
-  expand = [
-    'lsblk',
-    'nvme_attributes',
-    'nvme_smart_notes',
-    'smart_attributes',
-    'smart_self_test',
-    'smartctl',
-    ]
-  skip = [
-    'add_nvme_smart_note',
-    'calc_io_dd_values',
-    'check_attributes',
-    'check_smart_self_test',
-    'description',
-    'disable_test',
-    'generate_attribute_report',
-    'generate_disk_report',
-    'get_details',
-    'get_size',
-    'get_smart_details',
-    'name',
-    'safety_check',
-    'tests',
-    ]
-
-  # Disk Info
-  report.append('Disk: {} {}'.format(
-    disk_obj.name, disk_obj.description))
-  for a in dir(disk_obj):
-    if a.startswith('_') or a in skip:
-      continue
-    if a in expand:
-      report.append('{}:'.format(a))
-      attr = getattr(disk_obj, a)
-      try:
-        for k, v in sorted(attr.items()):
-          report.append('  {}: {}'.format(k, v))
-      except Exception:
-        # Ignore
-        pass
-    else:
-      report.append('{}: {}'.format(a, getattr(disk_obj, a)))
-
-  # Tests
-  report.append('Tests:')
-  for k, v in disk_obj.tests.items():
-    report.extend(debug_report_test(v, k))
-
-  # Done
-  return report
-
-
-def debug_report_state(state):
-  """Generate report for State, returns list."""
-  report = []
-
-  # Devs
-  report.append('CPU: {}'.format(state.cpu))
-  report.append('Disks: {}'.format(state.disks))
-
-  # Settings
-  report.append('Progress Out: {}'.format(state.progress_out))
-  report.append('Quick Mode: {}'.format(state.quick_mode))
-
-  # Tests
-  report.append('Tests:')
-  for k, v in state.tests.items():
-    report.append('  {}:'.format(k))
-    for k2, v2 in sorted(v.items()):
-      report.append('    {}: {}'.format(k2, v2))
-
-  # tmux
-  if hasattr(state, 'tmux_layout'):
-    report.append('tmux Layout:')
-    for k, v in state.tmux_layout.items():
-      report.append('  {}: {}'.format(k, str(v)))
-  if hasattr(state, 'panes'):
-    report.append('tmux Panes:')
-    for k, v in state.panes.items():
-      report.append('  {}: {}'.format(k, str(v)))
-
-  # Done
-  return report
-
-
-def debug_report_test(test_obj, test_name):
-  """Generate report for TestObj, returns list."""
-  report = ['  {}:'.format(test_name)]
-  skip = ['update_status']
-
-  # Attributes
-  for a in [a for a in dir(test_obj) if not a.startswith('_')]:
-    if a in skip:
-      continue
-    report.append('    {}: {}'.format(a, getattr(test_obj, a)))
-
-  # Done
-  return report
-
-
-def save_debug_reports(state, global_vars):
-  """Save debug reports if possible."""
-  debug_dest = '{}/debug'.format(global_vars['LogDir'])
-  os.makedirs(debug_dest, exist_ok=True)
-
-  # State
-  with open('{}/state.report'.format(debug_dest), 'a') as f:
-    for line in debug_report_state(state):
-      f.write('{}\n'.format(line))
-
-  # CPU
-  with open('{}/cpu.report'.format(debug_dest), 'a') as f:
-    for line in debug_report_cpu(state.cpu):
-      f.write('{}\n'.format(line))
-
-  # Disk(s)
-  for disk in state.disks:
-    with open('{}/disk_{}.report'.format(debug_dest, disk.name), 'a') as f:
-      for line in debug_report_disk(disk):
-        f.write('{}\n'.format(line))
-
-
-def upload_logdir(global_vars, reason='Crash'):
-  """Upload compressed LogDir to CRASH_SERVER."""
-  source = global_vars['LogDir']
-  source = source[source.rfind('/')+1:]
-  dest = 'HW-Diags_{reason}_{Date-Time}.txz'.format(
-    reason=reason,
-    **global_vars,
-    )
-  data = None
-
-  # Compress LogDir
-  os.chdir('{}/..'.format(global_vars['LogDir']))
-  cmd = ['tar', 'caf', dest, source]
-  run_program(cmd)
-
-  # Read file
-  with open(dest, 'rb') as f:
-    data = f.read()
-
-  # Upload data
-  url = '{}/{}'.format(CRASH_SERVER['Url'], dest)
-  r = requests.put(
-    url,
-    data=data,
-    headers={'X-Requested-With': 'XMLHttpRequest'},
-    auth=(CRASH_SERVER['User'], CRASH_SERVER['Pass']))
-  # Raise exception if upload NS
-  if not r.ok:
-    raise GenericError
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/dism.py

@@ -50,8 +50,8 @@ if __name__ == '__main__':
     print_success('Done.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/functions/browsers.py

@@ -2,7 +2,6 @@
 
 from functions.common import *
 from operator import itemgetter
-from settings.browsers import *
 
 
 # Define other_results for later try_and_print
@@ -18,6 +17,95 @@ other_results = {
   }
 
 
+# STATIC VARIABLES
+DEFAULT_HOMEPAGE =      'https://www.google.com/'
+IE_GALLERY =            'https://www.microsoft.com/en-us/iegallery'
+MOZILLA_PREFS = {
+  'browser.search.defaultenginename': '"Google"',
+  'browser.search.defaultenginename.US': '"Google"',
+  'browser.search.geoSpecificDefaults': 'false',
+  'browser.startup.homepage': '"{}"'.format(DEFAULT_HOMEPAGE),
+  'extensions.ui.lastCategory': '"addons://list/extension"',
+  }
+UBO_CHROME =            'https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm?hl=en'
+UBO_CHROME_REG =        r'Software\Wow6432Node\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm'
+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': {
+    'base':             'ie',
+    'exe_name':         'iexplore.exe',
+    'rel_install_path': 'Internet Explorer',
+    'user_data_path':   r'{USERPROFILE}\Favorites',
+    },
+  'Google Chrome': {
+    'base':             'chromium',
+    'exe_name':         'chrome.exe',
+    'rel_install_path': r'Google\Chrome\Application',
+    'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome\User Data',
+    },
+  'Google Chrome Canary': {
+    'base':             'chromium',
+    'exe_name':         'chrome.exe',
+    'rel_install_path': r'Google\Chrome SxS\Application',
+    'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome SxS\User Data',
+    },
+  'Mozilla Firefox': {
+    'base':             'mozilla',
+    'exe_name':         'firefox.exe',
+    'rel_install_path': 'Mozilla Firefox',
+    'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
+    },
+  'Mozilla Firefox Dev': {
+    'base':             'mozilla',
+    'exe_name':         'firefox.exe',
+    'rel_install_path': 'Firefox Developer Edition',
+    'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
+    },
+  'Opera': {
+    'base':             'chromium',
+    'exe_name':         'launcher.exe',
+    'rel_install_path': 'Opera',
+    'user_data_path':   r'{APPDATA}\Opera Software\Opera Stable',
+    },
+  'Opera Beta': {
+    'base':             'chromium',
+    'exe_name':         'launcher.exe',
+    'rel_install_path': 'Opera beta',
+    'user_data_path':   r'{APPDATA}\Opera Software\Opera Next',
+    },
+  'Opera Dev': {
+    'base':             'chromium',
+    'exe_name':         'launcher.exe',
+    'rel_install_path': 'Opera developer',
+    'user_data_path':   r'{APPDATA}\Opera Software\Opera Developer',
+    },
+  }
+
+
+# Regex
+REGEX_BACKUP = re.compile(
+  r'\.\w*bak.*',
+  re.IGNORECASE)
+REGEX_CHROMIUM_PROFILE = re.compile(
+  r'^(Default|Profile)',
+  re.IGNORECASE)
+REGEX_CHROMIUM_ITEMS = re.compile(
+  r'^(Bookmarks|Cookies|Favicons|Google Profile'
+  r'|History|Login Data|Top Sites|TransportSecurity'
+  r'|Visited Links|Web Data)',
+  re.IGNORECASE)
+REGEX_MOZILLA = re.compile(
+  r'^(bookmarkbackups|(cookies|formhistory|places).sqlite'
+  r'|key3.db|logins.json|persdict.dat)$',
+  re.IGNORECASE)
+
+
 def archive_all_users():
   """Create backups for all browsers for all users."""
   users_root = r'{}\Users'.format(global_vars['Env']['SYSTEMDRIVE'])
@@ -32,8 +120,8 @@ def archive_all_users():
     user_path = os.path.join(users_root, user_name)
     appdata_local = os.path.join(user_path, r'AppData\Local')
     appdata_roaming = os.path.join(user_path, r'AppData\Roaming')
-    valid_user = valid_user and os.path.exists(appdata_local)
-    valid_user = valid_user and os.path.exists(appdata_roaming)
+    valid_user &= os.path.exists(appdata_local)
+    valid_user &= os.path.exists(appdata_roaming)
     if valid_user:
       user_envs.append({
         'USERNAME': user_name,
@@ -325,6 +413,7 @@ def install_adblock(indent=8, width=32, just_firefox=False):
     if just_firefox and browser_data[browser]['base'] != 'mozilla':
       continue
     exe_path = browser_data[browser].get('exe_path', None)
+    function=run_program
     if not exe_path:
       if browser_data[browser]['profiles']:
         print_standard(
@@ -374,6 +463,7 @@ def install_adblock(indent=8, width=32, just_firefox=False):
 
       elif browser_data[browser]['base'] == 'ie':
         urls.append(IE_GALLERY)
+        function=popen_program
 
       # By using check=False we're skipping any return codes so
       # it should only fail if the program can't be run
@@ -382,16 +472,10 @@ def install_adblock(indent=8, width=32, just_firefox=False):
       #   installation status.
       try_and_print(message='{}...'.format(browser),
         indent=indent, width=width,
-        cs='Started', function=popen_program,
+        cs='Done', function=function,
         cmd=[exe_path, *urls], check=False)
 
 
-def is_installed(browser_name):
-  """Checks if browser is installed based on exe_path, returns bool."""
-  browser_name = browser_name.replace(' Chromium', '')
-  return bool(browser_data.get(browser_name, {}).get('exe_path', False))
-
-
 def list_homepages(indent=8, width=32):
   """List current homepages for reference."""
   browser_list = [k for k, v in sorted(browser_data.items()) if v['exe_path']]
@@ -423,12 +507,6 @@ def list_homepages(indent=8, width=32):
             indent=' '*indent, width=width, name=name, page=page))
 
 
-def profile_present(browser_name):
-  """Checks if a profile was detected for browser, returns bool."""
-  browser_name = browser_name.replace(' Chromium', '')
-  return bool(browser_data.get(browser_name, {}).get('profiles', False))
-
-
 def reset_browsers(indent=8, width=32):
   """Reset all detected browsers to safe defaults."""
   browser_list = [k for k, v in sorted(browser_data.items()) if v['profiles']]
@@ -447,21 +525,14 @@ def reset_browsers(indent=8, width=32):
         other_results=other_results, profile=profile)
 
 
-def scan_for_browsers(just_firefox=False, silent=False):
+def scan_for_browsers(just_firefox=False):
   """Scan system for any supported browsers."""
   for name, details in sorted(SUPPORTED_BROWSERS.items()):
     if just_firefox and details['base'] != 'mozilla':
       continue
-    if silent:
-      try:
-        get_browser_details(name)
-      except Exception:
-        # Ignore errors in silent mode
-        pass
-    else:
-      try_and_print(message='{}...'.format(name),
-        function=get_browser_details, cs='Detected',
-        other_results=other_results, name=name)
+    try_and_print(message='{}...'.format(name),
+      function=get_browser_details, cs='Detected',
+      other_results=other_results, name=name)
 
 
 if __name__ == '__main__':

.bin/Scripts/functions/cleanup.py

@@ -1,9 +1,7 @@
-'''Wizard Kit: Functions - Cleanup'''
-# pylint: disable=no-name-in-module,wildcard-import
-# vim: sts=2 sw=2 ts=2
+# Wizard Kit: Functions - Cleanup
+
+from functions.common import *
 
-from functions.setup import *
-from settings.cleanup import *
 
 def cleanup_adwcleaner():
   """Move AdwCleaner folders into the ClientDir."""
@@ -77,7 +75,8 @@ def cleanup_desktop():
 
   desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
   for entry in os.scandir(desktop_path):
-    if DESKTOP_ITEMS.search(entry.name):
+    # JRT, RKill, Shortcut cleaner
+    if re.search(r'^(JRT|RKill|sc-cleaner)', entry.name, re.IGNORECASE):
       dest_name = r'{}\{}'.format(dest_folder, entry.name)
       dest_name = non_clobber_rename(dest_name)
       shutil.move(entry.path, dest_name)
@@ -131,14 +130,7 @@ def delete_registry_value(hive, key, value):
     winreg.DeleteValue(k, value)
 
 
-def restore_default_uac():
-  """Restores default UAC settings via the registry."""
-  if global_vars['OS']['Version'] == '10':
-    write_registry_settings(UAC_DEFAULTS_WIN10, all_users=True)
-  else:
-    # Haven't checked Win8 settings, only applying minimum set
-    write_registry_settings(UAC_DEFAULTS_WIN7, all_users=True)
-
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/common.py

@@ -27,12 +27,11 @@ global_vars = {}
 # STATIC VARIABLES
 COLORS = {
   'CLEAR':  '\033[0m',
-  'RED':    '\033[31m',
+  'RED':  '\033[31m',
   'ORANGE': '\033[31;1m',
   'GREEN':  '\033[32m',
   'YELLOW': '\033[33m',
   'BLUE':   '\033[34m',
-  'PURPLE': '\033[35m',
   'CYAN':   '\033[36m',
   }
 try:
@@ -64,15 +63,12 @@ class GenericRepair(Exception):
 class MultipleInstallationsError(Exception):
   pass
 
-class NoProfilesError(Exception):
-  pass
-
-class Not4KAlignedError(Exception):
-  pass
-
 class NotInstalledError(Exception):
   pass
 
+class NoProfilesError(Exception):
+  pass
+
 class OSInstalledLegacyError(Exception):
   pass
 
@@ -91,21 +87,14 @@ class SecureBootNotAvailError(Exception):
 class SecureBootUnknownError(Exception):
   pass
 
-class WindowsOutdatedError(Exception):
-  pass
-
-class WindowsUnsupportedError(Exception):
-  pass
-
 
 # General functions
-def abort(show_prompt=True):
+def abort():
   """Abort script."""
   print_warning('Aborted.')
-  if show_prompt:
-    sleep(1)
-    pause(prompt='Press Enter to exit... ')
-  exit_script(1)
+  sleep(1)
+  pause(prompt='Press Enter to exit... ')
+  exit_script()
 
 
 def ask(prompt='Kotaero!'):
@@ -125,14 +114,6 @@ def ask(prompt='Kotaero!'):
   return answer
 
 
-def beep(repeat=1):
-  """Play system bell with optional repeat."""
-  for i in range(repeat):
-    # Print bell char
-    print('\a')
-    sleep(0.5)
-
-
 def choice(choices, prompt='Kotaero!'):
   """Prompt the user with a choice question, returns str."""
   answer = None
@@ -173,22 +154,18 @@ def clear_screen():
 def convert_to_bytes(size):
   """Convert human-readable size str to bytes and return an int."""
   size = str(size)
-  tmp = re.search(r'(\d+\.?\d*)\s+([PTGMKB])B?', size.upper())
+  tmp = re.search(r'(\d+\.?\d*)\s+([KMGT]B)', size.upper())
   if tmp:
     size = float(tmp.group(1))
     units = tmp.group(2)
-    if units == 'P':
-      size *= 1024 ** 5
-    if units == 'T':
-      size *= 1024 ** 4
-    elif units == 'G':
-      size *= 1024 ** 3
-    elif units == 'M':
-      size *= 1024 ** 2
-    elif units == 'K':
-      size *= 1024 ** 1
-    elif units == 'B':
-      size *= 1024 ** 0
+    if units == 'TB':
+      size *= 1099511627776
+    elif units == 'GB':
+      size *= 1073741824
+    elif units == 'MB':
+      size *= 1048576
+    elif units == 'KB':
+      size *= 1024
     size = int(size)
   else:
     return -1
@@ -307,24 +284,20 @@ def human_readable_size(size, decimals=0):
     return '{size:>{width}} b'.format(size='???', width=width)
 
   # Convert to sensible units
-  if size >= 1024 ** 5:
-    size /= 1024 ** 5
-    units = 'PB'
-  elif size >= 1024 ** 4:
-    size /= 1024 ** 4
-    units = 'TB'
-  elif size >= 1024 ** 3:
-    size /= 1024 ** 3
-    units = 'GB'
-  elif size >= 1024 ** 2:
-    size /= 1024 ** 2
-    units = 'MB'
-  elif size >= 1024 ** 1:
-    size /= 1024 ** 1
-    units = 'KB'
+  if size >= 1099511627776:
+    size /= 1099511627776
+    units = 'Tb'
+  elif size >= 1073741824:
+    size /= 1073741824
+    units = 'Gb'
+  elif size >= 1048576:
+    size /= 1048576
+    units = 'Mb'
+  elif size >= 1024:
+    size /= 1024
+    units = 'Kb'
   else:
-    size /= 1024 ** 0
-    units = ' B'
+    units = ' b'
 
   # Return
   return '{size:>{width}.{decimals}f} {units}'.format(
@@ -439,8 +412,6 @@ def non_clobber_rename(full_path):
 
 def pause(prompt='Press Enter to continue... '):
   """Simple pause implementation."""
-  if prompt[-1] != ' ':
-    prompt += ' '
   input(prompt)
 
 
@@ -457,9 +428,6 @@ def ping(addr='google.com'):
 def popen_program(cmd, pipe=False, minimized=False, shell=False, **kwargs):
   """Run program and return a subprocess.Popen object."""
   cmd_kwargs = {'args': cmd, 'shell': shell}
-  for kw in ('encoding', 'errors'):
-    if kw in kwargs:
-      cmd_kwargs[kw] = kwargs[kw]
 
   if minimized:
     startupinfo = subprocess.STARTUPINFO()
@@ -529,9 +497,6 @@ def run_program(cmd, check=True, pipe=True, shell=False, **kwargs):
     cmd = ' '.join(cmd)
 
   cmd_kwargs = {'args': cmd, 'check': check, 'shell': shell}
-  for kw in ('encoding', 'errors'):
-    if kw in kwargs:
-      cmd_kwargs[kw] = kwargs[kw]
 
   if pipe:
     cmd_kwargs.update({
@@ -899,19 +864,25 @@ def make_tmp_dirs():
 
 def set_common_vars():
   """Set common variables."""
-  global_vars['Date'] =             time.strftime("%Y-%m-%d")
-  global_vars['Date-Time'] =        time.strftime("%Y-%m-%d_%H%M_%z")
-  global_vars['Env'] =              os.environ.copy()
+  global_vars['Date'] =         time.strftime("%Y-%m-%d")
+  global_vars['Date-Time'] =      time.strftime("%Y-%m-%d_%H%M_%z")
+  global_vars['Env'] =        os.environ.copy()
 
   global_vars['ArchivePassword'] =  ARCHIVE_PASSWORD
-  global_vars['BinDir'] =           r'{BaseDir}\.bin'.format(**global_vars)
-  global_vars['CBinDir'] =          r'{BaseDir}\.cbin'.format(**global_vars)
-  global_vars['ClientDir'] =        r'{SYSTEMDRIVE}\{prefix}'.format(
-                                      prefix=KIT_NAME_SHORT, **global_vars['Env'])
-  global_vars['BackupDir'] =        r'{ClientDir}\Backups'.format(**global_vars)
-  global_vars['LogDir'] =           r'{ClientDir}\Logs\{Date}'.format(**global_vars)
-  global_vars['QuarantineDir'] =    r'{ClientDir}\Quarantine'.format(**global_vars)
-  global_vars['TmpDir'] =           r'{BinDir}\tmp'.format(**global_vars)
+  global_vars['BinDir'] =       r'{BaseDir}\.bin'.format(
+    **global_vars)
+  global_vars['CBinDir'] =      r'{BaseDir}\.cbin'.format(
+    **global_vars)
+  global_vars['ClientDir'] =      r'{SYSTEMDRIVE}\{prefix}'.format(
+    prefix=KIT_NAME_SHORT, **global_vars['Env'])
+  global_vars['BackupDir'] =      r'{ClientDir}\Backups'.format(
+    **global_vars)
+  global_vars['LogDir'] =       r'{ClientDir}\Logs\{Date}'.format(
+    **global_vars)
+  global_vars['QuarantineDir'] =    r'{ClientDir}\Quarantine'.format(
+    **global_vars)
+  global_vars['TmpDir'] =       r'{BinDir}\tmp'.format(
+    **global_vars)
 
 
 def set_linux_vars():
@@ -919,12 +890,12 @@ def set_linux_vars():
 
   These assume we're running under a WK-Linux build."""
   result = run_program(['mktemp', '-d'])
-  global_vars['TmpDir'] =           result.stdout.decode().strip()
-  global_vars['Date'] =             time.strftime("%Y-%m-%d")
-  global_vars['Date-Time'] =        time.strftime("%Y-%m-%d_%H%M_%z")
-  global_vars['Env'] =              os.environ.copy()
-  global_vars['BinDir'] =           '/usr/local/bin'
-  global_vars['LogDir'] =           '{}/Logs'.format(global_vars['Env']['HOME'])
+  global_vars['TmpDir'] =       result.stdout.decode().strip()
+  global_vars['Date'] =         time.strftime("%Y-%m-%d")
+  global_vars['Date-Time'] =      time.strftime("%Y-%m-%d_%H%M_%z")
+  global_vars['Env'] =        os.environ.copy()
+  global_vars['BinDir'] =       '/usr/local/bin'
+  global_vars['LogDir'] =       global_vars['TmpDir']
   global_vars['Tools'] = {
     'wimlib-imagex': 'wimlib-imagex',
     'SevenZip': '7z',
@@ -933,13 +904,10 @@ def set_linux_vars():
 
 def set_log_file(log_name):
   """Sets global var LogFile and creates path as needed."""
-  if psutil.LINUX:
-    folder_path = global_vars['LogDir']
-  else:
-    folder_path = '{}{}{}'.format(
-      global_vars['LogDir'],
-      os.sep,
-      KIT_NAME_FULL)
+  folder_path = '{}{}{}'.format(
+    global_vars['LogDir'],
+    os.sep,
+    KIT_NAME_FULL)
   log_file = '{}{}{}'.format(
     folder_path,
     os.sep,

.bin/Scripts/functions/data.py

@@ -1,10 +1,103 @@
 # Wizard Kit: Functions - Data
 
 import ctypes
+import json
 
-from functions.json import *
+from functions.common import *
 from operator import itemgetter
-from settings.data import *
+
+
+# STATIC VARIABLES
+FAST_COPY_EXCLUDES = [
+  r'\*.esd',
+  r'\*.swm',
+  r'\*.wim',
+  r'\*.dd',
+  r'\*.dd.tgz',
+  r'\*.dd.txz',
+  r'\*.map',
+  r'\*.dmg',
+  r'\*.image',
+  r'$RECYCLE.BIN',
+  r'$Recycle.Bin',
+  r'.AppleDB',
+  r'.AppleDesktop',
+  r'.AppleDouble',
+  r'.com.apple.timemachine.supported',
+  r'.dbfseventsd',
+  r'.DocumentRevisions-V100*',
+  r'.DS_Store',
+  r'.fseventsd',
+  r'.PKInstallSandboxManager',
+  r'.Spotlight*',
+  r'.SymAV*',
+  r'.symSchedScanLockxz',
+  r'.TemporaryItems',
+  r'.Trash*',
+  r'.vol',
+  r'.VolumeIcon.icns',
+  r'desktop.ini',
+  r'Desktop?DB',
+  r'Desktop?DF',
+  r'hiberfil.sys',
+  r'lost+found',
+  r'Network?Trash?Folder',
+  r'pagefile.sys',
+  r'Recycled',
+  r'RECYCLER',
+  r'System?Volume?Information',
+  r'Temporary?Items',
+  r'Thumbs.db',
+  ]
+FAST_COPY_ARGS = [
+  '/cmd=noexist_only',
+  '/utf8',
+  '/skip_empty_dir',
+  '/linkdest',
+  '/no_ui',
+  '/auto_close',
+  '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
+  ]
+# Code borrowed from: https://stackoverflow.com/a/29075319
+SEM_NORMAL = ctypes.c_uint()
+SEM_FAILCRITICALERRORS = 1
+SEM_NOOPENFILEERRORBOX = 0x8000
+SEM_FAIL = SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS
+
+
+# Regex
+REGEX_EXCL_ITEMS = re.compile(
+  r'^(\.(AppleDB|AppleDesktop|AppleDouble'
+  r'|com\.apple\.timemachine\.supported|dbfseventsd'
+  r'|DocumentRevisions-V100.*|DS_Store|fseventsd|PKInstallSandboxManager'
+  r'|Spotlight.*|SymAV.*|symSchedScanLockxz|TemporaryItems|Trash.*'
+  r'|vol|VolumeIcon\.icns)|desktop\.(ini|.*DB|.*DF)'
+  r'|(hiberfil|pagefile)\.sys|lost\+found|Network\.*Trash\.*Folder'
+  r'|Recycle[dr]|System\.*Volume\.*Information|Temporary\.*Items'
+  r'|Thumbs\.db)$',
+  re.IGNORECASE)
+REGEX_EXCL_ROOT_ITEMS = re.compile(
+  r'^(boot(mgr|nxt)$|Config.msi'
+  r'|(eula|globdata|install|vc_?red)'
+  r'|.*.sys$|System Volume Information|RECYCLER?|\$Recycle\.bin'
+  r'|\$?Win(dows(.old.*|\.  BT|)$|RE_)|\$GetCurrent|Windows10Upgrade'
+  r'|PerfLogs|Program Files|SYSTEM.SAV'
+  r'|.*\.(esd|swm|wim|dd|map|dmg|image)$)',
+  re.IGNORECASE)
+REGEX_INCL_ROOT_ITEMS = re.compile(
+  r'^(AdwCleaner|(My\s*|)(Doc(uments?( and Settings|)|s?)|Downloads'
+  r'|Media|Music|Pic(ture|)s?|Vid(eo|)s?)'
+  r'|{prefix}(-?Info|-?Transfer|)'
+  r'|(ProgramData|Recovery|Temp.*|Users)$'
+  r'|.*\.(log|txt|rtf|qb\w*|avi|m4a|m4v|mp4|mkv|jpg|png|tiff?)$)'
+  r''.format(prefix=KIT_NAME_SHORT),
+  re.IGNORECASE)
+REGEX_WIM_FILE = re.compile(
+  r'\.wim$',
+  re.IGNORECASE)
+REGEX_WINDOWS_OLD = re.compile(
+  r'^Win(dows|)\.old',
+  re.IGNORECASE)
 
 
 # Classes
@@ -77,7 +170,8 @@ def find_core_storage_volumes(device_path=None):
     '--output', 'NAME,PARTTYPE']
   if device_path:
     cmd.append(device_path)
-  json_data = get_json_from_command(cmd)
+  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:
@@ -111,7 +205,7 @@ def find_core_storage_volumes(device_path=None):
 
     # Check log for found volumes
     cs_vols = {}
-    with open(log_path, 'r', encoding='utf-8', errors='ignore') as f:
+    with open(log_path, 'r') as f:
       for line in f.readlines():
         r = re.match(
           r'^.*echo "([^"]+)" . dmsetup create test(\d)$',
@@ -151,17 +245,14 @@ def is_valid_wim_file(item):
 def get_mounted_volumes():
   """Get mounted volumes, returns dict."""
   cmd = [
-    'findmnt',
-    '--list',
-    '--json',
-    '--bytes',
-    '--invert',
-    '--types', (
+    'findmnt', '-J', '-b', '-i',
+    '-t', (
       'autofs,binfmt_misc,bpf,cgroup,cgroup2,configfs,debugfs,devpts,'
       'devtmpfs,hugetlbfs,mqueue,proc,pstore,securityfs,sysfs,tmpfs'
       ),
-    '--output', 'SOURCE,TARGET,FSTYPE,LABEL,SIZE,AVAIL,USED']
-  json_data = get_json_from_command(cmd)
+    '-o', 'SOURCE,TARGET,FSTYPE,LABEL,SIZE,AVAIL,USED']
+  result = run_program(cmd)
+  json_data = json.loads(result.stdout.decode())
   mounted_volumes = []
   for item in json_data.get('filesystems', []):
     mounted_volumes.append(item)
@@ -186,7 +277,8 @@ def mount_volumes(
     find_core_storage_volumes(device_path)
 
   # Get list of block devices
-  json_data = get_json_from_command(cmd)
+  result = run_program(cmd)
+  json_data = json.loads(result.stdout.decode())
   devs = json_data.get('blockdevices', [])
 
   # Get list of volumes
@@ -199,8 +291,6 @@ def mount_volumes(
         volumes.update({child['name']: child})
       for grandchild in child.get('children', []):
         volumes.update({grandchild['name']: grandchild})
-        for great_grandchild in grandchild.get('children', []):
-          volumes.update({great_grandchild['name']: great_grandchild})
 
   # Get list of mounted volumes
   mounted_volumes = get_mounted_volumes()
@@ -218,7 +308,7 @@ def mount_volumes(
       report[vol_path] = vol_data
     elif 'children' in vol_data:
       # Skip LVM/RAID partitions (the real volume is mounted separately)
-      vol_data['show_data']['data'] = vol_data.get('fstype', 'Unknown')
+      vol_data['show_data']['data'] = vol_data.get('fstype', 'UNKNOWN')
       if vol_data.get('label', None):
         vol_data['show_data']['data'] += ' "{}"'.format(vol_data['label'])
       vol_data['show_data']['info'] = True
@@ -243,23 +333,17 @@ def mount_volumes(
       if vol_data['show_data']['data'] == 'Failed to mount':
         vol_data['mount_point'] = None
       else:
-        fstype = vol_data.get('fstype', 'Unknown FS')
         size_used = human_readable_size(
-          mounted_volumes[vol_path]['used'],
-          decimals=1,
-          )
+          mounted_volumes[vol_path]['used'])
         size_avail = human_readable_size(
-          mounted_volumes[vol_path]['avail'],
-          decimals=1,
-          )
+          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(
+        vol_data['show_data']['data'] = '{:40} ({} used, {} free)'.format(
           vol_data['show_data']['data'],
-          fstype,
           size_used,
           size_avail)
 
@@ -293,14 +377,6 @@ def mount_backup_shares(read_write=False):
 
 def mount_network_share(server, read_write=False):
   """Mount a network share defined by server."""
-  uid = '1000'
-
-  # Get UID
-  cmd = ['id', '--user', 'tech']
-  result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
-  if result.stdout.strip().isnumeric():
-    uid = result.stdout.strip()
-
   if read_write:
     username = server['RW-User']
     password = server['RW-Pass']
@@ -316,35 +392,18 @@ def mount_network_share(server, read_write=False):
     error = r'Failed to mount \\{Name}\{Share} ({IP})'.format(**server)
     success = 'Mounted {Name}'.format(**server)
   elif psutil.LINUX:
-    # Make mountpoint
     cmd = [
       'sudo', 'mkdir', '-p',
       '/Backups/{Name}'.format(**server)]
     run_program(cmd)
-
-    # Set mount options
-    cmd_options = [
-      # Assuming GID matches UID
-      'gid={}'.format(uid),
-      'uid={}'.format(uid),
-      ]
-    cmd_options.append('rw' if read_write else 'ro')
-    cmd_options.append('username={}'.format(username))
-    if password:
-      cmd_options.append('password={}'.format(password))
-    else:
-      # Skip password check
-      cmd_options.append('guest')
-
-    # Set mount command
     cmd = [
       'sudo', 'mount',
-      '//{IP}/{Share}'.format(**server).replace('\\', '/'),
+      '//{IP}/{Share}'.format(**server),
       '/Backups/{Name}'.format(**server),
-      '-o', ','.join(cmd_options),
-      ]
-
-    # Set result messages
+      '-o', '{}username={},password={}'.format(
+        '' if read_write else 'ro,',
+        username,
+        password)]
     warning = 'Failed to mount /Backups/{Name}, {IP} unreachable.'.format(
       **server)
     error = 'Failed to mount /Backups/{Name}'.format(**server)

.bin/Scripts/functions/info.py

@@ -3,7 +3,57 @@
 from borrowed import knownpaths
 from functions.activation import *
 from operator import itemgetter
-from settings.info import *
+
+
+# STATIC VARIABLES
+REG_PROFILE_LIST = r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList'
+REG_SHELL_FOLDERS = r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
+TMP_HIVE_PATH = 'TEMP_HIVE_MOUNT'
+EXTRA_FOLDERS = [
+  'Dropbox',
+  'Google Drive',
+  'OneDrive',
+  'SkyDrive',
+]
+SHELL_FOLDERS = {
+  #GUIDs from: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378457(v=vs.85).aspx
+  'Desktop': (
+    '{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}',
+    ),
+  'Documents': (
+    'Personal',
+    '{FDD39AD0-238F-46AF-ADB4-6C85480369C7}',
+    ),
+  'Downloads': (
+    '{374DE290-123F-4565-9164-39C4925E467B}',
+    ),
+  'Favorites': (
+    '{1777F761-68AD-4D8A-87BD-30B759FA33DD}',
+    ),
+  'Music': (
+    'My Music',
+    '{4BD8D571-6D19-48D3-BE97-422220080E43}',
+    ),
+  'Pictures': (
+    'My Pictures',
+    '{33E28130-4E1E-4676-835A-98395C3BC3BB}',
+    ),
+  'Videos': (
+    'My Video',
+    '{18989B1D-99B5-455B-841C-AB7C74E4DDFC}',
+    ),
+}
+
+
+# Regex
+REGEX_OFFICE = re.compile(
+  r'(Microsoft (Office\s+'
+    r'(365|Enterprise|Home|Pro(\s|fessional)'
+    r'|Single|Small|Standard|Starter|Ultimate|system)'
+    r'|Works[-\s\d]+\d)'
+  r'|(Libre|Open|Star)\s*Office'
+  r'|WordPerfect|Gnumeric|Abiword)',
+  re.IGNORECASE)
 
 
 def backup_file_list():
@@ -95,7 +145,7 @@ def get_installed_antivirus():
     out = out.stdout.decode().strip()
     state = out.split('=')[1]
     state = hex(int(state))
-    if str(state)[3:5] not in ['10', '11']:
+    if str(state)[3:5] != '10':
       programs.append('[Disabled] {}'.format(prod))
     else:
       programs.append(prod)
@@ -446,19 +496,16 @@ def show_os_name():
 
 def show_temp_files_size():
   """Show total size of temp files identified by BleachBit."""
-  size_str = None
-  total = 0
+  size = None
   with open(r'{LogDir}\Tools\BleachBit.log'.format(**global_vars), 'r') as f:
     for line in f.readlines():
-      if re.search(r'^Disk space (to be |)recovered:', line, re.IGNORECASE):
+      if re.search(r'^disk space to be recovered:', line, re.IGNORECASE):
         size = re.sub(r'.*: ', '', line.strip())
         size = re.sub(r'(\w)iB$', r' \1b', size)
-        total += convert_to_bytes(size)
-        size_str = human_readable_size(total, decimals=1)
-  if size_str is None:
-    print_warning('UNKNOWN', timestamp=False)
+  if size is None:
+    print_warning(size, timestamp=False)
   else:
-    print_standard(size_str, timestamp=False)
+    print_standard(size, timestamp=False)
 
 
 def show_user_data_summary(indent=8, width=32):

.bin/Scripts/functions/json.py

@@ -1,32 +0,0 @@
-# Wizard Kit: Functions - JSON
-
-import json
-
-from functions.common import *
-
-def get_json_from_command(cmd, check=True, ignore_errors=True):
-  """Capture JSON content from cmd output, returns dict.
-
-  If the data can't be decoded then either an exception is raised
-  or an empty dict is returned depending on ignore_errors.
-  """
-  errors = 'strict'
-  json_data = {}
-
-  if ignore_errors:
-    errors = 'ignore'
-
-  try:
-    result = run_program(cmd, check=check, encoding='utf-8', errors=errors)
-    json_data = json.loads(result.stdout)
-  except (subprocess.CalledProcessError, json.decoder.JSONDecodeError):
-    if not ignore_errors:
-      raise
-
-  return json_data
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/network.py

@@ -15,6 +15,27 @@ REGEX_VALID_IP = re.compile(
   re.IGNORECASE)
 
 
+def connect_to_network():
+  """Connect to network if not already connected."""
+  net_ifs = psutil.net_if_addrs()
+  net_ifs = [i[:2] for i in net_ifs.keys()]
+
+  # Bail if currently connected
+  if is_connected():
+    return
+
+  # WiFi
+  if 'wl' in net_ifs:
+    cmd = [
+      'nmcli', 'dev', 'wifi',
+      'connect', WIFI_SSID,
+      'password', WIFI_PASSWORD]
+    try_and_print(
+      message = 'Connecting to {}...'.format(WIFI_SSID),
+      function = run_program,
+      cmd = cmd)
+
+
 def is_connected():
   """Check for a valid private IP."""
   devs = psutil.net_if_addrs()

.bin/Scripts/functions/sensors.py

@@ -1,17 +1,22 @@
-'''Wizard Kit: Functions - Sensors'''
-# pylint: disable=no-name-in-module,wildcard-import
-# vim: sts=2 sw=2 ts=2
+# Wizard Kit: Functions - Sensors
 
 import json
 import re
 
 from functions.tmux import *
-from settings.sensors import *
 
 
-# Error Classes
-class ThermalLimitReachedError(Exception):
-  '''Thermal limit reached error.'''
+# STATIC VARIABLES
+TEMP_LIMITS = {
+  'GREEN':  60,
+  'YELLOW': 70,
+  'ORANGE': 80,
+  'RED':    90,
+  }
+
+
+# REGEX
+REGEX_COLORS = re.compile(r'\033\[\d+;?1?m')
 
 
 def clear_temps(sensor_data):
@@ -22,30 +27,28 @@ def clear_temps(sensor_data):
         _data['Temps'] = []
 
 
-def fix_sensor_str(_s):
+def fix_sensor_str(s):
   """Cleanup string and return str."""
-  _s = re.sub(r'^(\w+)-(\w+)-(\w+)', r'\1 (\2 \3)', _s, re.IGNORECASE)
-  _s = _s.title()
-  _s = _s.replace('Coretemp', 'CPUTemp')
-  _s = _s.replace('Acpi', 'ACPI')
-  _s = _s.replace('ACPItz', 'ACPI TZ')
-  _s = _s.replace('Isa ', 'ISA ')
-  _s = _s.replace('Pci ', 'PCI ')
-  _s = _s.replace('Id ', 'ID ')
-  _s = re.sub(r'(\D+)(\d+)', r'\1 \2', _s, re.IGNORECASE)
-  _s = re.sub(r'^K (\d+)Temp', r'AMD K\1 Temps', _s, re.IGNORECASE)
-  _s = re.sub(r'T(ctl|die)', r'CPU (T\1)', _s, re.IGNORECASE)
-  return _s
+  s = re.sub(r'^(\w+)-(\w+)-(\w+)', r'\1 (\2 \3)', s, re.IGNORECASE)
+  s = s.title()
+  s = s.replace('Coretemp', 'CoreTemp')
+  s = s.replace('Acpi', 'ACPI')
+  s = s.replace('ACPItz', 'ACPI TZ')
+  s = s.replace('Isa ', 'ISA ')
+  s = s.replace('Id ', 'ID ')
+  s = re.sub(r'(\D+)(\d+)', r'\1 \2', s, re.IGNORECASE)
+  s = s.replace('  ', ' ')
+  return s
 
 
 def generate_sensor_report(
     sensor_data, *temp_labels,
-    colors=True, cpu_only=False):
+    colors=True, core_only=False):
   """Generate report based on temp_labels, returns list if str."""
   report = []
   for _section, _adapters in sorted(sensor_data.items()):
-    # CPU temps then Other temps
-    if cpu_only and 'CPU' not in _section:
+    # CoreTemps then Other temps
+    if core_only and 'Core' not in _section:
       continue
     for _adapter, _sources in sorted(_adapters.items()):
       # Adapter
@@ -60,7 +63,7 @@ def generate_sensor_report(
             ': ' if _label != 'Current' else '',
             get_temp_str(_data.get(_label, '???'), colors=colors))
         report.append(_line)
-      if not cpu_only:
+      if not core_only:
         report.append(' ')
 
   # Handle empty reports (i.e. no sensors detected)
@@ -95,21 +98,21 @@ def get_colored_temp_str(temp):
   else:
     color = COLORS['CLEAR']
   return '{color}{prefix}{temp:2.0f}°C{CLEAR}'.format(
-    color=color,
-    prefix='-' if temp < 0 else '',
-    temp=temp,
+    color = color,
+    prefix = '-' if temp < 0 else '',
+    temp = temp,
     **COLORS)
 
 
 def get_raw_sensor_data():
   """Read sensor data and return dict."""
-  json_data = {}
+  data = {}
   cmd = ['sensors', '-j']
-
+  
   # Get raw data
   try:
     result = run_program(cmd)
-    result = result.stdout.decode('utf-8', errors='ignore').splitlines()
+    result = result.stdout.decode().splitlines()
   except subprocess.CalledProcessError:
     # Assuming no sensors available, set to empty list
     result = []
@@ -126,8 +129,8 @@ def get_raw_sensor_data():
   try:
     json_data = json.loads('\n'.join(raw_data))
   except json.JSONDecodeError:
-    # Still broken, just return the empty dict
-    pass
+    # Still broken, just set to empty dict
+    json_data = {}
 
   # Done
   return json_data
@@ -136,10 +139,10 @@ def get_raw_sensor_data():
 def get_sensor_data():
   """Parse raw sensor data and return new dict."""
   json_data = get_raw_sensor_data()
-  sensor_data = {'CPUTemps': {}, 'Other': {}}
+  sensor_data = {'CoreTemps': {}, 'Other': {}}
   for _adapter, _sources in json_data.items():
-    if is_cpu_adapter(_adapter):
-      _section = 'CPUTemps'
+    if 'coretemp' in _adapter:
+      _section = 'CoreTemps'
     else:
       _section = 'Other'
     sensor_data[_section][_adapter] = {}
@@ -161,8 +164,8 @@ def get_sensor_data():
             }
 
   # Remove empty sections
-  for _k, _v in sensor_data.items():
-    _v = {_k2: _v2 for _k2, _v2 in _v.items() if _v2}
+  for k, v in sensor_data.items():
+    v = {k2: v2 for k2, v2 in v.items() if v2}
 
   # Done
   return sensor_data
@@ -182,20 +185,14 @@ def get_temp_str(temp, colors=True):
       temp)
 
 
-def is_cpu_adapter(adapter):
-  """Checks if adapter is a known CPU adapter, returns bool."""
-  is_cpu = re.search(r'(core|k\d+)temp', adapter, re.IGNORECASE)
-  return bool(is_cpu)
-
-
 def monitor_sensors(monitor_pane, monitor_file):
   """Continually update sensor data and report to screen."""
   sensor_data = get_sensor_data()
   while True:
     update_sensor_data(sensor_data)
-    with open(monitor_file, 'w') as _f:
+    with open(monitor_file, 'w') as f:
       report = generate_sensor_report(sensor_data, 'Current', 'Max')
-      _f.write('\n'.join(report))
+      f.write('\n'.join(report))
     sleep(1)
     if monitor_pane and not tmux_poll_pane(monitor_pane):
       break
@@ -206,7 +203,7 @@ def save_average_temp(sensor_data, temp_label, seconds=10):
   clear_temps(sensor_data)
 
   # Get temps
-  for _i in range(seconds): # pylint: disable=unused-variable
+  for i in range(seconds):
     update_sensor_data(sensor_data)
     sleep(1)
 
@@ -217,7 +214,7 @@ def save_average_temp(sensor_data, temp_label, seconds=10):
         _data[temp_label] = sum(_data['Temps']) / len(_data['Temps'])
 
 
-def update_sensor_data(sensor_data, thermal_limit=None):
+def update_sensor_data(sensor_data):
   """Read sensors and update existing sensor_data, returns dict."""
   json_data = get_raw_sensor_data()
   for _section, _adapters in sensor_data.items():
@@ -229,15 +226,19 @@ def update_sensor_data(sensor_data, thermal_limit=None):
           _data['Current'] = _temp
           _data['Max'] = max(_temp, _data['Max'])
           _data['Temps'].append(_temp)
-        except Exception: # pylint: disable=broad-except
+        except Exception:
           # Dumb workound for Dell sensors with changing source names
           pass
 
-        # Check if thermal limit reached
-        if thermal_limit and _section == 'CPUTemps':
-          if max(_data['Current'], _data['Max']) >= thermal_limit:
-            raise ThermalLimitReachedError('CPU temps reached limit')
+
+def join_columns(column1, column2, width=55):
+  return '{:<{}}{}'.format(
+    column1,
+    55+len(column1)-len(REGEX_COLORS.sub('', column1)),
+    column2)
 
 
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/setup.py

@@ -1,13 +1,134 @@
 # Wizard Kit: Functions - Setup
 
-from functions.browsers import *
-from functions.json import *
 from functions.update import *
-from settings.setup import *
-from settings.sources import *
 
 
-# Configuration
+# STATIC VARIABLES
+HKU =  winreg.HKEY_USERS
+HKCR = winreg.HKEY_CLASSES_ROOT
+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',
+    'FileNotFoundError':  'File not found',
+  },
+  'Warning': {}}
+SETTINGS_CLASSIC_START = {
+  r'Software\IvoSoft\ClassicShell\Settings': {},
+  r'Software\IvoSoft\ClassicStartMenu': {
+    'DWORD Items': {'ShowedStyle2': 1},
+    },
+  r'Software\IvoSoft\ClassicStartMenu\MRU': {},
+  r'Software\IvoSoft\ClassicStartMenu\Settings': {
+    'DWORD Items': {'SkipMetro': 1},
+    'SZ Items': {
+      'MenuStyle': 'Win7',
+      'RecentPrograms': 'Recent',
+      },
+    },
+  }
+SETTINGS_EXPLORER_SYSTEM = {
+  # Disable Location Tracking
+  r'Software\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
+    'DWORD Items': {'SensorPermissionState': 0},
+    },
+  r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
+    'Status': {'Value': 0},
+    },
+  # Disable Telemetry
+  r'Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
+    'DWORD Items': {'AllowTelemetry': 0},
+    },
+  r'Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
+    'DWORD Items': {'AllowTelemetry': 0},
+    'WOW64_32': True,
+    },
+  r'Software\Policies\Microsoft\Windows\DataCollection': {
+    'DWORD Items': {'AllowTelemetry': 0},
+    },
+  # Disable Wi-Fi Sense
+  r'Software\Microsoft\PolicyManager\default\WiFi\AllowWiFiHotSpotReporting': {
+    'DWORD Items': {'Value': 0},
+    },
+  r'Software\Microsoft\PolicyManager\default\WiFi\AllowAutoConnectToWiFiSenseHotspots': {
+    'DWORD Items': {'Value': 0},
+    },
+  }
+SETTINGS_EXPLORER_USER = {
+  # Disable silently installed apps
+  r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
+    'DWORD Items': {'SilentInstalledAppsEnabled': 0},
+    },
+  # Disable Tips and Tricks
+  r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
+    'DWORD Items': {'SoftLandingEnabled ': 0},
+    },
+  # Hide People bar
+  r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People': {
+    'DWORD Items': {'PeopleBand': 0},
+    },
+  # Hide Search button / box
+  r'Software\Microsoft\Windows\CurrentVersion\Search': {
+    'DWORD Items': {'SearchboxTaskbarMode': 0},
+    },
+  # Change default Explorer view to "Computer"
+  r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced': {
+    'DWORD Items': {'LaunchTo': 1},
+    },
+  }
+SETTINGS_GOOGLE_CHROME = {
+  r'Software\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm': {
+    'SZ Items': {
+      'update_url': 'https://clients2.google.com/service/update2/crx'},
+    'WOW64_32': True,
+    },
+  r'Software\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco': {
+    'SZ Items': {
+      'update_url': 'https://clients2.google.com/service/update2/crx'},
+    '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++ 2010 x32...',
+    'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2010 x64...',
+    'Cmd': [r'2010sp1\x64\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2012 Update 4 x32...',
+    'Cmd': [r'2012u4\x32\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2012 Update 4 x64...',
+    'Cmd': [r'2012u4\x64\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2013 x32...',
+    'Cmd': [r'2013\x32\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2013 x64...',
+    'Cmd': [r'2013\x64\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2017 x32...',
+    'Cmd': [r'2017\x32\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2017 x64...',
+    'Cmd': [r'2017\x64\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  ]
+
+
 def config_classicstart():
   """Configure ClassicStart."""
   # User level, not system level
@@ -66,23 +187,24 @@ def config_explorer_system():
   write_registry_settings(SETTINGS_EXPLORER_SYSTEM, all_users=True)
 
 
-def config_explorer_user(setup_mode='All'):
-  """Configure Windows Explorer for current user per setup_mode."""
-  settings_explorer_user = {
-    k: v for k, v in SETTINGS_EXPLORER_USER.items()
-    if setup_mode not in v.get('Invalid modes', [])
-    }
-  write_registry_settings(settings_explorer_user, all_users=False)
+def config_explorer_user():
+  """Configure Windows Explorer for current user."""
+  write_registry_settings(SETTINGS_EXPLORER_USER, all_users=False)
 
 
-def config_windows_updates():
-  """Configure Windows updates."""
-  write_registry_settings(SETTINGS_WINDOWS_UPDATES, all_users=True)
+def disable_windows_telemetry():
+  """Disable Windows 10 telemetry settings with O&O ShutUp10."""
+  extract_item('ShutUp10', silent=True)
+  cmd = [
+    r'{BinDir}\ShutUp10\OOSU10.exe'.format(**global_vars),
+    r'{BinDir}\ShutUp10\1201.cfg'.format(**global_vars),
+    '/quiet']
+  run_program(cmd)
 
 
 def update_clock():
   """Set Timezone and sync clock."""
-  run_program(['tzutil', '/s', WINDOWS_TIME_ZONE], check=False)
+  run_program(['tzutil' ,'/s', WINDOWS_TIME_ZONE], check=False)
   run_program(['net', 'stop', 'w32ime'], check=False)
   run_program(
     ['w32tm', '/config', '/syncfromflags:manual',
@@ -114,39 +236,6 @@ def write_registry_settings(settings, all_users=False):
 
 
 # Installations
-def find_current_software():
-  """Find currently installed software, returns list."""
-  ninite_extras_path = r'{BaseDir}\Installers\Extras'.format(**global_vars)
-  installers = []
-
-  # Browsers
-  scan_for_browsers(silent=True)
-  for browser in ('Google Chrome', 'Mozilla Firefox', 'Opera Chromium'):
-    if is_installed(browser):
-      installers.append(
-        r'{}\Web Browsers\{}.exe'.format(ninite_extras_path, browser))
-
-  # TODO: Add more sections
-
-  return installers
-
-def find_missing_software():
-  """Find missing software based on dirs/files present, returns list."""
-  ninite_extras_path = r'{BaseDir}\Installers\Extras'.format(**global_vars)
-  installers = []
-
-  # Browsers
-  scan_for_browsers(silent=True)
-  for browser in ('Google Chrome', 'Mozilla Firefox', 'Opera Chromium'):
-    if profile_present(browser):
-      installers.append(
-        r'{}\Web Browsers\{}.exe'.format(ninite_extras_path, browser))
-
-  # TODO: Add more sections
-
-  return installers
-
-
 def install_adobe_reader():
   """Install Adobe Reader."""
   cmd = [
@@ -199,115 +288,29 @@ def install_firefox_extensions():
   run_program(cmd)
 
 
-def install_libreoffice(
-    quickstart=True, register_mso_types=True,
-    use_mso_formats=False, vcredist=False):
-  """Install LibreOffice using specified settings."""
-  cmd = [
-    'msiexec', '/passive', '/norestart',
-    '/i', r'{}\Installers\Extras\Office\LibreOffice.msi'.format(
-      global_vars['BaseDir']),
-    'REBOOTYESNO=No',
-    'ISCHECKFORPRODUCTUPDATES=0',
-    'QUICKSTART={}'.format(1 if quickstart else 0),
-    'UI_LANGS=en_US',
-    'VC_REDIST={}'.format(1 if vcredist else 0),
-    ]
-  if register_mso_types:
-    cmd.append('REGISTER_ALL_MSO_TYPES=1')
-  else:
-    cmd.append('REGISTER_NO_MSO_TYPES=1')
-  xcu_dir = r'{APPDATA}\LibreOffice\4\user'.format(**global_vars['Env'])
-  xcu_file = r'{}\registrymodifications.xcu'.format(xcu_dir)
-
-  # Set default save format
-  if use_mso_formats and not os.path.exists(xcu_file):
-    os.makedirs(xcu_dir, exist_ok=True)
-    with open(xcu_file, 'w', encoding='utf-8', newline='\n') as f:
-      f.write(LIBREOFFICE_XCU_DATA)
-
-  # Install LibreOffice
-  run_program(cmd, check=True)
-
-def install_ninite_bundle(
-    # pylint: disable=too-many-arguments,too-many-branches
-    base=True,
-    browsers_only=False,
-    libreoffice=False,
-    missing=False,
-    mse=False,
-    standard=True,
-    ):
+def install_ninite_bundle(mse=False, libreoffice=False):
   """Run Ninite installer(s), returns list of Popen objects."""
   popen_objects = []
-  if browsers_only:
-    # This option is deprecated
-    installer_path = r'{BaseDir}\Installers\Extras\Web Browsers'.format(
-      **global_vars)
-    scan_for_browsers(silent=True)
-    for browser in ('Google Chrome', 'Mozilla Firefox', 'Opera Chromium'):
-      if is_installed(browser):
-        cmd = r'{}\{}.exe'.format(installer_path, browser)
-        popen_objects.append(popen_program(cmd))
-
-    # Bail
-    return popen_objects
-
-  # Main selections
-  main_selections = []
-  if base:
-    main_selections.append('base')
-  if standard:
-    if global_vars['OS']['Version'] in ('8', '8.1', '10'):
-      main_selections.append('standard')
-    else:
-      main_selections.append('standard7')
-  if main_selections:
-    # Only run if base and/or standard are enabled
-    cmd = r'{}\Installers\Extras\Bundles\{}.exe'.format(
-      global_vars['BaseDir'],
-      '-'.join(main_selections),
-      )
-    popen_objects.append(popen_program([cmd]))
-
-  # Extra selections
-  extra_selections = {}
-  for cmd in find_current_software():
-    extra_selections[cmd] = True
-  if missing:
-    for cmd in find_missing_software():
-      extra_selections[cmd] = True
-
-  # Remove overlapping selections
-  regex = []
-  for n_name, n_group in NINITE_REGEX.items():
-    if n_name in main_selections:
-      regex.extend(n_group)
-  regex = '({})'.format('|'.join(regex))
-  extra_selections = {
-    cmd: True for cmd in extra_selections
-    if not re.search(regex, cmd, re.IGNORECASE)
-    }
-
-  # Start extra selections
-  for cmd in extra_selections:
-    popen_objects.append(popen_program([cmd]))
-
-  # Microsoft Security Essentials
-  if mse:
-    cmd = r'{}\Installers\Extras\Security\{}'.format(
-      global_vars['BaseDir'],
-      'Microsoft Security Essentials.exe',
-      )
-    popen_objects.append(popen_program([cmd]))
+  if global_vars['OS']['Version'] in ('8', '8.1', '10'):
+    # Modern selection
+    popen_objects.append(
+      popen_program(r'{BaseDir}\Installers\Extras\Bundles\Modern.exe'.format(
+        **global_vars)))
+  else:
+    # Legacy selection
+    if mse:
+      cmd = r'{BaseDir}\Installers\Extras\Security'.format(**global_vars)
+      cmd += r'\Microsoft Security Essentials.exe'
+      popen_objects.append(popen_program(cmd))
+    popen_objects.append(
+      popen_program(r'{BaseDir}\Installers\Extras\Bundles\Legacy.exe'.format(
+        **global_vars)))
 
   # LibreOffice
   if libreoffice:
-    cmd = r'{}\Installers\Extras\Office\{}'.format(
-      global_vars['BaseDir'],
-      'LibreOffice.exe',
-      )
-    popen_objects.append(popen_program([cmd]))
+    cmd = r'{BaseDir}\Installers\Extras\Office'.format(**global_vars)
+    cmd += r'\LibreOffice.exe'
+    popen_objects.append(popen_program(cmd))
 
   # Done
   return popen_objects
@@ -334,10 +337,6 @@ def open_device_manager():
   popen_program(['mmc', 'devmgmt.msc'])
 
 
-def open_speedtest():
-  popen_program(['start', '', 'https://fast.com'], shell=True)
-
-
 def open_windows_activation():
   popen_program(['slui'])
 
@@ -346,13 +345,6 @@ def open_windows_updates():
   popen_program(['control', '/name', 'Microsoft.WindowsUpdate'])
 
 
-def restart_explorer():
-  """Restart Explorer."""
-  kill_process('explorer.exe')
-  sleep(2)
-  kill_process('explorer.exe')
-
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
 

.bin/Scripts/functions/sw_diags.py

@@ -1,38 +1,31 @@
-# Wizard Kit: Functions - SW Diagnostics
+# Wizard Kit: Functions - Diagnostics
 
 import ctypes
 
 from functions.common import *
-from settings.sw_diags import *
 
 
-def check_4k_alignment(show_alert=False):
-  """Check that all partitions are 4K aligned."""
-  aligned = True
-  cmd = ['WMIC', 'partition', 'get', 'StartingOffset']
-  offsets = []
-
-  # Get offsets
-  result = run_program(cmd, encoding='utf-8', errors='ignore', check=False)
-  offsets = result.stdout.splitlines()
-
-  # Check offsets
-  for off in offsets:
-    off = off.strip()
-    if not off.isnumeric():
-      # Skip
-      continue
-
-    try:
-      aligned = aligned and int(off) % 4096 == 0
-    except ValueError:
-      # Ignore, this check is low priority
-      pass
-
-  # Show alert
-  if show_alert:
-    show_alert_box('One or more partitions are not 4K aligned')
-    raise Not4KAlignedError
+# STATIC VARIABLES
+AUTORUNS_SETTINGS = {
+  r'Software\Sysinternals\AutoRuns': {
+    'checkvirustotal': 1,
+    'EulaAccepted': 1,
+    'shownomicrosoft': 1,
+    'shownowindows': 1,
+    'showonlyvirustotal': 1,
+    'submitvirustotal': 0,
+    'verifysignatures': 1,
+    },
+  r'Software\Sysinternals\AutoRuns\SigCheck': {
+    'EulaAccepted': 1,
+    },
+  r'Software\Sysinternals\AutoRuns\Streams': {
+    'EulaAccepted': 1,
+    },
+  r'Software\Sysinternals\AutoRuns\VirusTotal': {
+    'VirusTotalTermsAccepted': 1,
+    },
+  }
 
 
 def check_connection():
@@ -48,37 +41,6 @@ def check_connection():
         abort()
 
 
-def check_os_support_status():
-  """Check if current OS is supported."""
-  msg = ''
-  outdated = False
-  unsupported = False
-
-  # Check OS version/notes
-  os_info = global_vars['OS'].copy()
-  if os_info['Notes'] == 'unsupported':
-    msg = 'The installed version of Windows is no longer supported'
-    unsupported = True
-  elif os_info['Notes'] == 'preview build':
-    msg = 'Preview builds are not officially supported'
-    unsupported = True
-  elif os_info['Version'] == '10' and os_info['Notes'] == 'outdated':
-    msg = 'The installed version of Windows is outdated'
-    outdated = True
-  if 'Preview' not in msg:
-    msg += '\n\nPlease consider upgrading before continuing setup.'
-
-  # Show alert
-  if outdated or unsupported:
-    show_alert_box(msg)
-
-  # Raise exception if necessary
-  if outdated:
-    raise WindowsOutdatedError
-  if unsupported:
-    raise WindowsUnsupportedError
-
-
 def check_secure_boot_status(show_alert=False):
   """Checks UEFI Secure Boot status via PowerShell."""
   boot_mode = get_boot_mode()
@@ -141,6 +103,33 @@ def get_boot_mode():
   return type_str
 
 
+def os_is_unsupported(show_alert=False):
+  """Checks if the current OS is unsupported, returns bool."""
+  msg = ''
+  unsupported = False
+
+  # Check OS version/notes
+  os_info = global_vars['OS'].copy()
+  if os_info['Notes'] == 'unsupported':
+    msg = 'The installed version of Windows is no longer supported'
+    unsupported = True
+  elif os_info['Notes'] == 'preview build':
+    msg = 'Preview builds are not officially supported'
+    unsupported = True
+  elif os_info['Version'] == '10' and os_info['Notes'] == 'outdated':
+    msg = 'The installed version of Windows is outdated'
+    unsupported = True
+  if 'Preview' not in msg:
+    msg += '\n\nPlease consider upgrading before continuing setup.'
+
+  # Show alert
+  if unsupported and show_alert:
+    show_alert_box(msg)
+
+  # Done
+  return unsupported
+
+
 def run_autoruns():
   """Run AutoRuns in the background with VirusTotal checks enabled."""
   extract_item('Autoruns', filter='autoruns*', silent=True)
@@ -230,10 +219,8 @@ def run_rkill():
         shutil.move(item.path, dest)
 
 
-def show_alert_box(message, title=None):
+def show_alert_box(message, title='Wizard Kit Warning'):
   """Show Windows alert box with message."""
-  if not title:
-    title = '{} Warning'.format(KIT_NAME_FULL)
   message_box = ctypes.windll.user32.MessageBoxW
   message_box(None, message, title, 0x00001030)
 

.bin/Scripts/functions/tmux.py

@@ -10,21 +10,6 @@ def create_file(filepath):
       f.write('')
 
 
-def tmux_capture_pane(pane_id=None):
-  """Capture text from target, or current, pane, returns str."""
-  cmd = ['tmux', 'capture-pane', '-p']
-  if pane_id:
-    cmd.extend(['-t', pane_id])
-  text = ''
-
-  # Capture
-  result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
-  text = result.stdout
-
-  # Done
-  return str(text)
-
-
 def tmux_get_pane_size(pane_id=None):
   """Get target, or current, pane size, returns tuple."""
   x = -1
@@ -141,18 +126,6 @@ def tmux_split_window(
   return result.stdout.decode().strip()
 
 
-def tmux_switch_client(target_session=None):
-  """Switch to target tmux session, or previous if none specified."""
-  cmd = ['tmux', 'switch-client']
-  if target_session:
-    cmd.extend(['-t', target_session])
-  else:
-    # Switch to previous instead
-    cmd.append('-p')
-
-  run_program(cmd, check=False)
-
-
 def tmux_update_pane(
     pane_id, command=None, working_dir=None,
     text=None, watch=None, watch_cmd='cat'):

.bin/Scripts/functions/ufd.py

@@ -1,471 +0,0 @@
-"""Wizard Kit: Functions - UFD"""
-# pylint: disable=broad-except,wildcard-import
-# vim: sts=2 sw=2 ts=2
-
-import os
-import re
-import shutil
-import pathlib
-from collections import OrderedDict
-from functions.common import *
-
-
-def case_insensitive_search(path, item):
-  """Search path for item case insensitively, returns str."""
-  regex_match = '^{}$'.format(item)
-  real_path = ''
-
-  # Quick check first
-  if os.path.exists('{}/{}'.format(path, item)):
-    real_path = '{}{}{}'.format(
-      path,
-      '' if path == '/' else '/',
-      item,
-      )
-
-  # Check all items in dir
-  for entry in os.scandir(path):
-    if re.match(regex_match, entry.name, re.IGNORECASE):
-      real_path = '{}{}{}'.format(
-        path,
-        '' if path == '/' else '/',
-        entry.name,
-        )
-
-  # Done
-  if not real_path:
-    raise FileNotFoundError('{}/{}'.format(path, item))
-
-  return real_path
-
-
-def confirm_selections(args):
-  """Ask tech to confirm selections, twice if necessary."""
-  if not ask('Is the above information correct?'):
-    abort(False)
-  ## Safety check
-  if not args['--update']:
-    print_standard(' ')
-    print_warning('SAFETY CHECK')
-    print_standard(
-      'All data will be DELETED from the disk and partition(s) listed above.')
-    print_standard(
-      'This is irreversible and will lead to {RED}DATA LOSS.{CLEAR}'.format(
-        **COLORS))
-    if not ask('Asking again to confirm, is this correct?'):
-      abort(False)
-
-  print_standard(' ')
-
-
-def copy_source(source, items, overwrite=False):
-  """Copy source items to /mnt/UFD."""
-  is_image = source.is_file()
-
-  # Mount source if necessary
-  if is_image:
-    mount(source, '/mnt/Source')
-
-  # Copy items
-  for i_source, i_dest in items:
-    i_source = '{}{}'.format(
-      '/mnt/Source' if is_image else source,
-      i_source,
-      )
-    i_dest = '/mnt/UFD{}'.format(i_dest)
-    try:
-      recursive_copy(i_source, i_dest, overwrite=overwrite)
-    except FileNotFoundError:
-      # Going to assume (hope) that this is fine
-      pass
-
-  # Unmount source if necessary
-  if is_image:
-    unmount('/mnt/Source')
-
-
-def find_first_partition(dev_path):
-  """Find path to first partition of dev, returns str."""
-  cmd = [
-    'lsblk',
-    '--list',
-    '--noheadings',
-    '--output', 'name',
-    '--paths',
-    dev_path,
-    ]
-  result = run_program(cmd, encoding='utf-8', errors='ignore')
-  part_path = result.stdout.splitlines()[-1].strip()
-
-  return part_path
-
-
-def find_path(path):
-  """Find path case-insensitively, returns pathlib.Path obj."""
-  path_obj = pathlib.Path(path).resolve()
-
-  # Quick check first
-  if path_obj.exists():
-    return path_obj
-
-  # Fix case
-  parts = path_obj.relative_to('/').parts
-  real_path = '/'
-  for part in parts:
-    try:
-      real_path = case_insensitive_search(real_path, part)
-    except NotADirectoryError:
-      # Reclassify error
-      raise FileNotFoundError(path)
-
-  # Raise error if path doesn't exist
-  path_obj = pathlib.Path(real_path)
-  if not path_obj.exists():
-    raise FileNotFoundError(path_obj)
-
-  # Done
-  return path_obj
-
-
-def get_user_home(user):
-  """Get path to user's home dir, returns str."""
-  home_dir = None
-  cmd = ['getent', 'passwd', user]
-  result = run_program(cmd, encoding='utf-8', errors='ignore', check=False)
-  try:
-    home_dir = result.stdout.split(':')[5]
-  except Exception:
-    # Just use HOME from ENV (or '/root' if that fails)
-    home_dir = os.environ.get('HOME', '/root')
-
-  return home_dir
-
-
-def get_user_name():
-  """Get real user name, returns str."""
-  user = None
-  if 'SUDO_USER' in os.environ:
-    user = os.environ.get('SUDO_USER', 'Unknown')
-  else:
-    user = os.environ.get('USER', 'Unknown')
-
-  return user
-
-
-def hide_items(ufd_dev, items):
-  """Set FAT32 hidden flag for items."""
-  # pylint: disable=invalid-name
-  with open('/root/.mtoolsrc', 'w') as f:
-    f.write('drive U: file="{}"\n'.format(
-      find_first_partition(ufd_dev)))
-    f.write('mtools_skip_check=1\n')
-
-  # Hide items
-  for item in items:
-    cmd = ['yes | mattrib +h "U:/{}"'.format(item)]
-    run_program(cmd, check=False, shell=True)
-
-
-def install_syslinux_to_dev(ufd_dev, use_mbr):
-  """Install Syslinux to UFD (dev)."""
-  cmd = [
-    'dd',
-    'bs=440',
-    'count=1',
-    'if=/usr/lib/syslinux/bios/{}.bin'.format(
-      'mbr' if use_mbr else 'gptmbr',
-      ),
-    'of={}'.format(ufd_dev),
-    ]
-  run_program(cmd)
-
-
-def install_syslinux_to_partition(partition):
-  """Install Syslinux to UFD (partition)."""
-  cmd = [
-    'syslinux',
-    '--install',
-    '--directory',
-    '/arch/boot/syslinux/',
-    partition,
-    ]
-  run_program(cmd)
-
-
-def is_valid_path(path_obj, path_type):
-  """Verify path_obj is valid by type, returns bool."""
-  valid_path = False
-  if path_type == 'DIR':
-    valid_path = path_obj.is_dir()
-  elif path_type == 'KIT':
-    valid_path = path_obj.is_dir() and path_obj.joinpath('.bin').exists()
-  elif path_type == 'IMG':
-    valid_path = path_obj.is_file() and path_obj.suffix.lower() == '.img'
-  elif path_type == 'ISO':
-    valid_path = path_obj.is_file() and path_obj.suffix.lower() == '.iso'
-  elif path_type == 'UFD':
-    valid_path = path_obj.is_block_device()
-
-  return valid_path
-
-
-def mount(mount_source, mount_point, read_write=False):
-  """Mount mount_source on mount_point."""
-  os.makedirs(mount_point, exist_ok=True)
-  cmd = [
-    'mount',
-    mount_source,
-    mount_point,
-    '-o',
-    'rw' if read_write else 'ro',
-    ]
-  run_program(cmd)
-
-
-def prep_device(dev_path, label, use_mbr=False, indent=2):
-  """Format device in preparation for applying the WizardKit components
-
-  This is done is four steps:
-  1. Zero-out first 64MB (this deletes the partition table and/or bootloader)
-  2. Create a new partition table (GPT by default, optionally MBR)
-  3. Set boot flag
-  4. Format partition (FAT32, 4K aligned)
-  """
-  # Zero-out first 64MB
-  cmd = 'dd bs=4M count=16 if=/dev/zero of={}'.format(dev_path).split()
-  try_and_print(
-    indent=indent,
-    message='Zeroing first 64MB...',
-    function=run_program,
-    cmd=cmd,
-    )
-
-  # Create partition table
-  cmd = 'parted {} --script -- mklabel {} mkpart primary fat32 4MiB {}'.format(
-    dev_path,
-    'msdos' if use_mbr else 'gpt',
-    '-1s' if use_mbr else '-4MiB',
-    ).split()
-  try_and_print(
-    indent=indent,
-    message='Creating partition table...',
-    function=run_program,
-    cmd=cmd,
-    )
-
-  # Set boot flag
-  cmd = 'parted {} set 1 {} on'.format(
-    dev_path,
-    'boot' if use_mbr else 'legacy_boot',
-    ).split()
-  try_and_print(
-    indent=indent,
-    message='Setting boot flag...',
-    function=run_program,
-    cmd=cmd,
-    )
-
-  # Format partition
-  cmd = [
-    'mkfs.vfat', '-F', '32',
-    '-n', label,
-    find_first_partition(dev_path),
-    ]
-  try_and_print(
-    indent=indent,
-    message='Formatting partition...',
-    function=run_program,
-    cmd=cmd,
-    )
-
-
-def recursive_copy(source, dest, overwrite=False):
-  """Copy source to dest recursively.
-
-  NOTE: This uses rsync style source/dest syntax.
-  If the source has a trailing slash then it's contents are copied,
-  otherwise the source itself is copied.
-
-  Examples assuming "ExDir/ExFile.txt" exists:
-  recursive_copy("ExDir", "Dest/") results in "Dest/ExDir/ExFile.txt"
-  recursive_copy("ExDir/", "Dest/") results in "Dest/ExFile.txt"
-
-  NOTE 2: dest does not use find_path because it might not exist.
-  """
-  copy_contents = source.endswith('/')
-  source = find_path(source)
-  dest = pathlib.Path(dest).resolve().joinpath(source.name)
-  os.makedirs(dest.parent, exist_ok=True)
-
-  if source.is_dir():
-    if copy_contents:
-      # Trailing slash syntax
-      for item in os.scandir(source):
-        recursive_copy(item.path, dest.parent, overwrite=overwrite)
-    elif not dest.exists():
-      # No conflict, copying whole tree (no merging needed)
-      shutil.copytree(source, dest)
-    elif not dest.is_dir():
-      # Refusing to replace file with dir
-      raise FileExistsError('Refusing to replace file: {}'.format(dest))
-    else:
-      # Dest exists and is a dir, merge dirs
-      for item in os.scandir(source):
-        recursive_copy(item.path, dest, overwrite=overwrite)
-  elif source.is_file():
-    if not dest.exists():
-      # No conflict, copying file
-      shutil.copy2(source, dest)
-    elif not dest.is_file():
-      # Refusing to replace dir with file
-      raise FileExistsError('Refusing to replace dir: {}'.format(dest))
-    elif overwrite:
-      # Dest file exists, deleting and replacing file
-      os.remove(dest)
-      shutil.copy2(source, dest)
-    else:
-      # Refusing to delete file when overwrite=False
-      raise FileExistsError('Refusing to delete file: {}'.format(dest))
-
-
-def remove_arch():
-  """Remove arch dir from UFD.
-
-  This ensures a clean installation to the UFD and resets the boot files
-  """
-  shutil.rmtree(find_path('/mnt/UFD/arch'))
-
-
-def running_as_root():
-  """Check if running with effective UID of 0, returns bool."""
-  return os.geteuid() == 0
-
-
-def show_selections(args, sources, ufd_dev, ufd_sources):
-  """Show selections including non-specified options."""
-
-  # Sources
-  print_info('Sources')
-  for label in ufd_sources.keys():
-    if label in sources:
-      print_standard('  {label:<18} {path}'.format(
-        label=label+':',
-        path=sources[label],
-        ))
-    else:
-      print_standard('  {label:<18} {YELLOW}Not Specified{CLEAR}'.format(
-        label=label+':',
-        **COLORS,
-        ))
-  print_standard(' ')
-
-  # Destination
-  print_info('Destination')
-  cmd = [
-    'lsblk', '--nodeps', '--noheadings', '--paths',
-    '--output', 'NAME,FSTYPE,TRAN,SIZE,VENDOR,MODEL,SERIAL',
-    ufd_dev,
-    ]
-  result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
-  print_standard(result.stdout.strip())
-  cmd = [
-    'lsblk', '--noheadings', '--paths',
-    '--output', 'NAME,SIZE,FSTYPE,LABEL,MOUNTPOINT',
-    ufd_dev,
-    ]
-  result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
-  for line in result.stdout.splitlines()[1:]:
-    print_standard(line)
-
-  # Notes
-  if args['--update']:
-    print_warning('Updating kit in-place')
-  elif args['--use-mbr']:
-    print_warning('Formatting using legacy MBR')
-  print_standard(' ')
-
-
-def unmount(mount_point):
-  """Unmount mount_point."""
-  cmd = ['umount', mount_point]
-  run_program(cmd)
-
-
-def update_boot_entries(boot_entries, boot_files, iso_label, ufd_label):
-  """Update boot files for UFD usage"""
-  configs = []
-
-  # Find config files
-  for c_path, c_ext in boot_files.items():
-    c_path = find_path('/mnt/UFD{}'.format(c_path))
-    for item in os.scandir(c_path):
-      if item.name.lower().endswith(c_ext.lower()):
-        configs.append(item.path)
-
-  # Update Linux labels
-  cmd = [
-    'sed',
-    '--in-place',
-    '--regexp-extended',
-    's/{}/{}/'.format(iso_label, ufd_label),
-    *configs,
-    ]
-  run_program(cmd)
-
-  # Uncomment extra entries if present
-  for b_path, b_comment in boot_entries.items():
-    try:
-      find_path('/mnt/UFD{}'.format(b_path))
-    except (FileNotFoundError, NotADirectoryError):
-      # Entry not found, continue to next entry
-      continue
-
-    # Entry found, update config files
-    cmd = [
-      'sed',
-      '--in-place',
-      's/#{}#//'.format(b_comment),
-      *configs,
-      ]
-    run_program(cmd, check=False)
-
-
-def verify_sources(args, ufd_sources):
-  """Check all sources and abort if necessary, returns dict."""
-  sources = OrderedDict()
-
-  for label, data in ufd_sources.items():
-    s_path = args[data['Arg']]
-    if s_path:
-      try:
-        s_path_obj = find_path(s_path)
-      except FileNotFoundError:
-        print_error('ERROR: {} not found: {}'.format(label, s_path))
-        abort(False)
-      if not is_valid_path(s_path_obj, data['Type']):
-        print_error('ERROR: Invalid {} source: {}'.format(label, s_path))
-        abort(False)
-      sources[label] = s_path_obj
-
-  return sources
-
-
-def verify_ufd(dev_path):
-  """Check that dev_path is a valid UFD, returns pathlib.Path obj."""
-  ufd_dev = None
-
-  try:
-    ufd_dev = find_path(dev_path)
-  except FileNotFoundError:
-    print_error('ERROR: UFD device not found: {}'.format(dev_path))
-    abort(False)
-
-  if not is_valid_path(ufd_dev, 'UFD'):
-    print_error('ERROR: Invalid UFD device: {}'.format(ufd_dev))
-    abort(False)
-
-  return ufd_dev
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")

.bin/Scripts/functions/update.py

@@ -67,22 +67,6 @@ def download_to_temp(out_name, source_url):
   download_generic(global_vars['TmpDir'], out_name, source_url)
 
 
-def download_windows_updates():
-  """Download stand alone Windows Update installers."""
-  # Prep
-  dest = r'{}\Installers\Extras\Windows Updates'.format(
-    global_vars['BaseDir'])
-
-
-  # Download
-  for kb, v in WINDOWS_UPDATE_SOURCES.items():
-    for winver, v2 in v.items():
-      for arch, url in v2.items():
-        name = 'KB{}-Windows{}-x{}.msu'.format(kb, winver, arch)
-        if not os.path.exists(r'{}\{}'.format(dest, name)):
-          download_generic(dest, name, url)
-
-
 def extract_generic(source, dest, mode='x', sz_args=[]):
   """Extract a file to a destination."""
   cmd = [
@@ -615,22 +599,6 @@ def update_adobe_reader_dc():
     dest, 'Adobe Reader DC.exe', SOURCE_URLS['Adobe Reader DC'])
 
 
-def update_libreoffice():
-  # Prep
-  dest = r'{}\Installers\Extras\Office'.format(
-    global_vars['BaseDir'])
-
-  # Remove existing installer
-  try:
-    os.remove(r'{}\LibreOffice.msi'.format(dest))
-  except FileNotFoundError:
-    pass
-
-  # Download
-  download_generic(
-    dest, 'LibreOffice.msi', SOURCE_URLS['LibreOffice'])
-
-
 def update_macs_fan_control():
   # Prep
   dest = r'{}\Installers'.format(
@@ -859,13 +827,8 @@ def update_wiztree():
 
   # Extract files
   extract_temp_to_cbin('wiztree.zip', 'WizTree')
-  ## NOTE: It's double-zipped for some reason?
-  extract_generic(
-    r'{}\WizTree\wiztree'.format(global_vars['CBinDir']),
-    r'{}\WizTree'.format(global_vars['CBinDir']))
 
   # Cleanup
-  remove_item(r'{}\WizTree\wiztree'.format(global_vars['CBinDir']))
   remove_from_temp('wiztree.zip')
 
 

.bin/Scripts/functions/windows_setup.py

@@ -2,7 +2,39 @@
 
 from functions.data import *
 from functions.disk import *
-from settings.windows_setup import *
+
+
+# STATIC VARIABLES
+WINDOWS_VERSIONS = [
+  {'Name': 'Windows 7 Home Basic',
+    'Image File': 'Win7',
+    'Image Name': 'Windows 7 HOMEBASIC'},
+  {'Name': 'Windows 7 Home Premium',
+    'Image File': 'Win7',
+    'Image Name': 'Windows 7 HOMEPREMIUM'},
+  {'Name': 'Windows 7 Professional',
+    'Image File': 'Win7',
+    'Image Name': 'Windows 7 PROFESSIONAL'},
+  {'Name': 'Windows 7 Ultimate',
+    'Image File': 'Win7',
+    'Image Name': 'Windows 7 ULTIMATE'},
+
+  {'Name': 'Windows 8.1',
+    'Image File': 'Win8',
+    'Image Name': 'Windows 8.1',
+    'CRLF': True},
+  {'Name': 'Windows 8.1 Pro',
+    'Image File': 'Win8',
+    'Image Name': 'Windows 8.1 Pro'},
+
+  {'Name': 'Windows 10 Home',
+    'Image File': 'Win10',
+    'Image Name': 'Windows 10 Home',
+    'CRLF': True},
+  {'Name': 'Windows 10 Pro',
+    'Image File': 'Win10',
+    'Image Name': 'Windows 10 Pro'},
+  ]
 
 
 def find_windows_image(windows_version):

.bin/Scripts/functions/windows_updates.py

@@ -1,143 +0,0 @@
-# Wizard Kit: Functions - Windows updates
-
-from functions.common import *
-
-
-# Functions
-def delete_folder(folder_path):
-  """Near-useless wrapper for shutil.rmtree."""
-  shutil.rmtree(folder_path)
-
-
-def disable_service(service_name):
-  """Set service startup to disabled."""
-  run_program(['sc', 'config', service_name, 'start=', 'disabled'])
-
-  # Verify service was disabled
-  start_type = get_service_start_type(service_name)
-  if not start_type.lower().startswith('disabled'):
-    raise GenericError('Failed to disable service {}'.format(service_name))
-
-
-def disable_windows_updates():
-  """Disable windows updates and clear SoftwareDistribution folder."""
-  indent=2
-  width=52
-  update_folders = [
-    r'{WINDIR}\SoftwareDistribution'.format(**global_vars['Env']),
-    r'{SYSTEMDRIVE}\$WINDOWS.~BT'.format(**global_vars['Env']),
-  ]
-
-  for service in ('wuauserv', 'bits'):
-    # Stop service
-    result = try_and_print(
-      'Stopping service {}...'.format(service),
-      indent=indent, width=width,
-      function=stop_service, service_name=service)
-    if not result['CS']:
-      result = try_and_print(
-        'Stopping service {}...'.format(service),
-        indent=indent, width=width,
-        function=stop_service, service_name=service)
-      if not result['CS']:
-        raise GenericError('Service {} could not be stopped.'.format(service))
-
-    # Disable service
-    result = try_and_print(
-      'Disabling service {}...'.format(service),
-      indent=indent, width=width,
-      function=disable_service, service_name=service)
-    if not result['CS']:
-      result = try_and_print(
-        'Disabling service {}...'.format(service),
-        indent=indent, width=width,
-        function=disable_service, service_name=service)
-      if not result['CS']:
-        raise GenericError('Service {} could not be disabled.'.format(service))
-
-  # Delete update folders
-  for folder_path in update_folders:
-    if os.path.exists(folder_path):
-      result = try_and_print(
-        'Deleting folder {}...'.format(folder_path),
-        indent=indent, width=width,
-        function=delete_folder, folder_path=folder_path)
-      if not result['CS']:
-        raise GenericError('Failed to remove folder {}'.format(folder_path))
-
-
-def enable_service(service_name, start_type='auto'):
-  """Enable service by setting start type."""
-  run_program(['sc', 'config', service_name, 'start=', start_type])
-
-
-def enable_windows_updates(silent=False):
-  """Enable windows updates"""
-  indent=2
-  width=52
-
-  for service in ('bits', 'wuauserv'):
-    # Enable service
-    start_type = 'auto'
-    if service == 'wuauserv':
-      start_type = 'demand'
-    if silent:
-      try:
-        enable_service(service, start_type=start_type)
-      except Exception:
-        # Try again
-        enable_service(service, start_type=start_type)
-    else:
-      result = try_and_print(
-        'Enabling service {}...'.format(service),
-        indent=indent, width=width,
-        function=enable_service, service_name=service, start_type=start_type)
-      if not result['CS']:
-        result = try_and_print(
-          'Enabling service {}...'.format(service),
-          indent=indent, width=width,
-          function=enable_service, service_name=service, start_type=start_type)
-        if not result['CS']:
-          raise GenericError('Service {} could not be enabled.'.format(service))
-
-
-def get_service_status(service_name):
-  """Get service status using psutil, returns str."""
-  status = 'Unknown'
-  try:
-    service = psutil.win_service_get(service_name)
-    status = service.status()
-  except psutil.NoSuchProcess:
-    # Ignore and return 'Unknown' below
-    pass
-
-  return status
-
-
-def get_service_start_type(service_name):
-  """Get service startup type using psutil, returns str."""
-  start_type = 'Unknown'
-  try:
-    service = psutil.win_service_get(service_name)
-    start_type = service.start_type()
-  except psutil.NoSuchProcess:
-    # Ignore and return 'Unknown' below
-    pass
-
-  return start_type
-
-
-def stop_service(service_name):
-  """Stop service."""
-  run_program(['net', 'stop', service_name], check=False)
-
-  # Verify service was stopped
-  status = get_service_status(service_name)
-  if not status.lower().startswith('stopped'):
-    raise GenericError('Failed to stop service {}'.format(service_name))
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/winpe_menus.py

@@ -3,7 +3,53 @@
 from functions.backup import *
 from functions.disk import *
 from functions.windows_setup import *
-from settings.winpe import *
+
+
+# STATIC VARIABLES
+FAST_COPY_PE_ARGS = [
+  '/cmd=noexist_only',
+  '/utf8',
+  '/skip_empty_dir',
+  '/linkdest',
+  '/no_ui',
+  '/auto_close',
+  '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
+  ]
+PE_TOOLS = {
+  'BlueScreenView': {
+    'Path': r'BlueScreenView\BlueScreenView.exe',
+    },
+  'FastCopy': {
+    'Path': r'FastCopy\FastCopy.exe',
+    'Args': FAST_COPY_PE_ARGS,
+    },
+  'HWiNFO': {
+    'Path': r'HWiNFO\HWiNFO.exe',
+    },
+  'NT Password Editor': {
+    'Path': r'NT Password Editor\ntpwedit.exe',
+    },
+  'Notepad++': {
+    'Path': r'NotepadPlusPlus\NotepadPlusPlus.exe',
+    },
+  'PhotoRec': {
+    'Path': r'TestDisk\photorec_win.exe',
+    'Args': ['-new_console:n'],
+    },
+  'Prime95': {
+    'Path': r'Prime95\prime95.exe',
+    },
+  'ProduKey': {
+    'Path': r'ProduKey\ProduKey.exe',
+    },
+  'Q-Dir': {
+    'Path': r'Q-Dir\Q-Dir.exe',
+    },
+  'TestDisk': {
+    'Path': r'TestDisk\testdisk_win.exe',
+    'Args': ['-new_console:n'],
+    },
+  }
 
 
 def check_pe_tools():

.bin/Scripts/hw-diags

@@ -1,11 +1,46 @@
 #!/bin/bash
 #
-## Wizard Kit: HW Diagnostics Launcher
-
-source launch-in-tmux
+## Wizard Kit: HW Diagnostics - Menu Launcher
 
 SESSION_NAME="hw-diags"
 WINDOW_NAME="Hardware Diagnostics"
-TMUX_CMD="hw-diags-menu"
+MENU="hw-diags-menu"
+
+function ask() {
+    while :; do
+        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
+            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 "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
+        echo "Aborted."
+        echo ""
+        echo -n "Press Enter to exit... "
+        read -r
+        exit 0
+    fi
+fi
+
+# Start session
+tmux new-session -A -s "$SESSION_NAME" -n "$WINDOW_NAME" "$MENU" $*
 
-launch_in_tmux "$@"

.bin/Scripts/hw-diags-audio

@@ -34,8 +34,8 @@ if __name__ == '__main__':
     #print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/hw-diags-menu

@@ -22,45 +22,15 @@ if __name__ == '__main__':
     print_standard(' ')
     sleep(1)
     pause('Press Enter to exit...')
-  except SystemExit as sys_exit:
-    tmux_switch_client()
-    exit_script(sys_exit.code)
+  except SystemExit:
+    # Normal exit
+    pass
   except:
-    # Cleanup
     tmux_kill_all_panes()
-
-    if DEBUG_MODE:
-      # Custom major exception
-      print_standard(' ')
-      print_error('Major exception')
-      print_warning(SUPPORT_MESSAGE)
-      print(traceback.format_exc())
-      print_log(traceback.format_exc())
-
-      # Save debug reports and upload data
-      try_and_print(
-        message='Saving debug reports...',
-        function=save_debug_reports,
-        state=state, global_vars=global_vars)
-      question = 'Upload crash details to {}?'.format(CRASH_SERVER['Name'])
-      if ENABLED_UPLOAD_DATA and ask(question):
-        try_and_print(
-          message='Uploading Data...',
-          function=upload_logdir,
-          global_vars=global_vars)
-
-      # Done
-      sleep(1)
-      pause('Press Enter to exit...')
-      exit_script(1)
-
-    else:
-      # "Normal" major exception
-      major_exception()
+    major_exception()
 
   # Done
   tmux_kill_all_panes()
-  tmux_switch_client()
   exit_script()
 
 # vim: sts=2 sw=2 ts=2

.bin/Scripts/hw-diags-network

@@ -40,8 +40,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/hw-drive-info

@@ -3,9 +3,9 @@
 
 BLUE='\033[34m'
 CLEAR='\033[0m'
-IFS=$'\n'
 
 # List devices
+IFS=$'\n'
 for line in $(lsblk -do NAME,TRAN,SIZE,VENDOR,MODEL,SERIAL); do
     if [[ "${line:0:4}" == "NAME" ]]; then
         echo -e "${BLUE}${line}${CLEAR}"
@@ -15,18 +15,6 @@ for line in $(lsblk -do NAME,TRAN,SIZE,VENDOR,MODEL,SERIAL); do
 done
 echo ""
 
-# List loopback devices
-if [[ "$(losetup -l | wc -l)" > 0 ]]; then
-    for line in $(losetup -lO NAME,PARTSCAN,RO,BACK-FILE); do
-        if [[ "${line:0:4}" == "NAME" ]]; then
-            echo -e "${BLUE}${line}${CLEAR}"
-        else
-            echo "${line}" | sed -r 's#/dev/(loop[0-9]+)#\1     #'
-        fi
-    done
-    echo ""
-fi
-
 # List partitions
 for line in $(lsblk -o NAME,SIZE,FSTYPE,LABEL,MOUNTPOINT); do
     if [[ "${line:0:4}" == "NAME" ]]; then

.bin/Scripts/hw-sensors-monitor

@@ -28,8 +28,8 @@ if __name__ == '__main__':
       run_program(cmd, check=False)
     monitor_sensors(monitor_pane, monitor_file)
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/install_sw_bundle.py

@@ -25,6 +25,7 @@ if __name__ == '__main__':
         'UnsupportedOSError':   'Unsupported OS',
       }}
     answer_extensions = ask('Install Extensions?')
+    answer_adobe_reader = ask('Install Adobe Reader?')
     answer_vcr = ask('Install Visual C++ Runtimes?')
     answer_ninite = ask('Install Ninite Bundle?')
     if answer_ninite and global_vars['OS']['Version'] in ['7']:
@@ -34,6 +35,9 @@ if __name__ == '__main__':
       answer_mse = False
 
     print_info('Installing Programs')
+    if answer_adobe_reader:
+      try_and_print(message='Adobe Reader DC...',
+        function=install_adobe_reader, other_results=other_results)
     if answer_vcr:
       install_vcredists()
     if answer_ninite:
@@ -55,8 +59,8 @@ if __name__ == '__main__':
         other_results=other_results)
     print_standard('\nDone.')
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/install_vcredists.py

@@ -27,8 +27,8 @@ if __name__ == '__main__':
 
     print_standard('\nDone.')
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/launch-in-tmux

@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-## Wizard Kit: TMUX Launcher
-
-function ask() {
-    while :; do
-        read -p "$1 [Y/N] " -r answer
-        if echo "$answer" | grep -Eiq '^(y|yes|sure)$'; then
-            return 0
-        elif echo "$answer" | grep -Eiq '^(n|no|nope)$'; then
-            return 1
-        fi
-    done
-}
-
-die () {
-    echo "$0:" "$@" >&2
-    exit 1
-}
-
-function launch_in_tmux() {
-  # Check for required vars
-  [[ -n "${SESSION_NAME:-}" ]] || die "Required variable missing (SESSION_NAME)"
-  [[ -n "${WINDOW_NAME:-}" ]] || die "Required variable missing (WINDOW_NAME)"
-  [[ -n "${TMUX_CMD:-}" ]] || die "Required variable missing (TMUX_CMD)"
-
-  # Check for running session
-  if tmux list-session | grep -q "$SESSION_NAME"; then
-      echo "WARNING: tmux session $SESSION_NAME already exists."
-      echo ""
-      if ask "Connect to current session?"; then
-          if [[ -n "${TMUX:-}" ]]; then
-              # Running inside TMUX, switch to session
-              tmux switch-client -t "$SESSION_NAME"
-          else
-              # Running outside TMUX, attach to session
-              tmux attach-session -t "$SESSION_NAME"
-          fi
-          exit 0
-      elif ask "Kill current session and start new 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/Rename session
-  if [[ -n "${TMUX:-}" ]]; then
-      # Running inside TMUX, rename session/window and open the menu
-      tmux rename-session "$SESSION_NAME"
-      tmux rename-window "$WINDOW_NAME"
-      "$TMUX_CMD" "$@"
-      tmux rename-session "${SESSION_NAME}_DONE"
-      tmux rename-window "${WINDOW_NAME}_DONE"
-  else
-      # Running outside TMUX, start/attach to session
-      tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$TMUX_CMD" "$@"
-  fi
-}

.bin/Scripts/mount-all-volumes

@@ -30,8 +30,8 @@ if __name__ == '__main__':
       pause("Press Enter to exit...")
       popen_program(['nohup', 'thunar', '/media'], pipe=True)
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/mount-backup-shares

@@ -16,6 +16,9 @@ if __name__ == '__main__':
     # Prep
     clear_screen()
 
+    # Connect
+    connect_to_network()
+
     # Mount
     if is_connected():
       mount_backup_shares(read_write=True)
@@ -27,8 +30,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/msword-search

@@ -76,8 +76,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/new_system_setup.py

@@ -0,0 +1,157 @@
+# Wizard Kit: New system setup
+
+import os
+import sys
+
+# Init
+os.chdir(os.path.dirname(os.path.realpath(__file__)))
+sys.path.append(os.getcwd())
+from functions.activation import *
+from functions.browsers import *
+from functions.cleanup import *
+from functions.info import *
+from functions.product_keys import *
+from functions.setup import *
+from functions.sw_diags import *
+init_global_vars()
+os.system('title {}: New System Setup'.format(KIT_NAME_FULL))
+set_log_file('New System Setup.log')
+
+if __name__ == '__main__':
+  other_results = {
+    'Error': {
+      'BIOSKeyNotFoundError':     'BIOS key not found',
+      'CalledProcessError':       'Unknown Error',
+      'FileNotFoundError':        'File not found',
+      'GenericError':             'Unknown Error',
+      'SecureBootDisabledError':  'Disabled',
+    },
+    'Warning': {
+      'GenericRepair':            'Repaired',
+      'NoProfilesError':          'No profiles found',
+      'NotInstalledError':        'Not installed',
+      'OSInstalledLegacyError':   'OS installed Legacy',
+      'SecureBootNotAvailError':  'Not available',
+      'SecureBootUnknownError':   'Unknown',
+      'UnsupportedOSError':       'Unsupported OS',
+    }}
+  try:
+    stay_awake()
+    clear_screen()
+
+    # Check installed OS
+    if os_is_unsupported(show_alert=False):
+      print_warning('OS version not supported by this script')
+      if not ask('Continue anyway? (NOT RECOMMENDED)'):
+        abort()
+
+    # Install Adobe Reader?
+    answer_adobe_reader = ask('Install Adobe Reader?')
+
+    # Install LibreOffice?
+    answer_libreoffice = ask('Install LibreOffice?')
+
+    # Install MSE?
+    if global_vars['OS']['Version'] == '7':
+      answer_mse = ask('Install MSE?')
+    else:
+      answer_mse = False
+
+    # Install software
+    print_info('Installing Programs')
+    install_vcredists()
+    if answer_adobe_reader:
+      try_and_print(message='Adobe Reader DC...',
+        function=install_adobe_reader, other_results=other_results)
+    result = try_and_print(
+      message='Ninite bundle...',
+      function=install_ninite_bundle, cs='Started',
+      mse=answer_mse, libreoffice=answer_libreoffice,
+      other_results=other_results)
+    for proc in result['Out']:
+      # Wait for all processes to finish
+      proc.wait()
+
+    # Scan for supported browsers
+    print_info('Scanning for browsers')
+    scan_for_browsers()
+
+    # Install extensions
+    print_info('Installing Extensions')
+    try_and_print(message='Classic Shell skin...',
+      function=install_classicstart_skin,
+      other_results=other_results)
+    try_and_print(message='Google Chrome extensions...',
+      function=install_chrome_extensions)
+    try_and_print(message='Mozilla Firefox extensions...',
+      function=install_firefox_extensions,
+      other_results=other_results)
+
+    # Configure software
+    print_info('Configuring programs')
+    install_adblock()
+    if global_vars['OS']['Version'] == '10':
+      try_and_print(message='ClassicStart...',
+        function=config_classicstart, cs='Done')
+      try_and_print(message='Explorer...',
+        function=config_explorer_user, cs='Done')
+
+    # Configure system
+    print_info('Configuring system')
+    if global_vars['OS']['Version'] == '10':
+      try_and_print(message='Explorer...',
+        function=config_explorer_system, cs='Done')
+      try_and_print(message='Disabling telemetry...',
+        function=disable_windows_telemetry, cs='Done')
+    try_and_print(message='Updating Clock...',
+      function=update_clock, cs='Done')
+
+    # Summary
+    print_info('Summary')
+    try_and_print(message='Operating System:',
+      function=show_os_name, ns='Unknown', silent_function=False)
+    try_and_print(message='Activation:',
+      function=show_os_activation, ns='Unknown', silent_function=False)
+    if (not windows_is_activated()
+      and global_vars['OS']['Version'] in ('8', '8.1', '10')):
+      try_and_print(message='BIOS Activation:',
+        function=activate_with_bios,
+        other_results=other_results)
+    try_and_print(message='Secure Boot Status:',
+      function=check_secure_boot_status, other_results=other_results)
+    try_and_print(message='Installed RAM:',
+      function=show_installed_ram, ns='Unknown', silent_function=False)
+    show_free_space()
+    try_and_print(message='Installed Antivirus:',
+      function=get_installed_antivirus, ns='Unknown',
+      other_results=other_results, print_return=True)
+
+    # Play audio, show devices, open Windows updates, and open Activation
+    try_and_print(message='Opening Device Manager...',
+      function=open_device_manager, cs='Started')
+    try_and_print(message='Opening HWiNFO (Sensors)...',
+      function=run_hwinfo_sensors, cs='Started', other_results=other_results)
+    try_and_print(message='Opening Windows Updates...',
+      function=open_windows_updates, cs='Started')
+    if not windows_is_activated():
+      try_and_print(message='Opening Windows Activation...',
+        function=open_windows_activation, cs='Started')
+    sleep(3)
+    try_and_print(message='Running XMPlay...',
+      function=run_xmplay, cs='Started', other_results=other_results)
+    try:
+      check_secure_boot_status(show_alert=True)
+    except:
+      # Only trying to open alert message boxes
+      pass
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter to exit...')
+    exit_script()
+  except SystemExit:
+    pass
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/safemode_enter.py

@@ -31,8 +31,8 @@ if __name__ == '__main__':
     pause('Press Enter to reboot...')
     reboot()
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/safemode_exit.py

@@ -31,8 +31,8 @@ if __name__ == '__main__':
     pause('Press Enter to reboot...')
     reboot()
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/settings/browsers.py

@@ -1,99 +0,0 @@
-# Wizard Kit: Settings - Browsers
-
-import os
-import re
-
-# General
-DEFAULT_HOMEPAGE =      'https://www.google.com/'
-IE_GALLERY =            'https://www.microsoft.com/en-us/iegallery'
-MOZILLA_PREFS = {
-  'browser.search.defaultenginename': '"Google"',
-  'browser.search.defaultenginename.US': '"Google"',
-  'browser.search.geoSpecificDefaults': 'false',
-  'browser.startup.homepage': '"{}"'.format(DEFAULT_HOMEPAGE),
-  'extensions.ui.lastCategory': '"addons://list/extension"',
-  }
-SUPPORTED_BROWSERS = {
-  'Internet Explorer': {
-    'base':             'ie',
-    'exe_name':         'iexplore.exe',
-    'rel_install_path': 'Internet Explorer',
-    'user_data_path':   r'{USERPROFILE}\Favorites',
-    },
-  'Google Chrome': {
-    'base':             'chromium',
-    'exe_name':         'chrome.exe',
-    'rel_install_path': r'Google\Chrome\Application',
-    'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome\User Data',
-    },
-  'Google Chrome Canary': {
-    'base':             'chromium',
-    'exe_name':         'chrome.exe',
-    'rel_install_path': r'Google\Chrome SxS\Application',
-    'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome SxS\User Data',
-    },
-  'Mozilla Firefox': {
-    'base':             'mozilla',
-    'exe_name':         'firefox.exe',
-    'rel_install_path': 'Mozilla Firefox',
-    'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
-    },
-  'Mozilla Firefox Dev': {
-    'base':             'mozilla',
-    'exe_name':         'firefox.exe',
-    'rel_install_path': 'Firefox Developer Edition',
-    'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
-    },
-  'Opera': {
-    'base':             'chromium',
-    'exe_name':         'launcher.exe',
-    'rel_install_path': 'Opera',
-    'user_data_path':   r'{APPDATA}\Opera Software\Opera Stable',
-    },
-  'Opera Beta': {
-    'base':             'chromium',
-    'exe_name':         'launcher.exe',
-    'rel_install_path': 'Opera beta',
-    'user_data_path':   r'{APPDATA}\Opera Software\Opera Next',
-    },
-  'Opera Dev': {
-    'base':             'chromium',
-    'exe_name':         'launcher.exe',
-    'rel_install_path': 'Opera developer',
-    'user_data_path':   r'{APPDATA}\Opera Software\Opera Developer',
-    },
-  }
-
-# Regex
-REGEX_BACKUP = re.compile(
-  r'\.\w*bak.*',
-  re.IGNORECASE)
-REGEX_CHROMIUM_PROFILE = re.compile(
-  r'^(Default|Profile)',
-  re.IGNORECASE)
-REGEX_CHROMIUM_ITEMS = re.compile(
-  r'^(Bookmarks|Cookies|Favicons|Google Profile'
-  r'|History|Login Data|Top Sites|TransportSecurity'
-  r'|Visited Links|Web Data)',
-  re.IGNORECASE)
-REGEX_MOZILLA = re.compile(
-  r'^(bookmarkbackups|(cookies|formhistory|places).sqlite'
-  r'|key3.db|logins.json|persdict.dat)$',
-  re.IGNORECASE)
-
-# uBlock Origin
-UBO_CHROME =            'https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm?hl=en'
-UBO_CHROME_REG =        r'Software\Wow6432Node\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm'
-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'
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2 tw=0

.bin/Scripts/settings/cleanup.py

@@ -1,37 +0,0 @@
-'''Wizard Kit: Settings - Cleanup'''
-# vim: sts=2 sw=2 ts=2
-
-import re
-
-# Regex
-DESKTOP_ITEMS = re.compile(
-  r'^(JRT|RKill|sc-cleaner)',
-  re.IGNORECASE,
-  )
-
-# Registry
-UAC_DEFAULTS_WIN7 = {
-  r'Software\Microsoft\Windows\CurrentVersion\Policies\System': {
-    'DWORD Items': {
-      'ConsentPromptBehaviorAdmin': 5,
-      'EnableLUA': 1,
-      'PromptOnSecureDesktop': 1,
-      },
-    },
-  }
-UAC_DEFAULTS_WIN10 = {
-  r'Software\Microsoft\Windows\CurrentVersion\Policies\System': {
-    'DWORD Items': {
-      'ConsentPromptBehaviorAdmin': 5,
-      'ConsentPromptBehaviorUser': 3,
-      'EnableInstallerDetection': 1,
-      'EnableLUA': 1,
-      'EnableVirtualization': 1,
-      'PromptOnSecureDesktop': 1,
-      },
-    },
-  }
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")

.bin/Scripts/settings/data.py

@@ -1,105 +0,0 @@
-# Wizard Kit: Settings - Data
-
-import ctypes
-import re
-
-from settings.main import *
-
-# FastCopy
-FAST_COPY_EXCLUDES = [
-  r'\*.esd',
-  r'\*.swm',
-  r'\*.wim',
-  r'\*.dd',
-  r'\*.dd.tgz',
-  r'\*.dd.txz',
-  r'\*.map',
-  r'\*.dmg',
-  r'\*.image',
-  r'$RECYCLE.BIN',
-  r'$Recycle.Bin',
-  r'.AppleDB',
-  r'.AppleDesktop',
-  r'.AppleDouble',
-  r'.com.apple.timemachine.supported',
-  r'.dbfseventsd',
-  r'.DocumentRevisions-V100*',
-  r'.DS_Store',
-  r'.fseventsd',
-  r'.PKInstallSandboxManager',
-  r'.Spotlight*',
-  r'.SymAV*',
-  r'.symSchedScanLockxz',
-  r'.TemporaryItems',
-  r'.Trash*',
-  r'.vol',
-  r'.VolumeIcon.icns',
-  r'desktop.ini',
-  r'Desktop?DB',
-  r'Desktop?DF',
-  r'hiberfil.sys',
-  r'lost+found',
-  r'Network?Trash?Folder',
-  r'pagefile.sys',
-  r'Recycled',
-  r'RECYCLER',
-  r'System?Volume?Information',
-  r'Temporary?Items',
-  r'Thumbs.db',
-  ]
-FAST_COPY_ARGS = [
-  '/cmd=noexist_only',
-  '/utf8',
-  '/skip_empty_dir',
-  '/linkdest',
-  '/no_ui',
-  '/auto_close',
-  '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
-  ]
-
-# Regex
-REGEX_EXCL_ITEMS = re.compile(
-  r'^(\.(AppleDB|AppleDesktop|AppleDouble'
-  r'|com\.apple\.timemachine\.supported|dbfseventsd'
-  r'|DocumentRevisions-V100.*|DS_Store|fseventsd|PKInstallSandboxManager'
-  r'|Spotlight.*|SymAV.*|symSchedScanLockxz|TemporaryItems|Trash.*'
-  r'|vol|VolumeIcon\.icns)|desktop\.(ini|.*DB|.*DF)'
-  r'|(hiberfil|pagefile)\.sys|lost\+found|Network\.*Trash\.*Folder'
-  r'|Recycle[dr]|System\.*Volume\.*Information|Temporary\.*Items'
-  r'|Thumbs\.db)$',
-  re.IGNORECASE)
-REGEX_EXCL_ROOT_ITEMS = re.compile(
-  r'^(boot(mgr|nxt)$|Config.msi'
-  r'|(eula|globdata|install|vc_?red)'
-  r'|.*.sys$|System Volume Information|RECYCLER?|\$Recycle\.bin'
-  r'|\$?Win(dows(.old.*|\.  BT|)$|RE_)|\$GetCurrent|Windows10Upgrade'
-  r'|PerfLogs|Program Files|SYSTEM.SAV'
-  r'|.*\.(esd|swm|wim|dd|map|dmg|image)$)',
-  re.IGNORECASE)
-REGEX_INCL_ROOT_ITEMS = re.compile(
-  r'^(AdwCleaner|(My\s*|)(Doc(uments?( and Settings|)|s?)|Downloads'
-  r'|Media|Music|Pic(ture|)s?|Vid(eo|)s?)'
-  r'|{prefix}(-?Info|-?Transfer|)'
-  r'|(ProgramData|Recovery|Temp.*|Users)$'
-  r'|.*\.(log|txt|rtf|qb\w*|avi|m4a|m4v|mp4|mkv|jpg|png|tiff?)$)'
-  r''.format(prefix=KIT_NAME_SHORT),
-  re.IGNORECASE)
-REGEX_WIM_FILE = re.compile(
-  r'\.wim$',
-  re.IGNORECASE)
-REGEX_WINDOWS_OLD = re.compile(
-  r'^Win(dows|)\.old',
-  re.IGNORECASE)
-
-# Thread error modes
-## Code borrowed from: https://stackoverflow.com/a/29075319
-SEM_NORMAL = ctypes.c_uint()
-SEM_FAILCRITICALERRORS = 1
-SEM_NOOPENFILEERRORBOX = 0x8000
-SEM_FAIL = SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/ddrescue.py

@@ -1,61 +0,0 @@
-# Wizard Kit: Settings - ddrescue-tui
-
-import re
-
-from collections import OrderedDict
-
-# General
-MAP_DIR = '/Backups/ddrescue-tui'
-RECOMMENDED_FSTYPES = ['ext3', 'ext4', 'xfs']
-RECOMMENDED_MAP_FSTYPES = ['cifs', 'ext2', 'ext3', 'ext4', 'vfat', 'xfs']
-USAGE = """  {script_name} clone [source [destination]]
-  {script_name} image [source [destination]]
-  (e.g. {script_name} clone /dev/sda /dev/sdb)
-"""
-
-# Layout
-SIDE_PANE_WIDTH = 21
-TMUX_LAYOUT = OrderedDict({
-  'Source':   {'y': 2,         'Check': True},
-  'Started':  {'x': SIDE_PANE_WIDTH, 'Check': True},
-  'Progress': {'x': SIDE_PANE_WIDTH, 'Check': True},
-})
-
-# ddrescue
-AUTO_PASS_1_THRESHOLD = 95
-AUTO_PASS_2_THRESHOLD = 98
-DDRESCUE_SETTINGS = {
-  '--binary-prefixes':  {'Enabled': True,                 'Hidden': True, },
-  '--data-preview':     {'Enabled': True,   'Value': '5', 'Hidden': True, },
-  '--idirect':          {'Enabled': True,                                 },
-  '--odirect':          {'Enabled': True,                                 },
-  '--max-read-rate':    {'Enabled': False,  'Value': '1MiB',              },
-  '--min-read-rate':    {'Enabled': True,   'Value': '64KiB',             },
-  '--reopen-on-error':  {'Enabled': True,                                 },
-  '--retry-passes':     {'Enabled': True,   'Value': '0',                 },
-  '--test-mode':        {'Enabled': False,  'Value': 'test.map',          },
-  '--timeout':          {'Enabled': True,   'Value': '5m',                },
-  '-vvvv':              {'Enabled': True,                 'Hidden': True, },
-  }
-ETOC_REFRESH_RATE = 30 # in seconds
-REGEX_DDRESCUE_LOG = re.compile(
-  r'^\s*(?P<key>\S+):\s+'
-  r'(?P<size>\d+)\s+'
-  r'(?P<unit>[PTGMKB])i?B?',
-  re.IGNORECASE,
-  )
-REGEX_REMAINING_TIME = re.compile(
-  r'remaining time:'
-  r'\s*((?P<days>\d+)d)?'
-  r'\s*((?P<hours>\d+)h)?'
-  r'\s*((?P<minutes>\d+)m)?'
-  r'\s*((?P<seconds>\d+)s)?'
-  r'\s*(?P<na>n/a)?',
-  re.IGNORECASE
-  )
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/hw_diags.py

@@ -1,112 +0,0 @@
-# Wizard Kit: Settings - HW Diagnostics
-
-from collections import OrderedDict
-
-# General
-DEBUG_MODE = False
-OVERRIDES_FORCED = False
-OVERRIDES_LIMITED = True # If True this disables OVERRIDE_FORCED
-STATUSES = {
-  'RED':    ['Denied', 'ERROR', 'NS', 'TimedOut'],
-  'YELLOW': ['Aborted', 'N/A', 'OVERRIDE', 'Unknown', 'Working'],
-  'GREEN':  ['CS'],
-}
-TESTS_CPU = ['Prime95']
-TESTS_DISK = [
-  'I/O Benchmark',
-  'NVMe / SMART',
-  'badblocks',
-  ]
-
-# Layout
-## NOTE: Colors will be applied in functions/hw_diags.py
-QUICK_LABEL = '{YELLOW}(Quick){CLEAR}'
-SIDE_PANE_WIDTH = 20
-TOP_PANE_TEXT = '{GREEN}Hardware Diagnostics{CLEAR}'
-TMUX_LAYOUT = OrderedDict({
-  'Top':            {'y': 2,                'Check': True},
-  'Started':        {'x': SIDE_PANE_WIDTH,  'Check': True},
-  'Progress':       {'x': SIDE_PANE_WIDTH,  'Check': True},
-  # Testing panes
-  'Prime95':        {'y': 11,               'Check': False},
-  'Temps':          {'y': 1000,             'Check': False},
-  'SMART':          {'y': 3,                'Check': True},
-  'badblocks':      {'y': 5,                'Check': True},
-  'I/O Benchmark':  {'y': 1000,             'Check': False},
-})
-
-# Tests: badblocks
-## NOTE: Force 4K read block size for disks >= to 3TB
-BADBLOCKS_LARGE_DISK = 3*1024**4
-
-# Tests: I/O Benchmark
-IO_VARS = {
-  'Block Size': 512*1024,
-  'Chunk Size': 32*1024**2,
-  'Minimum Test Size': 10*1024**3,
-  'Alt Test Size Factor': 0.01,
-  'Progress Refresh Rate': 5,
-  'Scale 8': [2**(0.56*(x+1))+(16*(x+1)) for x in range(8)],
-  'Scale 16': [2**(0.56*(x+1))+(16*(x+1)) for x in range(16)],
-  'Scale 32': [2**(0.56*(x+1)/2)+(16*(x+1)/2) for x in range(32)],
-  'Threshold Graph Fail': 65*1024**2,
-  'Threshold Graph Warn': 135*1024**2,
-  'Threshold Graph Great': 750*1024**2,
-  'Threshold HDD Min': 50*1024**2,
-  'Threshold HDD High Avg': 75*1024**2,
-  'Threshold HDD Low Avg': 65*1024**2,
-  'Threshold SSD Min': 90*1024**2,
-  'Threshold SSD High Avg': 135*1024**2,
-  'Threshold SSD Low Avg': 100*1024**2,
-  'Graph Horizontal': ('▁', '▂', '▃', '▄', '▅', '▆', '▇', '█'),
-  'Graph Horizontal Width': 40,
-  'Graph Vertical': (
-    '▏',    '▎',    '▍',    '▌',
-    '▋',    '▊',    '▉',    '█',
-    '█▏',   '█▎',   '█▍',   '█▌',
-    '█▋',   '█▊',   '█▉',   '██',
-    '██▏',  '██▎',  '██▍',  '██▌',
-    '██▋',  '██▊',  '██▉',  '███',
-    '███▏', '███▎', '███▍', '███▌',
-    '███▋', '███▊', '███▉', '████'),
-  }
-
-# Tests: NVMe/SMART
-ATTRIBUTES = {
-  'NVMe': {
-    'critical_warning': {'Critical': True,  'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
-    'media_errors':     {'Critical': True,  'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
-    'power_on_hours':   {'Critical': False, 'Ignore': True,   'Warning': 17532, 'Error': 26298, 'Maximum': None,  },
-    'unsafe_shutdowns': {'Critical': False, 'Ignore': True,   'Warning': 1,     'Error': None,  'Maximum': None,  },
-    },
-  'SMART': {
-    5:    {'Hex': '05', 'Critical': True,   'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
-    9:    {'Hex': '09', 'Critical': False,  'Ignore': True,   'Warning': 17532, 'Error': 26298, 'Maximum': None,  },
-    10:   {'Hex': '10', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
-    184:  {'Hex': 'B8', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
-    187:  {'Hex': 'BB', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
-    188:  {'Hex': 'BC', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
-    196:  {'Hex': 'C4', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
-    197:  {'Hex': 'C5', 'Critical': True,   'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
-    198:  {'Hex': 'C6', 'Critical': True,   'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
-    199:  {'Hex': 'C7', 'Critical': False,  'Ignore': True,   'Warning': None,  'Error': 1,     'Maximum': None,  },
-    201:  {'Hex': 'C9', 'Critical': False,  'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': 10000, },
-    },
-  }
-ATTRIBUTE_COLORS = (
-  ('Error', 'RED'),
-  ('Maximum', 'PURPLE'),
-  ('Warning', 'YELLOW'),
-  )
-KEY_NVME = 'nvme_smart_health_information_log'
-KEY_SMART = 'ata_smart_attributes'
-
-# Tests: Prime95
-MPRIME_LIMIT = 7    # of minutes to run Prime95
-THERMAL_LIMIT = 95  # Abort temperature in Celsius
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2 tw=0

.bin/Scripts/settings/info.py

@@ -1,58 +0,0 @@
-# Wizard Kit: Settings - Information
-
-import re
-
-# General
-REG_PROFILE_LIST = r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList'
-REG_SHELL_FOLDERS = r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
-TMP_HIVE_PATH = 'TEMP_HIVE_MOUNT'
-EXTRA_FOLDERS = [
-  'Dropbox',
-  'Google Drive',
-  'OneDrive',
-  'SkyDrive',
-]
-SHELL_FOLDERS = {
-  #GUIDs from: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378457(v=vs.85).aspx
-  'Desktop': (
-    '{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}',
-    ),
-  'Documents': (
-    'Personal',
-    '{FDD39AD0-238F-46AF-ADB4-6C85480369C7}',
-    ),
-  'Downloads': (
-    '{374DE290-123F-4565-9164-39C4925E467B}',
-    ),
-  'Favorites': (
-    '{1777F761-68AD-4D8A-87BD-30B759FA33DD}',
-    ),
-  'Music': (
-    'My Music',
-    '{4BD8D571-6D19-48D3-BE97-422220080E43}',
-    ),
-  'Pictures': (
-    'My Pictures',
-    '{33E28130-4E1E-4676-835A-98395C3BC3BB}',
-    ),
-  'Videos': (
-    'My Video',
-    '{18989B1D-99B5-455B-841C-AB7C74E4DDFC}',
-    ),
-}
-
-# Regex
-REGEX_OFFICE = re.compile(
-  r'(Microsoft (Office\s+'
-    r'(365|Enterprise|Home|Pro(\s|fessional)'
-    r'|Single|Small|Standard|Starter|Ultimate|system)'
-    r'|Works[-\s\d]+\d)'
-  r'|(Libre|Open|Star)\s*Office'
-  r'|WordPerfect|Gnumeric|Abiword)',
-  re.IGNORECASE)
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/launchers.py

@@ -1,20 +1,29 @@
-'''Wizard Kit: Settings - Launchers'''
-# pylint: disable=line-too-long
-# vim: sts=2 sw=2 ts=2
+# Wizard Kit: Settings - Launchers
 
 LAUNCHERS = {
   r'(Root)': {
+    'Activate Windows': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'activate.py',
+      'L_ELEV': 'True',
+      },
+    'System Checklist': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'system_checklist.py',
+      'L_ELEV': 'True',
+      },
     'System Diagnostics': {
       'L_TYPE': 'PyScript',
       'L_PATH': 'Scripts',
       'L_ITEM': 'system_diagnostics.py',
       'L_ELEV': 'True',
       },
-    'System Setup': {
+    'User Checklist': {
       'L_TYPE': 'PyScript',
       'L_PATH': 'Scripts',
-      'L_ITEM': 'system_setup.py',
-      'L_ELEV': 'True',
+      'L_ITEM': 'user_checklist.py',
       },
     },
   r'Data Recovery': {
@@ -40,7 +49,6 @@ LAUNCHERS = {
       },
     },
   r'Data Transfers': {
-    # pylint: disable=bad-continuation
     'FastCopy (as ADMIN)': {
       'L_TYPE': 'Executable',
       'L_PATH': 'FastCopy',
@@ -243,7 +251,7 @@ LAUNCHERS = {
       'L_TYPE': 'Executable',
       'L_PATH': 'erunt',
       'L_ITEM': 'ERUNT.EXE',
-      'L_ARGS': r'%client_dir%\Backups\Registry\%iso_date% sysreg curuser otherusers',
+      'L_ARGS': '%client_dir%\Backups\Registry\%iso_date% sysreg curuser otherusers',
       'L_ELEV': 'True',
       'Extra Code': [
         r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
@@ -273,13 +281,13 @@ LAUNCHERS = {
   r'Drivers': {
     'Intel RST (Current Release)': {
       'L_TYPE': 'Executable',
-      'L_PATH': r'_Drivers\Intel RST',
-      'L_ITEM': 'SetupRST_17.2.exe',
-      'L_7ZIP': 'SetupRST_17.2.exe',
+      'L_PATH': '_Drivers\Intel RST',
+      'L_ITEM': 'SetupRST_16.8.exe',
+      'L_7ZIP': 'SetupRST_16.8.exe',
       },
     'Intel RST (Previous Releases)': {
       'L_TYPE': 'Folder',
-      'L_PATH': r'_Drivers\Intel RST',
+      'L_PATH': '_Drivers\Intel RST',
       'L_ITEM': '.',
       'L_NCMD': 'True',
       },
@@ -295,7 +303,7 @@ LAUNCHERS = {
       },
     'Snappy Driver Installer Origin': {
       'L_TYPE': 'Executable',
-      'L_PATH': r'_Drivers\SDIO',
+      'L_PATH': '_Drivers\SDIO',
       'L_ITEM': 'SDIO.exe',
       },
     },
@@ -421,12 +429,6 @@ LAUNCHERS = {
       },
     },
   r'Misc': {
-    'Activate Windows': {
-      'L_TYPE': 'PyScript',
-      'L_PATH': 'Scripts',
-      'L_ITEM': 'activate.py',
-      'L_ELEV': 'True',
-      },
     'Cleanup CBS Temp Files': {
       'L_TYPE': 'PyScript',
       'L_PATH': 'Scripts',
@@ -444,20 +446,6 @@ LAUNCHERS = {
       'L_PATH': 'ConEmu',
       'L_ITEM': 'ConEmu.exe',
       },
-    'Disable Windows Updates': {
-      'L_TYPE': 'PyScript',
-      'L_PATH': 'Scripts',
-      'L_ITEM': 'windows_updates.py',
-      'L_ARGS': '--disable',
-      'L_ELEV': 'True',
-      },
-    'Enable Windows Updates': {
-      'L_TYPE': 'PyScript',
-      'L_PATH': 'Scripts',
-      'L_ITEM': 'windows_updates.py',
-      'L_ARGS': '--enable',
-      'L_ELEV': 'True',
-      },
     'Enter SafeMode': {
       'L_TYPE': 'PyScript',
       'L_PATH': 'Scripts',
@@ -497,7 +485,7 @@ LAUNCHERS = {
       'L_TYPE': 'Executable',
       'L_PATH': 'XMPlay',
       'L_ITEM': 'xmplay.exe',
-      'L_ARGS': r'"%bin%\XMPlay\music.7z"',
+      'L_ARGS': '"%bin%\XMPlay\music.7z"',
       },
     },
   r'Repairs': {
@@ -557,7 +545,7 @@ LAUNCHERS = {
       'L_TYPE': 'Executable',
       'L_PATH': 'RKill',
       'L_ITEM': 'RKill.exe',
-      'L_ARGS': r'-s -l %log_dir%\Tools\RKill.log',
+      'L_ARGS': '-s -l %log_dir%\Tools\RKill.log',
       'L_ELEV': 'True',
       'Extra Code': [
         r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
@@ -597,6 +585,7 @@ LAUNCHERS = {
     },
   }
 
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/main.py

@@ -4,6 +4,8 @@
 ENABLED_OPEN_LOGS = False
 ENABLED_TICKET_NUMBERS = False
 ENABLED_UPLOAD_DATA = False
+HW_OVERRIDES_FORCED = False
+HW_OVERRIDES_LIMITED = True                 # If True this disables HW_OVERRIDE_FORCED
 
 # STATIC VARIABLES (also used by BASH and BATCH files)
 ## NOTE: There are no spaces around the = for easier parsing in BASH and BATCH
@@ -13,6 +15,7 @@ KIT_NAME_FULL='WizardKit'
 KIT_NAME_SHORT='WK'
 SUPPORT_MESSAGE='Please let 2Shirt know by opening an issue on GitHub'
 # Live Linux
+MPRIME_LIMIT='7'                            # of minutes to run Prime95 during hw-diags
 ROOT_PASSWORD='Abracadabra'
 TECH_PASSWORD='Abracadabra'
 # Server IP addresses
@@ -21,6 +24,9 @@ QUICKBOOKS_SERVER_IP='10.0.0.10'
 # Time Zones
 LINUX_TIME_ZONE='America/Denver'            # See 'timedatectl list-timezones' for valid values
 WINDOWS_TIME_ZONE='Mountain Standard Time'  # See 'tzutil /l' for valid values
+# WiFi
+WIFI_SSID='SomeWiFi'
+WIFI_PASSWORD='Abracadabra'
 
 # SERVER VARIABLES
 ## NOTE: Windows can only use one user per server. This means that if
@@ -83,7 +89,6 @@ WINDOWS_SERVER = {
   'RW-Pass':    'Abracadabra',
   }
 
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
 

.bin/Scripts/settings/music.py

@@ -66,7 +66,6 @@ MUSIC_SNES = [
   'zamn'
   ]
 
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
 

.bin/Scripts/settings/partition_uids.py

@@ -319,7 +319,6 @@ PARTITION_UIDS = {
   'BC13C2FF-59E6-4262-A352-B275FD6F7172': {'OS': 'Freedesktop', 'Description': 'Extended Boot Partition ($BOOT)'},
 }
 
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
 

.bin/Scripts/settings/sensors.py

@@ -1,21 +0,0 @@
-# Wizard Kit: Settings - Sensors
-
-import re
-
-# General
-TEMP_LIMITS = {
-  'GREEN':  60,
-  'YELLOW': 70,
-  'ORANGE': 80,
-  'RED':    90,
-  }
-
-
-# Regex
-REGEX_COLORS = re.compile(r'\033\[\d+;?1?m')
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/setup.py

@@ -1,194 +0,0 @@
-'''Wizard Kit: Settings - Setup'''
-# pylint: disable=bad-continuation,line-too-long
-# vim: sts=2 sw=2 ts=2
-
-import os
-try:
-  import winreg
-  HKU = winreg.HKEY_USERS
-  HKCR = winreg.HKEY_CLASSES_ROOT
-  HKCU = winreg.HKEY_CURRENT_USER
-  HKLM = winreg.HKEY_LOCAL_MACHINE
-except ImportError:
-  if os.name != 'posix':
-    raise
-
-# General
-OTHER_RESULTS = {
-  'Error': {
-    'CalledProcessError':   'Unknown Error',
-    'FileNotFoundError':  'File not found',
-    },
-  'Warning': {},
-  }
-
-# Browsers
-MOZILLA_FIREFOX_UBO_PATH = r'{}\{}\ublock_origin.xpi'.format(
-  os.environ.get('PROGRAMFILES'),
-  r'Mozilla Firefox\distribution\extensions')
-SETTINGS_GOOGLE_CHROME = {
-  r'Software\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm': {
-    'SZ Items': {
-      'update_url': 'https://clients2.google.com/service/update2/crx'},
-    'WOW64_32': True,
-    },
-  r'Software\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco': {
-    'SZ Items': {
-      'update_url': 'https://clients2.google.com/service/update2/crx'},
-    '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},
-    },
-  }
-
-# Classic Start
-SETTINGS_CLASSIC_START = {
-  r'Software\IvoSoft\ClassicShell\Settings': {},
-  r'Software\IvoSoft\ClassicStartMenu': {
-    'DWORD Items': {'ShowedStyle2': 1},
-    },
-  r'Software\IvoSoft\ClassicStartMenu\MRU': {},
-  r'Software\IvoSoft\ClassicStartMenu\Settings': {
-    'DWORD Items': {'SkipMetro': 1},
-    'SZ Items': {
-      'MenuStyle': 'Win7',
-      'RecentPrograms': 'Recent',
-      },
-    },
-  }
-
-# Explorer
-SETTINGS_EXPLORER_SYSTEM = {
-  # Disable Location Tracking
-  r'Software\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
-    'DWORD Items': {'SensorPermissionState': 0},
-    },
-  r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
-    'Status': {'Value': 0},
-    },
-  # Disable Telemetry
-  r'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
-    # Using SOFTWARE in all caps to avoid collision with 32-bit setting below
-    'DWORD Items': {'AllowTelemetry': 0},
-    },
-  r'Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
-    'DWORD Items': {'AllowTelemetry': 0},
-    'WOW64_32': True,
-    },
-  r'Software\Policies\Microsoft\Windows\DataCollection': {
-    'DWORD Items': {'AllowTelemetry': 0},
-    },
-  # Disable Wi-Fi Sense
-  r'Software\Microsoft\PolicyManager\default\WiFi\AllowWiFiHotSpotReporting': {
-    'DWORD Items': {'Value': 0},
-    },
-  r'Software\Microsoft\PolicyManager\default\WiFi\AllowAutoConnectToWiFiSenseHotspots': {
-    'DWORD Items': {'Value': 0},
-    },
-  }
-SETTINGS_EXPLORER_USER = {
-  # Desktop theme
-  r'Software\Microsoft\Windows\CurrentVersion\Themes\Personalize': {
-    'Invalid modes': ['Cur'],
-    'DWORD Items': {
-      # <= v1809 default
-      'AppsUseLightTheme': 1,
-      'SystemUsesLightTheme': 0,
-      },
-    },
-  # Disable features
-  r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
-    'DWORD Items': {
-      # Silently installed apps
-      'SilentInstalledAppsEnabled': 0,
-      # Tips and Tricks
-      'SoftLandingEnabled ': 0,
-      'SubscribedContent-338389Enabled': 0,
-      },
-    },
-  # File Explorer
-  r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced': {
-    'Invalid modes': ['Cur'],
-    'DWORD Items': {
-      # Change default Explorer view to "Computer"
-      'LaunchTo': 1,
-      },
-    },
-  r'SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced': {
-  # Dup path so it Will be applied to all modes
-    'DWORD Items': {
-      # Launch Folder Windows in a Separate Process
-      'SeparateProcess': 1,
-      },
-    },
-  # Hide People bar
-  r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People': {
-    'Invalid modes': ['Cur'],
-    'DWORD Items': {'PeopleBand': 0},
-    },
-  # Hide Search button / box
-  r'Software\Microsoft\Windows\CurrentVersion\Search': {
-    'Invalid modes': ['Cur'],
-    'DWORD Items': {'SearchboxTaskbarMode': 0},
-    },
-  }
-
-# LibreOffice
-LIBREOFFICE_XCU_DATA = '''<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Impress MS PowerPoint 2007 XML</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Calc MS Excel 2007 XML</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>MS Word 2007 XML</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="WarnAlienFormat" oor:op="fuse"><value>false</value></prop></item>
-</oor:items>
-'''
-
-# Visual C++ Runtimes
-VCR_REDISTS = [
-  {'Name': 'Visual C++ 2010 x32...',
-    'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']},
-  {'Name': 'Visual C++ 2010 x64...',
-    'Cmd': [r'2010sp1\x64\vcredist.exe', '/passive', '/norestart']},
-  {'Name': 'Visual C++ 2012 Update 4 x32...',
-    'Cmd': [r'2012u4\x32\vcredist.exe', '/passive', '/norestart']},
-  {'Name': 'Visual C++ 2012 Update 4 x64...',
-    'Cmd': [r'2012u4\x64\vcredist.exe', '/passive', '/norestart']},
-  {'Name': 'Visual C++ 2013 x32...',
-    'Cmd': [r'2013\x32\vcredist.exe', '/install',
-      '/passive', '/norestart']},
-  {'Name': 'Visual C++ 2013 x64...',
-    'Cmd': [r'2013\x64\vcredist.exe', '/install',
-      '/passive', '/norestart']},
-  {'Name': 'Visual C++ 2017 x32...',
-    'Cmd': [r'2017\x32\vcredist.exe', '/install',
-      '/passive', '/norestart']},
-  {'Name': 'Visual C++ 2017 x64...',
-    'Cmd': [r'2017\x64\vcredist.exe', '/install',
-      '/passive', '/norestart']},
-  ]
-
-# Windows Updates
-SETTINGS_WINDOWS_UPDATES = {
-  r'Software\Microsoft\WindowsUpdate\UX\Settings': {
-    'DWORD Items': {
-      # Set to non-targeted readiness level
-      'BranchReadinessLevel': 32,
-      'DeferFeatureUpdatesPeriodInDays': 60,
-      },
-    }
-  }
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")

.bin/Scripts/settings/sources.py

@@ -1,9 +1,7 @@
-'''Wizard Kit: Settings - Sources'''
-# pylint: disable=line-too-long
-# vim: sts=2 sw=2 ts=2 tw=0
+# Wizard Kit: Settings - Sources
 
 SOURCE_URLS = {
-  'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1901020098/AcroRdrDC1901020098_en_US.exe',
+  'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1901020069/AcroRdrDC1901020069_en_US.exe',
   'AdwCleaner': 'https://downloads.malwarebytes.com/file/adwcleaner',
   'AIDA64': 'http://download.aida64.com/aida64engineer599.zip',
   'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0-win-32bit-build1.zip',
@@ -15,22 +13,21 @@ SOURCE_URLS = {
   'ClassicStartSkin': 'http://www.classicshell.net/forum/download/file.php?id=3001&sid=9a195960d98fd754867dcb63d9315335',
   'Du': 'https://download.sysinternals.com/files/DU.zip',
   'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
-  'Everything32': 'https://www.voidtools.com/Everything-1.4.1.935.x86.en-US.zip',
-  'Everything64': 'https://www.voidtools.com/Everything-1.4.1.935.x64.en-US.zip',
-  'FastCopy': 'https://fastcopy.jp/archive/FastCopy380_installer.exe',
-  'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/1709472/ublock_origin-1.18.6-an+fx.xpi',
+  'Everything32': 'https://www.voidtools.com/Everything-1.4.1.924.x86.zip',
+  'Everything64': 'https://www.voidtools.com/Everything-1.4.1.924.x64.zip',
+  'FastCopy': 'http://ftp.vector.co.jp/70/93/2323/FastCopy361_installer.exe',
+  'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/1166954/ublock_origin-1.17.4-an+fx.xpi',
   'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
   'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
-  'HWiNFO': 'http://files2.majorgeeks.com/377527622c5325acc1cb937fb149d0de922320c0/systeminfo/hwi_602.zip',
-  'Intel SSD Toolbox': r'https://downloadmirror.intel.com/28593/eng/Intel%20SSD%20Toolbox%20-%20v3.5.9.exe',
+  'HWiNFO': 'http://files2.majorgeeks.com/caae8849cf31a8d77c51283b720e60e49ce1dc78/systeminfo/hwi_600.zip',
+  'Intel SSD Toolbox': r'https://downloadmirror.intel.com/28447/eng/Intel%20SSD%20Toolbox%20-%20v3.5.8.exe',
   'IOBit_Uninstaller': r'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe',
   'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
-  'LibreOffice': 'https://download.documentfoundation.org/libreoffice/stable/6.2.4/win/x86_64/LibreOffice_6.2.4_Win_x64.msi',
   'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe',
   'NirCmd32': 'https://www.nirsoft.net/utils/nircmd.zip',
   'NirCmd64': 'https://www.nirsoft.net/utils/nircmd-x64.zip',
-  'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.6.4/npp.7.6.4.bin.minimalist.7z',
-  'Office Deployment Tool': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_11509-33604.exe',
+  'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.6.2/npp.7.6.2.bin.minimalist.7z',
+  'Office Deployment Tool': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_11107-33602.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',
@@ -40,10 +37,10 @@ SOURCE_URLS = {
   'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
   'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
   'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
-  'wimlib32': 'https://wimlib.net/downloads/wimlib-1.13.1-windows-i686-bin.zip',
-  'wimlib64': 'https://wimlib.net/downloads/wimlib-1.13.1-windows-x86_64-bin.zip',
+  'wimlib32': 'https://wimlib.net/downloads/wimlib-1.13.0-windows-i686-bin.zip',
+  'wimlib64': 'https://wimlib.net/downloads/wimlib-1.13.0-windows-x86_64-bin.zip',
   'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
-  'WizTree': 'https://antibody-software.com/files/wiztree_3_28_portable.zip',
+  'WizTree': 'https://antibody-software.com/files/wiztree_3_26_portable.zip',
   'XMPlay 7z': 'https://support.xmplay.com/files/16/xmp-7z.zip?v=800962',
   'XMPlay Game': 'https://support.xmplay.com/files/12/xmp-gme.zip?v=515637',
   'XMPlay RAR': 'https://support.xmplay.com/files/16/xmp-rar.zip?v=409646',
@@ -69,18 +66,10 @@ VCREDIST_SOURCES = {
     '64': 'https://aka.ms/vs/15/release/vc_redist.x64.exe',
     },
   }
-NINITE_REGEX = {
-  'base': ['7-Zip', 'VLC'],
-  'standard': ['Google Chrome', 'Mozilla Firefox', 'SumatraPDF'],
-  'standard7': ['Google Chrome', 'Mozilla Firefox', 'SumatraPDF'],
-  }
 NINITE_SOURCES = {
   'Bundles': {
-    'base.exe': '.net4.7.2-7zip-vlc',
-    'base-standard.exe': '.net4.7.2-7zip-chrome-classicstart-firefox-sumatrapdf-vlc',
-    'base-standard7.exe': '.net4.7.2-7zip-chrome-firefox-sumatrapdf-vlc',
-    'standard.exe': 'chrome-classicstart-firefox-sumatrapdf',
-    'standard7.exe': 'chrome-firefox-sumatrapdf',
+    'Legacy.exe': '.net4.7.2-7zip-chrome-firefox-vlc',
+    'Modern.exe': '.net4.7.2-7zip-chrome-classicstart-firefox-vlc',
     },
   'Audio-Video': {
     'AIMP.exe': 'aimp',
@@ -105,7 +94,7 @@ NINITE_SOURCES = {
     'SugarSync.exe': 'sugarsync',
     },
   'Communication': {
-    'Discord.exe': 'discord',
+    'Discord': 'discord',
     'Pidgin.exe': 'pidgin',
     'Skype.exe': 'skype',
     'Trillian.exe': 'trillian',
@@ -117,6 +106,8 @@ NINITE_SOURCES = {
     },
   'Developer': {
     'Eclipse.exe': 'eclipse',
+    'JDK 8.exe': 'jdk8',
+    'JDK 8 (x64).exe': 'jdkx8',
     'Notepad++.exe': 'notepadplusplus',
     'PuTTY.exe': 'putty',
     'Python 2.exe': 'python',
@@ -159,6 +150,7 @@ NINITE_SOURCES = {
   'Runtimes': {
     'Adobe Air.exe': 'air',
     'dotNET.exe': '.net4.7.2',
+    'Java 8.exe': 'java8',
     'Shockwave.exe': 'shockwave',
     'Silverlight.exe': 'silverlight',
     },
@@ -199,31 +191,14 @@ RST_SOURCES = {
   'SetupRST_14.0.exe': 'https://downloadmirror.intel.com/25091/eng/SetupRST.exe',
   'SetupRST_14.8.exe': 'https://downloadmirror.intel.com/26759/eng/setuprst.exe',
   'SetupRST_15.8.exe': 'https://downloadmirror.intel.com/27442/eng/SetupRST.exe',
-  'SetupRST_15.9.exe': 'https://downloadmirror.intel.com/28656/eng/SetupRST.exe',
+  #SetupRST_15.9.exe :  Deprecated by Intel
   #SetupRST_16.0.exe :  Deprecated by Intel
   #SetupRST_16.5.exe :  Deprecated by Intel
   #SetupRST_16.7.exe :  Deprecated by Intel
-  'SetupRST_16.8.exe': 'https://downloadmirror.intel.com/28653/eng/SetupRST.exe',
-  'SetupRST_17.2.exe': 'https://downloadmirror.intel.com/28650/eng/SetupRST.exe',
+  'SetupRST_16.8.exe': 'https://downloadmirror.intel.com/28400/eng/SetupRST.exe',
   }
-WINDOWS_UPDATE_SOURCES = {
-  '2999226': {
-    # https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows
-    '7': {
-      '32': 'https://download.microsoft.com/download/4/F/E/4FE73868-5EDD-4B47-8B33-CE1BB7B2B16A/Windows6.1-KB2999226-x86.msu',
-      '64': 'https://download.microsoft.com/download/1/1/5/11565A9A-EA09-4F0A-A57E-520D5D138140/Windows6.1-KB2999226-x64.msu',
-      },
-    '8': {
-      '32': 'https://download.microsoft.com/download/1/E/8/1E8AFE90-5217-464D-9292-7D0B95A56CE4/Windows8-RT-KB2999226-x86.msu',
-      '64': 'https://download.microsoft.com/download/A/C/1/AC15393F-A6E6-469B-B222-C44B3BB6ECCC/Windows8-RT-KB2999226-x64.msu',
-      },
-    '8.1': {
-      '32': 'https://download.microsoft.com/download/E/4/6/E4694323-8290-4A08-82DB-81F2EB9452C2/Windows8.1-KB2999226-x86.msu',
-      '64': 'https://download.microsoft.com/download/9/6/F/96FD0525-3DDF-423D-8845-5F92F4A6883E/Windows8.1-KB2999226-x64.msu',
-      },
-    },
-  }
-
 
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2 tw=0

.bin/Scripts/settings/sw_diags.py

@@ -1,29 +0,0 @@
-# Wizard Kit: Settings - SW Diagnostics
-
-# General
-AUTORUNS_SETTINGS = {
-  r'Software\Sysinternals\AutoRuns': {
-    'checkvirustotal': 1,
-    'EulaAccepted': 1,
-    'shownomicrosoft': 1,
-    'shownowindows': 1,
-    'showonlyvirustotal': 1,
-    'submitvirustotal': 0,
-    'verifysignatures': 1,
-    },
-  r'Software\Sysinternals\AutoRuns\SigCheck': {
-    'EulaAccepted': 1,
-    },
-  r'Software\Sysinternals\AutoRuns\Streams': {
-    'EulaAccepted': 1,
-    },
-  r'Software\Sysinternals\AutoRuns\VirusTotal': {
-    'VirusTotalTermsAccepted': 1,
-    },
-  }
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/tools.py

@@ -52,7 +52,6 @@ TOOLS = {
     '32': r'XMPlay\xmplay.exe'},
   }
 
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
 

.bin/Scripts/settings/ufd.py

@@ -1,118 +0,0 @@
-'''Wizard Kit: Settings - UFD'''
-# pylint: disable=C0326,E0611
-# vim: sts=2 sw=2 ts=2
-
-from collections import OrderedDict
-from settings.main import KIT_NAME_FULL,KIT_NAME_SHORT
-
-# General
-DOCSTRING = '''WizardKit: Build UFD
-
-Usage:
-  build-ufd [options] --ufd-device PATH --linux PATH
-            [--linux-minimal PATH]
-            [--main-kit PATH]
-            [--winpe PATH]
-            [--extra-dir PATH]
-  build-ufd (-h | --help)
-
-Options:
-  -d PATH, --linux-dgpu PATH
-  -e PATH, --extra-dir PATH
-  -k PATH, --main-kit PATH
-  -l PATH, --linux PATH
-  -m PATH, --linux-minimal PATH
-  -u PATH, --ufd-device PATH
-  -w PATH, --winpe PATH
-
-  -h --help             Show this page
-  -M --use-mbr          Use real MBR instead of GPT w/ Protective MBR
-  -F --force            Bypass all confirmation messages. USE WITH EXTREME CAUTION!
-  -U --update           Don't format device, just update
-'''
-ISO_LABEL = '{}_LINUX'.format(KIT_NAME_SHORT)
-UFD_LABEL = '{}_UFD'.format(KIT_NAME_SHORT)
-UFD_SOURCES = OrderedDict({
-  'Linux':            {'Arg': '--linux',          'Type': 'ISO'},
-  'Linux (dGPU)':     {'Arg': '--linux-dgpu',     'Type': 'ISO'},
-  'Linux (Minimal)':  {'Arg': '--linux-minimal',  'Type': 'ISO'},
-  'WinPE':            {'Arg': '--winpe',          'Type': 'ISO'},
-  'Main Kit':         {'Arg': '--main-kit',       'Type': 'KIT'},
-  'Extra Dir':        {'Arg': '--extra-dir',      'Type': 'DIR'},
-  })
-
-# Definitions: Boot entries
-BOOT_ENTRIES = {
-  # Path to check:      Comment to remove
-  '/arch_minimal':      'UFD-MINIMAL',
-  '/dgpu':              'UFD-DGPU',
-  '/sources/boot.wim':  'UFD-WINPE',
-  }
-BOOT_FILES = {
-  # Directory:            extension
-  '/arch/boot/syslinux':  'cfg',
-  '/EFI/boot':            'conf',
-  }
-
-# Definitions: Sources and Destinations
-## NOTES: Paths are relative to the root of the ISO/UFD
-##        Sources use rsync's trailing slash syntax
-ITEMS = {
-  'Extra Dir': (
-    ('/',                             '/'),
-    ),
-  'Linux': (
-    ('/arch',                         '/'),
-    ('/isolinux',                     '/'),
-    ('/EFI/boot',                     '/EFI/'),
-    ('/EFI/memtest86',                '/EFI/'),
-    ),
-  'Linux (dGPU)': (
-    ('/arch/boot/x86_64/archiso.img', '/dgpu/'),
-    ('/arch/boot/x86_64/vmlinuz',     '/dgpu/'),
-    ('/arch/pkglist.x86_64.txt',      '/dgpu/'),
-    ('/arch/x86_64',                  '/dgpu/'),
-    ),
-  'Linux (Minimal)': (
-    ('/arch/boot/x86_64/archiso.img', '/arch_minimal/'),
-    ('/arch/boot/x86_64/vmlinuz',     '/arch_minimal/'),
-    ('/arch/pkglist.x86_64.txt',      '/arch_minimal/'),
-    ('/arch/x86_64',                  '/arch_minimal/'),
-    ),
-  'Main Kit': (
-    ('/',                             '/{}/'.format(KIT_NAME_FULL)),
-    ),
-  'WinPE': (
-    ('/bootmgr',                      '/'),
-    ('/bootmgr.efi',                  '/'),
-    ('/en_us',                        '/'),
-    ('/Boot/',                        '/boot/'),
-    ('/EFI/Boot/',                    '/EFI/Microsoft/'),
-    ('/EFI/Microsoft/',               '/EFI/Microsoft/'),
-    ('/Boot/BCD',                     '/sources/'),
-    ('/Boot/boot.sdi',                '/sources/'),
-    ('/bootmgr',                      '/sources/'),
-    ('/sources/boot.wim',             '/sources/'),
-    ),
-  }
-ITEMS_HIDDEN = (
-  # Linux (all versions)
-  'arch',
-  'arch_minimal',
-  'dgpu',
-  'EFI',
-  'isolinux',
-  # Main Kit
-  '{}/.bin'.format(KIT_NAME_FULL),
-  '{}/.cbin'.format(KIT_NAME_FULL),
-  # WinPE
-  'boot',
-  'bootmgr',
-  'bootmgr.efi',
-  'en-us',
-  'images',
-  'sources',
-  )
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")

.bin/Scripts/settings/windows_builds.py

@@ -1,10 +1,8 @@
-'''Wizard Kit: Settings - Windows Builds'''
-# pylint: disable=bad-continuation,bad-whitespace
-# vim: sts=2 sw=2 ts=2
-## NOTE: Data from here: https://en.wikipedia.org/wiki/Windows_10_version_history
+# Wizard Kit: Settings - Windows Builds
 
 WINDOWS_BUILDS = {
   # Build, Version, Release, Codename, Marketing Name, Notes
+   '6000': ('Vista',  'RTM',    'Longhorn',     None,   'unsupported'),
    '6000': ('Vista',  'RTM',    'Longhorn',     None,   'unsupported'),
    '6001': ('Vista',  'SP1',    'Longhorn',     None,   'unsupported'),
    '6002': ('Vista',  'SP2',    'Longhorn',     None,   'unsupported'),
@@ -189,37 +187,9 @@ WINDOWS_BUILDS = {
   '18290': ('10',     None,     '19H1',         None,   'preview build'),
   '18298': ('10',     None,     '19H1',         None,   'preview build'),
   '18305': ('10',     None,     '19H1',         None,   'preview build'),
-  '18309': ('10',     None,     '19H1',         None,   'preview build'),
-  '18312': ('10',     None,     '19H1',         None,   'preview build'),
-  '18317': ('10',     None,     '19H1',         None,   'preview build'),
-  '18323': ('10',     None,     '19H1',         None,   'preview build'),
-  '18329': ('10',     None,     '19H1',         None,   'preview build'),
-  '18334': ('10',     None,     '19H1',         None,   'preview build'),
-  '18342': ('10',     None,     '19H1',         None,   'preview build'),
-  '18343': ('10',     None,     '19H1',         None,   'preview build'),
-  '18346': ('10',     None,     '19H1',         None,   'preview build'),
-  '18348': ('10',     None,     '19H1',         None,   'preview build'),
-  '18351': ('10',     None,     '19H1',         None,   'preview build'),
-  '18353': ('10',     None,     '19H1',         None,   'preview build'),
-  '18356': ('10',     None,     '19H1',         None,   'preview build'),
-  '18358': ('10',     None,     '19H1',         None,   'preview build'),
-  '18361': ('10',     None,     '19H1',         None,   'preview build'),
-  '18362': ('10',     'v1903',  '19H1',         'May 2019 Update', None),
-  '18836': ('10',     None,     '20H1',         None,   'preview build'),
-  '18841': ('10',     None,     '20H1',         None,   'preview build'),
-  '18845': ('10',     None,     '20H1',         None,   'preview build'),
-  '18850': ('10',     None,     '20H1',         None,   'preview build'),
-  '18855': ('10',     None,     '20H1',         None,   'preview build'),
-  '18860': ('10',     None,     '20H1',         None,   'preview build'),
-  '18865': ('10',     None,     '20H1',         None,   'preview build'),
-  '18875': ('10',     None,     '20H1',         None,   'preview build'),
-  '18885': ('10',     None,     '20H1',         None,   'preview build'),
-  '18890': ('10',     None,     '20H1',         None,   'preview build'),
-  '18894': ('10',     None,     '20H1',         None,   'preview build'),
-  '18895': ('10',     None,     '20H1',         None,   'preview build'),
-  '18898': ('10',     None,     '20H1',         None,   'preview build'),
 }
 
-
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/windows_setup.py

@@ -1,39 +0,0 @@
-# Wizard Kit: Settings - Windows Setup
-
-# General
-WINDOWS_VERSIONS = [
-  {'Name': 'Windows 7 Home Basic',
-    'Image File': 'Win7',
-    'Image Name': 'Windows 7 HOMEBASIC'},
-  {'Name': 'Windows 7 Home Premium',
-    'Image File': 'Win7',
-    'Image Name': 'Windows 7 HOMEPREMIUM'},
-  {'Name': 'Windows 7 Professional',
-    'Image File': 'Win7',
-    'Image Name': 'Windows 7 PROFESSIONAL'},
-  {'Name': 'Windows 7 Ultimate',
-    'Image File': 'Win7',
-    'Image Name': 'Windows 7 ULTIMATE'},
-
-  {'Name': 'Windows 8.1',
-    'Image File': 'Win8',
-    'Image Name': 'Windows 8.1',
-    'CRLF': True},
-  {'Name': 'Windows 8.1 Pro',
-    'Image File': 'Win8',
-    'Image Name': 'Windows 8.1 Pro'},
-
-  {'Name': 'Windows 10 Home',
-    'Image File': 'Win10',
-    'Image Name': 'Windows 10 Home',
-    'CRLF': True},
-  {'Name': 'Windows 10 Pro',
-    'Image File': 'Win10',
-    'Image Name': 'Windows 10 Pro'},
-  ]
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/winpe.py

@@ -1,57 +0,0 @@
-# Wizard Kit: Settings - WinPE
-
-from settings.data import *
-
-# FastCopy
-FAST_COPY_PE_ARGS = [
-  '/cmd=noexist_only',
-  '/utf8',
-  '/skip_empty_dir',
-  '/linkdest',
-  '/no_ui',
-  '/auto_close',
-  '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
-  ]
-
-# General
-PE_TOOLS = {
-  'BlueScreenView': {
-    'Path': r'BlueScreenView\BlueScreenView.exe',
-    },
-  'FastCopy': {
-    'Path': r'FastCopy\FastCopy.exe',
-    'Args': FAST_COPY_PE_ARGS,
-    },
-  'HWiNFO': {
-    'Path': r'HWiNFO\HWiNFO.exe',
-    },
-  'NT Password Editor': {
-    'Path': r'NT Password Editor\ntpwedit.exe',
-    },
-  'Notepad++': {
-    'Path': r'NotepadPlusPlus\NotepadPlusPlus.exe',
-    },
-  'PhotoRec': {
-    'Path': r'TestDisk\photorec_win.exe',
-    'Args': ['-new_console:n'],
-    },
-  'Prime95': {
-    'Path': r'Prime95\prime95.exe',
-    },
-  'ProduKey': {
-    'Path': r'ProduKey\ProduKey.exe',
-    },
-  'Q-Dir': {
-    'Path': r'Q-Dir\Q-Dir.exe',
-    },
-  'TestDisk': {
-    'Path': r'TestDisk\testdisk_win.exe',
-    'Args': ['-new_console:n'],
-    },
-  }
-
-
-if __name__ == '__main__':
-  print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/sfc_scan.py

@@ -32,8 +32,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause('Press Enter to exit...')
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/system_checklist.py

@@ -0,0 +1,127 @@
+# Wizard Kit: System Checklist
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.activation import *
+from functions.cleanup import *
+from functions.info import *
+from functions.product_keys import *
+from functions.setup import *
+from functions.sw_diags import *
+init_global_vars()
+os.system('title {}: System Checklist Tool'.format(KIT_NAME_FULL))
+set_log_file('System Checklist.log')
+
+if __name__ == '__main__':
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: System Checklist Tool\n'.format(KIT_NAME_FULL))
+    ticket_number = get_ticket_number()
+    other_results = {
+      'Error': {
+        'BIOSKeyNotFoundError':   'BIOS key not found',
+        'CalledProcessError':     'Unknown Error',
+        'FileNotFoundError':    'File not found',
+        'GenericError':       'Unknown Error',
+        'SecureBootDisabledError':  'Disabled',
+      },
+      'Warning': {
+        'OSInstalledLegacyError':   'OS installed Legacy',
+        'SecureBootNotAvailError':  'Not available',
+        'SecureBootUnknownError':   'Unknown',
+      }}
+    if ENABLED_TICKET_NUMBERS:
+      print_info('Starting System Checklist for Ticket #{}\n'.format(
+        ticket_number))
+
+    # Configure
+    print_info('Configure')
+    if global_vars['OS']['Version'] == '10':
+      try_and_print(message='Explorer...',
+        function=config_explorer_system, cs='Done')
+    try_and_print(message='Updating Clock...',
+      function=update_clock, cs='Done')
+
+    # Cleanup
+    print_info('Cleanup')
+    try_and_print(message='AdwCleaner...',
+      function=cleanup_adwcleaner, cs='Done', other_results=other_results)
+    try_and_print(message='Desktop...',
+      function=cleanup_desktop, cs='Done')
+    try_and_print(message='{}...'.format(KIT_NAME_FULL),
+      function=delete_empty_folders, cs='Done',
+      folder_path=global_vars['ClientDir'])
+
+    # Export system info
+    print_info('Backup System Information')
+    try_and_print(message='AIDA64 reports...',
+      function=run_aida64, cs='Done', other_results=other_results)
+    try_and_print(message='File listing...',
+      function=backup_file_list, cs='Done', other_results=other_results)
+    try_and_print(message='Power plans...',
+      function=backup_power_plans, cs='Done')
+    try_and_print(message='Product Keys...', other_results=other_results,
+      function=run_produkey, cs='Done')
+    try_and_print(message='Registry...',
+      function=backup_registry, cs='Done', other_results=other_results)
+
+    # User data
+    print_info('User Data')
+    show_user_data_summary()
+
+    # Summary
+    print_info('Summary')
+    try_and_print(message='Operating System:',
+      function=show_os_name, ns='Unknown', silent_function=False)
+    try_and_print(message='Activation:',
+      function=show_os_activation, ns='Unknown', silent_function=False)
+    if (not windows_is_activated()
+      and global_vars['OS']['Version'] in ('8', '8.1', '10')):
+      try_and_print(message='BIOS Activation:',
+        function=activate_with_bios,
+        other_results=other_results)
+    try_and_print(message='Secure Boot Status:',
+      function=check_secure_boot_status, other_results=other_results)
+    try_and_print(message='Installed RAM:',
+      function=show_installed_ram, ns='Unknown', silent_function=False)
+    show_free_space()
+    try_and_print(message='Installed Antivirus:',
+      function=get_installed_antivirus, ns='Unknown',
+      other_results=other_results, print_return=True)
+    try_and_print(message='Installed Office:',
+      function=get_installed_office, ns='Unknown',
+      other_results=other_results, print_return=True)
+
+    # Play audio, show devices, open Windows updates, and open Activation
+    try_and_print(message='Opening Device Manager...',
+      function=open_device_manager, cs='Started')
+    try_and_print(message='Opening HWiNFO (Sensors)...',
+      function=run_hwinfo_sensors, cs='Started', other_results=other_results)
+    try_and_print(message='Opening Windows Updates...',
+      function=open_windows_updates, cs='Started')
+    if not windows_is_activated():
+      try_and_print(message='Opening Windows Activation...',
+        function=open_windows_activation, cs='Started')
+    sleep(3)
+    try_and_print(message='Running XMPlay...',
+      function=run_xmplay, cs='Started', other_results=other_results)
+    try:
+      check_secure_boot_status(show_alert=True)
+    except:
+      # Only trying to open alert message boxes
+      pass
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter exit...')
+    exit_script()
+  except SystemExit:
+    pass
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/system_diagnostics.py

@@ -165,8 +165,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause('Press Enter to exit...')
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/system_setup.py

@@ -1,355 +0,0 @@
-'''Wizard Kit: System Setup'''
-# pylint: disable=wildcard-import,wrong-import-position
-# vim: sts=2 sw=2 ts=2
-
-import os
-import sys
-
-# Init
-sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from collections import OrderedDict
-from functions.activation import *
-from functions.browsers import *
-from functions.cleanup import *
-from functions.info import *
-from functions.product_keys import *
-from functions.setup import *
-from functions.sw_diags import *
-from functions.windows_updates import *
-init_global_vars()
-os.system('title {}: System Setup'.format(KIT_NAME_FULL))
-set_log_file('System Setup.log')
-
-
-# STATIC VARIABLES
-# pylint: disable=bad-whitespace,line-too-long
-OTHER_RESULTS = {
-  'Error': {
-    'BIOSKeyNotFoundError':     'BIOS KEY NOT FOUND',
-    'CalledProcessError':       'UNKNOWN ERROR',
-    'FileNotFoundError':        'FILE NOT FOUND',
-    'GenericError':             'UNKNOWN ERROR',
-    'Not4KAlignedError':        'FALSE',
-    'SecureBootDisabledError':  'DISABLED',
-    'WindowsUnsupportedError':  'UNSUPPORTED',
-  },
-  'Warning': {
-    'GenericRepair':            'REPAIRED',
-    'NoProfilesError':          'NO PROFILES FOUND',
-    'NotInstalledError':        'NOT INSTALLED',
-    'OSInstalledLegacyError':   'OS INSTALLED LEGACY',
-    'SecureBootNotAvailError':  'NOT AVAILABLE',
-    'SecureBootUnknownError':   'UNKNOWN',
-    'UnsupportedOSError':       'UNSUPPORTED OS',
-    'WindowsOutdatedError':     'OUTDATED',
-    },
-  }
-SETUP_ACTIONS = OrderedDict({
-  # Install software
-  'Installing Programs':    {'Info': True},
-  'VCR':                    {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_vcredists, 'Just run': True,},
-  'LibreOffice':            {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_libreoffice,
-                             'If answer': 'LibreOffice', 'KWArgs': {'quickstart': False, 'register_mso_types': True, 'use_mso_formats': False, 'vcredist': False},
-                             },
-  'Ninite bundle':          {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_ninite_bundle, 'KWArgs': {'cs': 'STARTED'},},
-
-  # Browsers
-  'Scanning for browsers':  {'Info': True},
-  'Scan':                   {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': scan_for_browsers, 'Just run': True, 'KWArgs': {'skip_ie': True},},
-  'Backing up browsers':    {'Info': True},
-  'Backup browsers':        {'New': False,  'Dat': True,  'Cur': True,  'HW': False, 'Function': backup_browsers, 'Just run': True,},
-
-  # Install extensions
-  'Installing Extensions':  {'Info': True},
-  'Classic Shell skin':     {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Function': install_classicstart_skin, 'Win10 only': True,},
-  'Chrome extensions':      {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_chrome_extensions,},
-  'Firefox extensions':     {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_firefox_extensions,},
-
-  # Configure software'
-  'Configuring Programs':   {'Info': True},
-  'Browser add-ons':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_adblock, 'Just run': True,
-                             'Pause': 'Please enable uBlock Origin for all browsers',
-                             },
-  'Classic Start':          {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Function': config_classicstart, 'Win10 only': True,},
-  'Config Windows Updates': {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': config_windows_updates, 'Win10 only': True,},
-  'Enable Windows Updates': {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': enable_windows_updates, 'KWArgs': {'silent': True},},
-  'Explorer (system)':      {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': config_explorer_system, 'Win10 only': True,},
-  'Explorer (user)':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': config_explorer_user, 'Win10 only': True,},
-  'Restart Explorer':       {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': restart_explorer,},
-  'Restore default UAC':    {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': restore_default_uac,},
-  'Update Clock':           {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': update_clock,},
-
-  # Cleanup
-  'Cleaning up':            {'Info': True},
-  'AdwCleaner':             {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': cleanup_adwcleaner,},
-  'Desktop':                {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': cleanup_desktop,},
-  'KIT_NAME_FULL':          {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': delete_empty_folders,},
-
-  # System Info
-  'Exporting system info':  {'Info': True},
-  'AIDA64 Report':          {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': run_aida64,},
-  'File listing':           {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': backup_file_list,},
-  'Power plans':            {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': backup_power_plans,},
-  'Product Keys':           {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': run_produkey,},
-  'Registry':               {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': backup_registry,},
-
-  # Show Summary
-  'Summary':                {'Info': True},
-  'Operating System':       {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_os_name, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
-  'Activation':             {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_os_activation, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
-  'BIOS Activation':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': activate_with_bios, 'If not activated': True,},
-  'Secure Boot':            {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': check_secure_boot_status, 'KWArgs': {'show_alert': False},},
-  'Installed RAM':          {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_installed_ram, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
-  'Temp size':              {'New': False,  'Dat': False, 'Cur': True,  'HW': False, 'Function': show_temp_files_size, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
-  'Show free space':        {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_free_space, 'Just run': True,},
-  'Installed AV':           {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': get_installed_antivirus, 'KWArgs': {'ns': 'UNKNOWN', 'print_return': True},},
-  'Installed Office':       {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': get_installed_office, 'KWArgs': {'ns': 'UNKNOWN', 'print_return': True},},
-  'Partitions 4K aligned':  {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': check_4k_alignment, 'KWArgs': {'cs': 'TRUE', 'ns': 'FALSE'},},
-
-  # Open things
-  'Opening Programs':       {'Info': True},
-  'Device Manager':         {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': open_device_manager, 'KWArgs': {'cs': 'STARTED'},},
-  'HWiNFO sensors':         {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': run_hwinfo_sensors, 'KWArgs': {'cs': 'STARTED'},},
-  'Speed test':             {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': open_speedtest, 'KWArgs': {'cs': 'STARTED'},},
-  'Windows Updates':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': open_windows_updates, 'KWArgs': {'cs': 'STARTED'},},
-  'Windows Activation':     {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': open_windows_activation, 'If not activated': True, 'KWArgs': {'cs': 'STARTED'},},
-  'Sleep':                  {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': sleep, 'Just run': True, 'KWArgs': {'seconds': 3},},
-  'XMPlay':                 {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': run_xmplay, 'KWArgs': {'cs': 'STARTED'},},
-  })
-SETUP_ACTION_KEYS = (
-  'Function',
-  'If not activated',
-  'Info',
-  'Just run',
-  'KWArgs',
-  'Pause',
-  )
-SETUP_QUESTIONS = {
-  # AV
-  'MSE':          {'New': None,   'Dat': None,  'Cur': None,  'HW': False, 'Ninite': True},
-
-  # LibreOffice
-  'LibreOffice':  {'New': None,   'Dat': None,  'Cur': None,  'HW': False, 'Ninite': True},
-
-  # Ninite
-  'Base':         {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Ninite': True},
-  'Missing':      {'New': False,  'Dat': True,  'Cur': False, 'HW': False, 'Ninite': True},
-  'Standard':     {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Ninite': True},
-  }
-# pylint: enable=bad-whitespace,line-too-long
-
-
-# Functions
-def check_os_and_abort():
-  """Check OS and prompt to abort if not supported."""
-  result = try_and_print(
-    message='OS support status...',
-    function=check_os_support_status,
-    cs='GOOD',
-    )
-  if not result['CS'] and 'Unsupported' in result['Error']:
-    print_warning('OS version not supported by this script')
-    if not ask('Continue anyway? (NOT RECOMMENDED)'):
-      abort()
-
-
-def get_actions(setup_mode, answers):
-  """Get actions to perform based on setup_mode, returns OrderedDict."""
-  actions = OrderedDict({})
-  for _key, _val in SETUP_ACTIONS.items():
-    _action = {}
-    _if_answer = _val.get('If answer', False)
-    _win10_only = _val.get('Win10 only', False)
-
-    # Set enabled status
-    _enabled = _val.get(setup_mode, False)
-    if _if_answer:
-      _enabled = _enabled and answers[_if_answer]
-    if _win10_only:
-      _enabled = _enabled and global_vars['OS']['Version'] == '10'
-    _action['Enabled'] = _enabled
-
-    # Set other keys
-    for _sub_key in SETUP_ACTION_KEYS:
-      _action[_sub_key] = _val.get(_sub_key, None)
-
-    # Fix KWArgs
-    if _action.get('KWArgs', {}) is None:
-      _action['KWArgs'] = {}
-
-    # Handle "special" actions
-    if _key == 'KIT_NAME_FULL':
-      # Cleanup WK folders
-      _key = KIT_NAME_FULL
-      _action['KWArgs'] = {'folder_path': global_vars['ClientDir']}
-    elif _key == 'Ninite bundle':
-      # Add install_ninite_bundle() kwargs
-      _action['KWArgs'].update({
-        kw.lower(): kv for kw, kv in answers.items()
-        if SETUP_QUESTIONS.get(kw, {}).get('Ninite', False)
-        })
-    elif _key == 'Explorer (user)':
-      # Explorer settings (user)
-      _action['KWArgs'] = {'setup_mode': setup_mode}
-
-    # Add to dict
-    actions[_key] = _action
-
-  return actions
-
-
-def get_answers(setup_mode):
-  """Get setup answers based on setup_mode and user input, returns dict."""
-  answers = {k: v.get(setup_mode, False) for k, v in SETUP_QUESTIONS.items()}
-
-  # Answer setup questions as needed
-  if answers['MSE'] is None and global_vars['OS']['Version'] == '7':
-    answers.update(get_av_selection())
-
-  if answers['LibreOffice'] is None:
-    answers['LibreOffice'] = ask('Install LibreOffice?')
-
-  return answers
-
-
-def get_av_selection():
-  """Get AV selection."""
-  av_answers = {
-    'MSE': False,
-    }
-  av_options = [
-    {
-      'Name': 'Microsoft Security Essentials',
-      'Disabled': global_vars['OS']['Version'] not in ['7'],
-      },
-    ]
-  actions = [
-    {'Name': 'None', 'Letter': 'N'},
-    {'Name': 'Quit', 'Letter': 'Q'},
-    ]
-
-  # Show menu
-  selection = menu_select(
-    'Please select an option to install',
-    main_entries=av_options,
-    action_entries=actions)
-  if selection.isnumeric():
-    index = int(selection) - 1
-    if 'Microsoft' in av_options[index]['Name']:
-      av_answers['MSE'] = True
-  elif selection == 'Q':
-    abort()
-
-  return av_answers
-
-
-def get_mode():
-  """Get mode via menu_select, returns str."""
-  setup_mode = None
-  mode_options = [
-    {'Name': 'New', 'Display Name': 'New / Clean install (no data)'},
-    {'Name': 'Dat', 'Display Name': 'Clean install with data migration'},
-    {'Name': 'Cur', 'Display Name': 'Original OS (post-repair or overinstall)'},
-    {'Name': 'HW', 'Display Name': 'Hardware service (i.e. no software work)'},
-    ]
-  actions = [
-    {'Name': 'Quit', 'Letter': 'Q'},
-    ]
-
-  # Get selection
-  selection = menu_select(
-    'Please select a setup mode',
-    main_entries=mode_options,
-    action_entries=actions)
-  if selection.isnumeric():
-    index = int(selection) - 1
-    setup_mode = mode_options[index]['Name']
-  elif selection == 'Q':
-    abort()
-
-  return setup_mode
-
-
-def main():
-  """Main function."""
-  stay_awake()
-  clear_screen()
-
-  # Check installed OS
-  check_os_and_abort()
-
-  # Get setup mode
-  setup_mode = get_mode()
-
-  # Get answers to setup questions
-  answers = get_answers(setup_mode)
-
-  # Get actions to perform
-  actions = get_actions(setup_mode, answers)
-
-  # Perform actions
-  for action, values in actions.items():
-    kwargs = values.get('KWArgs', {})
-
-    # Print info lines
-    if values.get('Info', False):
-      print_info(action)
-      continue
-
-    # Print disabled actions
-    if not values.get('Enabled', False):
-      show_data(
-        message='{}...'.format(action),
-        data='DISABLED',
-        warning=True,
-        )
-      continue
-
-    # Check Windows activation if requested
-    if values.get('If not activated', False) and windows_is_activated():
-      # Skip
-      continue
-
-    # Run function
-    if values.get('Just run', False):
-      values['Function'](**kwargs)
-    else:
-      result = try_and_print(
-        message='{}...'.format(action),
-        function=values['Function'],
-        other_results=OTHER_RESULTS,
-        **kwargs)
-
-    # Wait for Ninite proc(s)
-    if action == 'Ninite bundle':
-      print_standard('Waiting for installations to finish...')
-      try:
-        for proc in result['Out']:
-          proc.wait()
-      except KeyboardInterrupt:
-        pass
-
-    # Pause
-    if values.get('Pause', False):
-      print_standard(values['Pause'])
-      pause()
-
-  # Show alert box for SecureBoot issues
-  try:
-    check_secure_boot_status(show_alert=True)
-  except Exception: # pylint: disable=broad-except
-    # Ignoring exceptions since we just want to show the popup
-    pass
-
-  # Done
-  pause('Press Enter to exit... ')
-
-
-if __name__ == '__main__':
-  try:
-    main()
-    exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
-  except: # pylint: disable=bare-except
-    major_exception()

.bin/Scripts/transferred_keys.py

@@ -21,8 +21,8 @@ if __name__ == '__main__':
     # Done
     print_standard('\nDone.')
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/update_kit.py

@@ -57,11 +57,9 @@ if __name__ == '__main__':
     # Installers
     print_info('  Installers')
     try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results, width=40)
-    try_and_print(message='LibreOffice...', function=update_libreoffice, other_results=other_results, width=40)
     try_and_print(message='Macs Fan Control...', function=update_macs_fan_control, other_results=other_results, width=40)
     try_and_print(message='MS Office...', function=update_office, other_results=other_results, width=40)
     try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40)
-    try_and_print(message='Windows Updates...', function=download_windows_updates, other_results=other_results, width=40)
     update_all_ninite(other_results=other_results, width=40)
 
     # Misc
@@ -135,8 +133,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/user_checklist.py

@@ -0,0 +1,86 @@
+# Wizard Kit: User Checklist
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.browsers import *
+from functions.cleanup import *
+from functions.setup import *
+init_global_vars()
+os.system('title {}: User Checklist Tool'.format(KIT_NAME_FULL))
+set_log_file('User Checklist ({USERNAME}).log'.format(**global_vars['Env']))
+
+if __name__ == '__main__':
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: User Checklist\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Warning': {
+        'NotInstalledError': 'Not installed',
+        'NoProfilesError': 'No profiles found',
+      }}
+    answer_config_browsers = ask('Install adblock?')
+    if answer_config_browsers:
+      answer_reset_browsers = ask(
+        'Reset browsers to safe defaults first?')
+    if global_vars['OS']['Version'] == '10':
+      answer_config_classicshell = ask('Configure ClassicShell?')
+      answer_config_explorer_user = ask('Configure Explorer?')
+
+    # Cleanup
+    print_info('Cleanup')
+    try_and_print(message='Desktop...',
+      function=cleanup_desktop, cs='Done')
+
+    # Scan for supported browsers
+    print_info('Scanning for browsers')
+    scan_for_browsers()
+
+    # Homepages
+    print_info('Current homepages')
+    list_homepages()
+
+    # Backup
+    print_info('Backing up browsers')
+    backup_browsers()
+
+    # Reset
+    if answer_config_browsers and answer_reset_browsers:
+      print_info('Resetting browsers')
+      reset_browsers()
+
+    # Configure
+    print_info('Configuring programs')
+    if answer_config_browsers:
+      install_adblock()
+    if global_vars['OS']['Version'] == '10':
+      if answer_config_classicshell:
+        try_and_print(message='ClassicStart...',
+          function=config_classicstart, cs='Done')
+      if answer_config_explorer_user:
+        try_and_print(message='Explorer...',
+          function=config_explorer_user, cs='Done')
+      if (not answer_config_browsers
+        and not answer_config_classicshell
+        and not answer_config_explorer_user):
+        print_warning('    Skipped')
+    else:
+      if not answer_config_browsers:
+        print_warning('    Skipped')
+
+    # Run speedtest
+    popen_program(['start', '', 'https://fast.com'], shell=True)
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter to exit...')
+    exit_script()
+  except SystemExit:
+    pass
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/user_data_transfer.py

@@ -59,8 +59,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

.bin/Scripts/windows_updates.py

@@ -1,46 +0,0 @@
-# Wizard Kit: Windows updates
-
-import os
-import sys
-
-# Init
-sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from functions.windows_updates import *
-init_global_vars()
-os.system('title {}: Windows Updates Tool'.format(KIT_NAME_FULL))
-set_log_file('Windows Updates Tool.log')
-
-if __name__ == '__main__':
-  try:
-    clear_screen()
-    print_info('{}: Windows Updates Tool\n'.format(KIT_NAME_FULL))
-
-    # Check args
-    if '--disable' in sys.argv:
-      disable_windows_updates()
-    elif '--enable' in sys.argv:
-      enable_windows_updates()
-    else:
-      print_error('Bad mode.')
-      abort()
-
-    # Done
-    exit_script()
-  except GenericError as err:
-    # Failed to complete request, show error(s) and prompt tech
-    print_standard(' ')
-    for line in str(err).splitlines():
-      print_warning(line)
-    print_standard(' ')
-    print_error('Error(s) encountered, see above.')
-    print_standard(' ')
-    if '--disable' in sys.argv:
-      print_standard('Please reboot and try again.')
-    pause('Press Enter to exit... ')
-    exit_script(1)
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
-  except:
-    major_exception()
-
-# vim: sts=2 sw=2 ts=2

.bin/Scripts/winpe_root_menu.py

@@ -15,8 +15,8 @@ set_log_file('WinPE.log')
 if __name__ == '__main__':
   try:
     menu_root()
-  except SystemExit as sys_exit:
-    exit_script(sys_exit.code)
+  except SystemExit:
+    pass
   except:
     major_exception()
 

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

@@ -19,7 +19,6 @@ menuentry "MemTest86" {
     icon /EFI/boot/icons/wk_memtest.png
     loader /EFI/memtest86/memtestx64.efi
 }
-
 menuentry "Linux" {
     icon /EFI/boot/icons/wk_arch.png
     loader /arch/boot/x86_64/vmlinuz
@@ -27,32 +26,15 @@ menuentry "Linux" {
     initrd /arch/boot/amd_ucode.img
     initrd /arch/boot/x86_64/archiso.img
     options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% copytoram loglevel=3"
-    submenuentry "Linux (CLI)" {
-        add_options "nox"
+    submenuentry "Linux (i3)" {
+        add_options "i3"
+    }
+    submenuentry "Linux (CLI)" {
+        add_options "loglevel=4 nomodeset nox"
     }
-    #UFD-MINIMAL#submenuentry "Linux (Minimal)" {
-    #UFD-MINIMAL#    loader /arch_minimal/vmlinuz
-    #UFD-MINIMAL#    initrd
-    #UFD-MINIMAL#    initrd /arch/boot/intel_ucode.img
-    #UFD-MINIMAL#    initrd /arch/boot/amd_ucode.img
-    #UFD-MINIMAL#    initrd /arch_minimal/archiso.img
-    #UFD-MINIMAL#    options
-    #UFD-MINIMAL#    options "archisobasedir=arch_minimal archisolabel=%ARCHISO_LABEL% copytoram loglevel=3"
-    #UFD-MINIMAL#}
 }
-
-#UFD-WINPE#menuentry "WindowsPE" {
-#UFD-WINPE#    ostype windows
-#UFD-WINPE#    icon /EFI/boot/icons/wk_win.png
-#UFD-WINPE#    loader /EFI/microsoft/bootx64.efi
-#UFD-WINPE#}
-
-#UFD-DGPU#menuentry "Mac dGPU Disable Tool" {
-#UFD-DGPU#    icon /EFI/boot/icons/dgpu.png
-#UFD-DGPU#    loader /dgpu/vmlinuz
-#UFD-DGPU#    initrd /arch/boot/intel_ucode.img
-#UFD-DGPU#    initrd /arch/boot/amd_ucode.img
-#UFD-DGPU#    initrd /dgpu/archiso.img
-#UFD-DGPU#    options "archisobasedir=dgpu archisolabel=%ARCHISO_LABEL% nomodeset"
-#UFD-DGPU#}
-
+#UFD#menuentry "WindowsPE" {
+#UFD#    ostype windows
+#UFD#    icon /EFI/boot/icons/wk_win.png
+#UFD#    loader /EFI/microsoft/bootx64.efi
+#UFD#}

.linux_items/include/airootfs/etc/motd

@@ -1,2 +1,9 @@
-Welcome to the ______
+Welcome to the ______
+
+Some common commands:
+% hw-diags
+% hw-info
+% mount-all-volumes
+% mount-backup-shares
+% connect-to-network
 

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

@@ -34,5 +34,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='ddrescue-tui clone'
-alias wkimage='ddrescue-tui image'
+alias wkclone='sudo ddrescue-tui clone'
+alias wkimage='sudo ddrescue-tui image'

.linux_items/include/airootfs/etc/skel/.tmux.conf

@@ -1,5 +1,5 @@
 set -g status off
-set -g pane-active-border-style fg=white
+set -g pane-active-border-fg white
 
 # Window names
 set -g set-titles on

.linux_items/include/airootfs/etc/skel/.update_network

@@ -1,26 +1,23 @@
+## .update_network ##
 #!/bin/env bash
 #
-## Setup network and update hostname
+## Connect to network and update hostname
 
-# Wait for WiFi
-echo -n "Waiting for network... "
-sleep 3s
-echo "Done"
+# Connect
+connect-to-network
+sleep 2s
 
-# Set hostname
-echo -n "Updating hostname... "
 IP="$(ip a show scope global \
   | grep inet \
   | head -1 \
   | sed -r 's#.*inet ([0-9]+.[0-9]+.[0-9]+.[0-9]+.)/.*#\1#')"
-if [[ "${IP:+x}" ]]; then
-  NEW_HOSTNAME="$(dig +noall +answer +short -x "$IP" \
-    | grep -v ';' \
-    | head -1 \
-    | sed 's/\.$//')"
-fi
-if [[ "${NEW_HOSTNAME:+x}" ]]; then
-  sudo hostnamectl set-hostname "${NEW_HOSTNAME}"
-fi
-echo "Done"
+HOSTNAME="$(dig +noall +answer +short -x "$IP" \
+  | grep -v ';' \
+  | head -1 \
+  | sed 's/\.$//')"
+
+# Set hostname
+if [[ "${HOSTNAME:+x}" ]]; then
+  sudo hostnamectl set-hostname "${HOSTNAME}"
+fi
 

.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
-#UFD-WINPE#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
 #DISABLED_UPSTREAM_BUG#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
-#UFD-WINPE#INCLUDE boot/syslinux/wk_sys_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 #DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg

.linux_items/include/syslinux/wk_sys_linux.cfg

@@ -8,6 +8,17 @@ LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3
 
+LABEL wk_linux_i3
+TEXT HELP
+A live Linux environment (i3)
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (i3)
+LINUX boot/x86_64/vmlinuz
+INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 i3
+SYSAPPEND 3
+
 LABEL wk_linux_cli
 TEXT HELP
 A live Linux environment (CLI)
@@ -16,17 +27,5 @@ ENDTEXT
 MENU LABEL Linux (CLI)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox nomodeset
 SYSAPPEND 3
-
-#UFD-MINIMAL#LABEL wk_linux_minimal
-#UFD-MINIMAL#TEXT HELP
-#UFD-MINIMAL#A live Linux environment (Minimal)
-#UFD-MINIMAL#  * HW diagnostics, file-based backups, data recovery, etc
-#UFD-MINIMAL#ENDTEXT
-#UFD-MINIMAL#MENU LABEL Linux (Minimal)
-#UFD-MINIMAL#LINUX ../arch_minimal/vmlinuz
-#UFD-MINIMAL#INITRD boot/intel_ucode.img,boot/amd_ucode.img,../arch_minimal/archiso.img
-#UFD-MINIMAL#APPEND archisobasedir=arch_minimal archisolabel=%ARCHISO_LABEL% copytoram loglevel=3
-#UFD-MINIMAL#SYSAPPEND 3
-

.linux_items/include_x/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"
 
@@ -320,4 +320,4 @@ bar {
         height              26
 }
 
-exec urxvt -title "Initializing..." -e /home/tech/.update_x
+exec --no-startup-id /home/tech/.update_x

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

@@ -1,5 +1,3 @@
 #openbox-autostart
 
-/usr/bin/urxvt -title "Initializing..." -e "$HOME/.update_x"
-"$HOME/.start_desktop_apps" &
-
+$HOME/.update_x &

.linux_items/include_x/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_x/airootfs/etc/skel/.config/rofi/config

@@ -7,7 +7,5 @@ rofi.color-normal: argb:d02d3036, #d8d8d8, argb:d02d3036, #2d3036, #d64937
 rofi.color-active: argb:d0222222, #d64937, argb:d0222222, #d64937, #d8d8d8
 rofi.color-urgent: argb:d0888888, #d8d8d8, argb:d0888888, #888888, #d64937
 
-rofi.font: Noto Sans 12
-
 rofi.separator-style: solid
 rofi.hide-scrollbar: true

.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer

@@ -1 +0,0 @@
-../update-conky.timer

.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service

@@ -1,6 +0,0 @@
-[Unit]
-Description=Conky config update service
-
-[Service]
-Type=oneshot
-ExecStart=%h/.update_conky

.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer

@@ -1,10 +0,0 @@
-[Unit]
-Description=Conky config update timer
-
-[Timer]
-OnBootSec=5s
-OnUnitActiveSec=30s
-Unit=update-conky.service
-
-[Install]
-WantedBy=timers.target

.linux_items/include_x/airootfs/etc/skel/.start_desktop_apps

@@ -1,24 +0,0 @@
-#!/bin/env bash
-#
-## Start desktop apps based on WM
-
-# Start common apps
-feh --bg-fill "$HOME/.wallpaper"
-compton --backend xrender --xrender-sync --xrender-sync-fence &
-sleep 1s
-x0vncserver -display :0 -passwordfile $HOME/.vnc/passwd -AlwaysShared &
-conky &
-nm-applet &
-volumeicon &
-
-# Start WM specific apps
-if fgrep -q "i3" /proc/cmdline; then
-  # i3
-  i3-msg restart
-else
-  # openbox
-  openbox --restart
-  tint2 &
-  cbatticon --hide-notification &
-fi
-

.linux_items/include_x/airootfs/etc/skel/.update_conky

@@ -1,24 +1,18 @@
 #!/bin/bash
 
-IF_LIST=($(ip l \
-  | egrep '^[0-9]+:\s+(eth|en|wl)' \
-  | sed -r 's/^[0-9]+:\s+(\w+):.*/\1/' \
-  | sort))
-
-# Reset conkyrc to default
-rm "${HOME}/.conkyrc"
-cp "${HOME}/.conkyrc_base" "${HOME}/.conkyrc"
+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 [[ "${i:0:1}" == "e" ]]; then
-    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/" $HOME/.conkyrc
-  fi
-done
+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/" $HOME/.conkyrc
+        else
+            sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc
+        fi
+    done
 
-# Remove '#Network' line to prevent duplicating lines if this script is re-run
-sed -i -r "s/#Network//" $HOME/.conkyrc
+    # Remove '#Network' line to prevent duplicating lines if this script is re-run
+    sed -i -r "s/#Network//" $HOME/.conkyrc
+fi
 
-# vim: sts=2 sw=2 ts=2

.linux_items/include_x/airootfs/etc/skel/.update_x

@@ -5,8 +5,6 @@
 REGEX_XRANDR='^.* ([0-9]+)x([0-9]+)\+[0-9]+\+[0-9]+.* ([0-9]+)mm x ([0-9]+)mm.*$'
 REGEX_URXVT='(URxvt.geometry:\s+).*'
 
-echo -n "Getting display details... "
-
 # Get screen data
 xrandr_str="$(xrandr | grep mm | head -1)"
 width_px="$(echo "${xrandr_str}" | sed -r "s/${REGEX_XRANDR}/\1/")"
@@ -31,17 +29,13 @@ width_urxvt="$(echo "${width_px} * 112/1280" | bc)"
 height_urxvt="$(echo "${height_px} * 33/720" | bc)"
 offset_urxvt="24"
 
-echo "Done"
-
 # Update settings if necessary
 if [[ "${dpi}" -ge 192 ]]; then
-  echo -n "Updating settings for HiDPI... "
-
   # Conky
-  sed -i 's/minimum_size 180 0/minimum_size 360 0/' "${HOME}/.conkyrc_base"
-  sed -i 's/maximum_width 180/maximum_width 360/' "${HOME}/.conkyrc_base"
-  sed -i 's/gap_x 20/gap_x 40/' "${HOME}/.conkyrc_base"
-  sed -i 's/gap_y 24/gap_y 48/' "${HOME}/.conkyrc_base"
+  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"
@@ -53,9 +47,6 @@ if [[ "${dpi}" -ge 192 ]]; then
   # i3
   sed -i -r 's/(height\s+) 26/\1 52/' "${HOME}/.config/i3/config"
 
-  # Rofi
-  sed -i -r 's/Noto Sans 12/Noto Sans 24/' "${HOME}/.config/rofi/config"
-
   # Tint2
   sed -i 's/panel_size = 100% 30/panel_size = 100% 60/' \
     "${HOME}/.config/tint2/tint2rc"
@@ -70,29 +61,37 @@ if [[ "${dpi}" -ge 192 ]]; then
   width_urxvt="$(echo "${width_urxvt} / 2" | bc)"
   height_urxvt="$(echo "${height_urxvt} / 2" | bc)"
   offset_urxvt="$(echo "${offset_urxvt} * 2" | bc)"
-
-  # Done
-  echo "Done"
 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"
 
-# Update conky
-echo -n "Updating conky... "
-$HOME/.update_conky
-echo "Done"
-
 # Update X
-echo -n "Updating X... "
 xset s off
 xset -dpms
 xrdb -merge $HOME/.Xresources
-echo "Done"
 
-# Start desktop apps for i3
+# Start common desktop apps
+feh --bg-fill "$HOME/.wallpaper"
+compton --backend xrender --xrender-sync --xrender-sync-fence &
+sleep 1s
+x0vncserver -display :0 -passwordfile $HOME/.vnc/passwd -AlwaysShared &
+conky &
+nm-applet &
+volumeicon &
+
+# Start WM specific apps
 if fgrep -q "i3" /proc/cmdline; then
-  i3-msg exec $HOME/.start_desktop_apps
+  # i3
+  i3-msg restart
+else
+  # openbox
+  openbox --restart
+  tint2 &
+  cbatticon --hide-notification &
 fi
 
+# Prevent Xorg from being killed by .zlogin
+touch "/tmp/x_ok"
+

.linux_items/include_x/airootfs/etc/skel/.xinitrc

@@ -3,6 +3,5 @@
 dbus-update-activation-environment --systemd DISPLAY
 eval $(ssh-agent)
 export SSH_AUTH_SOCK
-xrdb -merge $HOME/.Xresources
 exec openbox-session
 

.linux_items/include_x/airootfs/etc/skel/.zlogin

@@ -1,7 +1,7 @@
 setterm -blank 0 -powerdown 0 2>/dev/null
 if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
     # Connect to network and update hostname
-    "${HOME}/.update_network"
+    $HOME/.update_network
 
     # Update settings if using i3
     if fgrep -q "i3" /proc/cmdline; then
@@ -9,18 +9,23 @@ if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
         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
-        # Show freeze warning
-        echo ""
-        echo "NOTE: Not all GPUs/displays are supported."
-        echo "      If the system is frozen on this screen"
-        echo "      please restart and try CLI mode instead"
-        echo ""
+        # Kill Xorg after 30 seconds if it doesn't fully initialize
+        (sleep 30s; if ! [[ -f "/tmp/x_ok" ]]; then pkill '(Xorg|startx)'; fi) &
 
-        # Start x
-        echo "Starting X..."
-        startx >/dev/null 2>&1
+        # Try starting X
+        startx >/dev/null
+
+        # Run Hw-Diags CLI if necessary
+        if ! [[ -f "/tmp/x_ok" ]]; then
+            echo "There was an issue starting Xorg, starting CLI interface..."
+            sleep 2s
+            hw-diags --cli
+        fi
     else
         hw-diags --cli
     fi

.linux_items/known_networks

@@ -1,2 +0,0 @@
-#Put WiFi network info here
-#'WiFi SSID': 'WiFi Password'

.linux_items/packages/aur

@@ -2,7 +2,6 @@ aic94xx-firmware
 bash-pipes
 hfsprogs
 i3lock-fancy-git
-ldmtool
 macbook12-spi-driver-dkms
 mprime
 openbox-patched