Update memtest86-efi to version 6.0.0

4 files changed, 32 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b0324b1e9bda..55dcfce84d47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgbasename=memtest86
 pkgname=$_pkgbasename-efi
-pkgver=5.1.0
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A free, thorough, stand alone memory test as an EFI application"
 arch=('i686' 'x86_64')
@@ -10,28 +10,25 @@ url="http://www.memtest86.com"
 license=('GPL2')
 backup=(etc/$pkgname.conf)
 install=$pkgname.install
-source=("$_pkgbasename-$pkgver".iso.gz::"$url/downloads/$_pkgbasename-iso.gz"
-	"$pkgname"
-	"$pkgname.conf")
-md5sums=('483b1066de1f631b3d4222b95bcbfb5e'
-         '786ecb9dd8fb1fe4cebcfebef22cc323'
-         '16cb53c7132214cdd848d83433ef6462')
+source=("$_pkgbasename-$pkgver.iso.tar.gz::http://www.memtest86.com/downloads/$_pkgbasename-iso.tar.gz"
+	"memtest86-efi"
+	"memtest86-efi.conf")
+md5sums=('c07e36cb18147d11eda2dcbf0c0c44a4'
+         '1d2591c66ec002619f236da72d797a30'
+         '6c096df3f55baf3e27c3bd605a418aa2')
 
 prepare() {
-	bsdtar -xf "$_pkgbasename-$pkgver.iso"
-
-	cd "$srcdir/EFI/BOOT/"
-	mv -f MT86.PNG mt86.png
-	[[ "${CARCH}" == "i686" ]]   && rm -f BOOTX64.EFI	&& mv -f BOOTIA32.EFI bootia32.efi
-	[[ "${CARCH}" == "x86_64" ]] && rm -f BOOTIA32.EFI	&& mv -f BOOTX64.EFI bootx64.efi
+	msg2 "Extract ISO..."
+	bsdtar -xf "Memtest86-6.0.0.iso"
 }
 
 package() {
-	install -dv "$pkgdir/etc" "$pkgdir/usr/bin" "$pkgdir/usr/share/$pkgname"
-
-	install -vm755 "$srcdir/EFI/BOOT/"boot*.efi "$pkgdir/usr/share/$pkgname"
-	install -vm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
+	msg2 "Move MemTest86 stuff in share directory..."
+	[[ "$CARCH" == "i686" ]]   && install -Dvm755 "$srcdir/EFI/BOOT/BOOTIA32.EFI" "$pkgdir/usr/share/$pkgname/bootia32.efi"
+	[[ "$CARCH" == "x86_64" ]] && install -Dvm755 "$srcdir/EFI/BOOT/BOOTX64.EFI"  "$pkgdir/usr/share/$pkgname/bootx64.efi"
+	install -vm644 "$srcdir/EFI/BOOT/MT86.PNG" "$pkgdir/usr/share/$pkgname/mt86.png"
 
-	install -vm644 "$srcdir/EFI/BOOT/mt86.png" "$pkgdir/usr/share/$pkgname"
-	install -vm644 "$srcdir/$pkgname.conf" "$pkgdir/etc"
+	msg2 "Install AUR provided script..."
+	install -Dvm755 "$srcdir/memtest86-efi"		"$pkgdir/usr/bin/memtest86-efi"
+	install -Dvm644 "$srcdir/memtest86-efi.conf"	"$pkgdir/etc/memtest86-efi.conf"
 }
