From d60aab958408d9eba1ddd9c38dde8bdcd7c17a77 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 20 Dec 2018 16:03:54 -0700
Subject: [PATCH] Updated MemTest86 to 8.0

* Passmark is no longer providing ISOs so the UFD image is used instead
* This is an alternative solution to issue #71
---
 Build Linux | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Build Linux b/Build Linux
index 56233d51..41e5dea5 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -170,13 +170,15 @@ function update_live_env() {
     # Memtest86
     mkdir -p "$LIVE_DIR/EFI/memtest86/Benchmark"
     mkdir -p "$TEMP_DIR/memtest86"
-    curl -Lo "$TEMP_DIR/memtest86/memtest86.iso.tar.gz" "https://www.memtest86.com/downloads/memtest86-iso.tar.gz"
-    tar xvf "$TEMP_DIR/memtest86/memtest86.iso.tar.gz" -C "$TEMP_DIR/memtest86"
-    7z x "$TEMP_DIR/memtest86"/*.iso -o"$TEMP_DIR/memtest86"
-    mv "$TEMP_DIR/memtest86/EFI/BOOT/BLACKLIS.CFG" "$LIVE_DIR/EFI/memtest86/blacklist.cfg"
+    curl -Lo "$TEMP_DIR/memtest86/memtest86-usb.zip" "https://www.memtest86.com/downloads/memtest86-usb.zip"
+    7z e "$TEMP_DIR/memtest86/memtest86-usb.zip" -o"$TEMP_DIR/memtest86" "memtest86-usb.img"
+    7z e "$TEMP_DIR/memtest86/memtest86-usb.img" -o"$TEMP_DIR/memtest86" "MemTest86.img"
+    7z x "$TEMP_DIR/memtest86/MemTest86.img" -o"$TEMP_DIR/memtest86"
+    rm "$TEMP_DIR/memtest86/EFI/BOOT/BOOTIA32.EFI"
     mv "$TEMP_DIR/memtest86/EFI/BOOT/BOOTX64.EFI" "$LIVE_DIR/EFI/memtest86/memtestx64.efi"
-    mv "$TEMP_DIR/memtest86/EFI/BOOT/MT86.PNG" "$LIVE_DIR/EFI/memtest86/mt86.png"
-    mv "$TEMP_DIR/memtest86/EFI/BOOT/UNIFONT.BIN" "$LIVE_DIR/EFI/memtest86/unifont.bin"
+    for f in "$TEMP_DIR/memtest86/EFI/BOOT"/* "help"/* license.rtf; do
+      mv "$f" "$LIVE_DIR/EFI/memtest86"/
+    done
 
     # build.sh
     if ! grep -iq 'wizardkit additions' "$LIVE_DIR/build.sh"; then