From 762983788b9c1fb93f423227522e333b553c3bf0 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 29 Aug 2015 14:26:16 -0400
Subject: really make memtest86plus naming consistent

---
diff --git a/.gitignore b/.gitignore
index ebc9027..23ed715 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 /coreboot/
 /flashrom/
 /grub/
-/memtest86+-5.01/
+/memtest86plus/
 /bin/
 /release/
 /resources/utilities/ich9deblob/*.rom
diff --git a/resources/scripts/helpers/build/clean/memtest86plus b/resources/scripts/helpers/build/clean/memtest86plus
index ad25915..6f3db44 100755
--- a/resources/scripts/helpers/build/clean/memtest86plus
+++ b/resources/scripts/helpers/build/clean/memtest86plus
@@ -29,7 +29,7 @@ set -u -e
 
 printf "Cleaning the previous build of MemTest86+\n"
 
-cd "memtest86+-5.01"/
+cd "memtest86plus"/
 
 make clean
 
diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus
index cd2cb86..950607c 100755
--- a/resources/scripts/helpers/download/memtest86plus
+++ b/resources/scripts/helpers/download/memtest86plus
@@ -33,7 +33,7 @@ set -u -e
 
 printf "Downloading MemTest86+\n"
 
-rm -Rf "memtest86+-5.01/"
+rm -Rf "memtest86plus/"
 
 # Get latest memtest86+:
 # ------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ tar -xzf "memtest86+-5.01.tar.gz"
 rm -f "memtest86+-5.01.tar.gz"
 
 # make direcotory name consistent
-mv "memtest86+-5.01" "memtest86plus"
+mv "memtest86+-5.01/" "memtest86plus/"
 
 # there are modifications required
 cd "memtest86plus/"
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh
index 3dfed2c..95a4ce0 100755
--- a/resources/utilities/grub-assemble/gen.sh
+++ b/resources/utilities/grub-assemble/gen.sh
@@ -50,7 +50,7 @@ then
 	  --modules="${grub_modules}" \
 	  --install-modules="${grub_install_modules}" \
 	  /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
-	  /memtest="../../../memtest86+-5.01/memtest" \
+	  /memtest="../../../memtest86plus/memtest" \
 	  $(./grub_memdisk_keymap)
 else
 	printf "grub-assemble gen.sh: invalid mode '%s'\n" "${1}"
--
cgit v0.9.1