diff --git a/memtest86-efi b/memtest86-efi
index 5b2381b2ebf8..f44807f598e4 100644
--- a/memtest86-efi
+++ b/memtest86-efi
@@ -21,26 +21,29 @@ install() {
 	[[ -z $esp ]] && echo -e "\033[1;31mNo ESP mounted found !\033[0m" && exit 1
 
 	echo "Please, how do you want to use $0 ?"
-	echo -e "\033[1m1\033[0m: from \033[1mLaunch EFI Shell\033[0m (in UEFI Setup)"
-	echo -e "\033[1m2\033[0m: add a new boot entry"
+	echo -e "\033[1m1\033[0m: From \033[1mLaunch EFI Shell\033[0m (in UEFI Setup)"
+	echo -e "\033[1m2\033[0m: Add a new boot entry"
 	echo -e "\033[1m3: Cancel\033[0m"
 	choice=0; while [[ $choice < 1 ]] || [[ $choice > 3 ]]; do
-		read -n 1 choice
+		read choice
 		echo
 	done
 
 	if [[ $choice == 1 ]]; then
+		# Install MemTest86 in $esp
 		echo -e "MemTest86 will be installed in \033[1m$esp\033[0m."
-		[[ -f "$esp/shell$ARCH.efi" ]] && mv -v "$esp/shell$ARCH.efi" "$esp/shell$ARCH.efi.bak"
-		cp -v "$MEMTEST86_PATH/"*		"$esp/"
-		mv -v "$esp/"boot*.efi			"$esp/shell$ARCH.efi"
+		[[ -f "$esp/shell$ARCH.efi" ]] && mv -v "$esp/shell$ARCH.efi" "$esp/shell$ARCH.efi.bak" # Backup if exist
+		cp -v "$MEMTEST86_PATH/"*		"$esp/"	# Move files in ESP root
+		mv -v "$esp/boot$ARCH.efi"		"$esp/shell$ARCH.efi"	# Rename .efi file
 	elif [[ $choice == 2 ]]; then
+		# Install MemTest86 in $esp/EFI/memtest86
 		echo -e "MemTest86 will be installed in \033[1m$esp/EFI/memtest86\033[0m."
 		mkdir -pv "$esp/EFI/memtest86"
-		cp -v "$MEMTEST86_PATH/"*		"$esp/EFI/memtest86/"
-		mv -v "$esp/EFI/memtest86/"boot*.efi	"$esp/EFI/memtest86/memtest$ARCH.efi"
-		efibootmgr -c -d ${partition:0:8} -p ${partition:8} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi"
+		cp -v "$MEMTEST86_PATH/"*		"$esp/EFI/memtest86/" # Move files in memtest ESP directory
+		mv -v "$esp/EFI/memtest86/boot$ARCH.efi" "$esp/EFI/memtest86/memtest$ARCH.efi" # Rename .efi file
+		efibootmgr -c -d ${partition:0:8} -p ${partition:8} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi" # Manage efi entry
 	elif [[ $choice == 3 ]]; then
+		# Do nothing and quit
 		echo -e "Canceled. MemTest86 will not be installed."
 		exit 1
 	fi
@@ -63,11 +66,11 @@ update() {
 	if [[ $choice == 1 ]]; then 
 		echo -e "MemTest86 will be updated in \033[1m$esp\033[0m."
 		cp -fv "$MEMTEST86_PATH/"*		"$esp/"
-		mv -fv "$esp/"boot*.efi			"$esp/shell$ARCH.efi"
+		mv -fv "$esp/boot$ARCH.efi"		"$esp/shell$ARCH.efi"
 	elif [[ $choice == 2 ]]; then
 		echo -e "MemTest86 will be updated in \033[1m$esp/EFI/memtest86\033[0m."
 		cp -fv "$MEMTEST86_PATH/"*		"$esp/EFI/memtest86/"
-		mv -fv "$esp/EFI/memtest86/"boot*.efi	"$esp/EFI/memtest86/memtest$ARCH.efi"
+		mv -fv "$esp/EFI/memtest86/boot$ARCH.efi" "$esp/EFI/memtest86/memtest$ARCH.efi"
 	fi
 
 	echo -e "MemTest86 has been updated in ESP."
diff --git a/memtest86-efi.conf b/memtest86-efi.conf
index 47e7fb47e7a1..bbb4a1022b2b 100644
--- a/memtest86-efi.conf
+++ b/memtest86-efi.conf
@@ -6,4 +6,4 @@ MEMTEST86_PATH=/usr/share/memtest86-efi
 partition=@PARTITION@
 esp=@ESP@
 choice=@CHOICE@
-install=0
\ No newline at end of file
+install=0
diff --git a/memtest86-efi.install b/memtest86-efi.install
index 36669545e65a..108c232bbd7d 100644
--- a/memtest86-efi.install
+++ b/memtest86-efi.install
@@ -10,4 +10,4 @@ post_upgrade() {
 pre_remove() {
 	[[ "$(grep install= /etc/memtest86-efi.conf)" == *"1" ]] && /usr/bin/memtest86-efi --remove
 	exit 0
-}
\ No newline at end of file
+}