Add more files and fix hooks

AArch64 is supported now

5 files changed, 35 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd3d2749b69b..107488300cef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = memtest86-efi
 	pkgdesc = A free, thorough, stand alone memory test as an EFI application
 	pkgver = 9.0build2000
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.memtest86.com
 	install = memtest86-efi.install
 	arch = any
@@ -17,10 +17,10 @@ pkgbase = memtest86-efi
 	source = memtest86-efi-update.hook
 	source = memtest86-efi-remove.hook
 	sha512sums = 12933eac68123c40c804995d1cbb5e6773031a9c23186443a0d7d2d68bc67b64fbdd6aed2fc139c91a3a98358bfa2562b79d1a7d38489686421ac5d59fb4dd07
-	sha512sums = 0bcb4f9a8e42afe8717e6626248d97a5366f4b355d232b4fa37056aff2d1cbbf8c74fe6e6b9155df6acc0f6482a3f81da1bbf7a61afed29a1294d5c02a0bc3c3
+	sha512sums = b2a4e8da9e5ca01ef630058232b48531fcd547b2f56aafedb2e8cca9633860cfe287302296918784f1b2cb4b621782b054484d1da713cccdf635d253cbf60260
 	sha512sums = 947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8
-	sha512sums = 6952376b601b84da5fba14a7a5316d37b6083bae20f68f5b90b22d2728a19bf6d1fb367cf1adecfb82bf03e339b7dbf91f6d23f0d59731f89cf45240f16d5614
-	sha512sums = 1fe55a642e36005f5b7b58e5fb245e8029bb1a19b5f30d8ddba6bbf5a4b96c1bba35be0dfacee478034b8367fdde62d34a934dcd787f4c6702889615bac9f78a
+	sha512sums = a8936ed4a1955d69251955b824cfdfc606c374d40509a767ee4e357e746947d5bf1bd6793e5a4224733907556375bee05c0dd27f8044604f136d84c9be365d42
+	sha512sums = 72220e2d5a055838bc347ac0266dd41d466d60186968b21f1782062c35f47f1fab544ad313cab9fac796e597c1f0095864ef38dbce7eee00bf53c336b38b34e6
 
 pkgname = memtest86-efi
 
diff --git a/PKGBUILD b/PKGBUILD
index 3608bcbb4b36..f3dd89a65b92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=memtest86
 pkgname=$_realname-efi
 pkgver=9.0build2000
-pkgrel=1
+pkgrel=2
 pkgdesc="A free, thorough, stand alone memory test as an EFI application"
 arch=('any')
 url="https://www.memtest86.com"
@@ -19,10 +19,10 @@ source=("$pkgname-$pkgver.zip::https://github.com/X0rg/AUR-packages/raw/master/f
 	"memtest86-efi-update.hook"
 	"memtest86-efi-remove.hook")
 sha512sums=('12933eac68123c40c804995d1cbb5e6773031a9c23186443a0d7d2d68bc67b64fbdd6aed2fc139c91a3a98358bfa2562b79d1a7d38489686421ac5d59fb4dd07'
-            '0bcb4f9a8e42afe8717e6626248d97a5366f4b355d232b4fa37056aff2d1cbbf8c74fe6e6b9155df6acc0f6482a3f81da1bbf7a61afed29a1294d5c02a0bc3c3'
+            'b2a4e8da9e5ca01ef630058232b48531fcd547b2f56aafedb2e8cca9633860cfe287302296918784f1b2cb4b621782b054484d1da713cccdf635d253cbf60260'
             '947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8'
-            '6952376b601b84da5fba14a7a5316d37b6083bae20f68f5b90b22d2728a19bf6d1fb367cf1adecfb82bf03e339b7dbf91f6d23f0d59731f89cf45240f16d5614'
-            '1fe55a642e36005f5b7b58e5fb245e8029bb1a19b5f30d8ddba6bbf5a4b96c1bba35be0dfacee478034b8367fdde62d34a934dcd787f4c6702889615bac9f78a')
+            'a8936ed4a1955d69251955b824cfdfc606c374d40509a767ee4e357e746947d5bf1bd6793e5a4224733907556375bee05c0dd27f8044604f136d84c9be365d42'
+            '72220e2d5a055838bc347ac0266dd41d466d60186968b21f1782062c35f47f1fab544ad313cab9fac796e597c1f0095864ef38dbce7eee00bf53c336b38b34e6')
 
 prepare() {
 	7z x -y "$srcdir/memtest86-usb.img" > /dev/null
@@ -33,12 +33,23 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 
 	# Move MemTest86 stuff in share directory
-	install -Dvm755 "EFI/BOOT/BOOTIA32.efi"  "$pkgdir/usr/share/$pkgname/bootia32.efi"
-	install -Dvm755 "EFI/BOOT/BOOTX64.efi"   "$pkgdir/usr/share/$pkgname/bootx64.efi"
-	install -Dvm644 "EFI/BOOT/blacklist.cfg" "$pkgdir/usr/share/$pkgname/blacklist.cfg"
-	install -Dvm644 "EFI/BOOT/mt86.png"      "$pkgdir/usr/share/$pkgname/mt86.png"
-	install -Dvm644 "EFI/BOOT/unifont.bin"   "$pkgdir/usr/share/$pkgname/unifont.bin"
-	install -Dvm644 "license.rtf"            "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf"
+	for file in EFI/BOOT/*; do
+		if [[ "$file" == *".efi" ]]; then
+			filebase="$(basename "$file" | tr '[:upper:]' '[:lower:]')"
+			install -Dvm755 "$file" "$pkgdir/usr/share/$pkgname/$filebase"
+		elif [[ -d "$file" ]]; then
+			dirbase="$(basename "$file")"
+			install -dvm755 "$pkgdir/usr/share/$pkgname/$dirbase"
+		else
+			filebase="$(basename "$file")"
+			install -Dvm644 "$file" "$pkgdir/usr/share/$pkgname/$filebase"
+		fi
+	done
+	for file in help/*; do
+		filebase="$(basename "$file")"
+		install -Dvm644 "$file" "$pkgdir/usr/share/doc/$pkgname/$filebase"
+	done
+	install -Dvm644 "license.rtf" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf"
 
 	# Install AUR provided script
 	install -Dvm755 "$srcdir/memtest86-efi"        "$pkgdir/usr/bin/memtest86-efi"
diff --git a/memtest86-efi b/memtest86-efi
index dcf9872fadef..45a7fb7b4ac6 100644
--- a/memtest86-efi
+++ b/memtest86-efi
@@ -16,8 +16,9 @@ CONFFILE="$CONFDIR/memtest86-efi.conf"
 # shellcheck source=/etc/memtest86-efi/memtest86-efi.conf
 source "$CONFFILE" || exit $CODE_FATAL
 shopt -s extglob
-[[ "$(uname -m)" == "i686" ]]   && ARCH="ia32"
-[[ "$(uname -m)" == "x86_64" ]] && ARCH="x64"
+[[ "$(uname -m)" == "i686" ]]    && ARCH="ia32"
+[[ "$(uname -m)" == "x86_64" ]]  && ARCH="x64"
+[[ "$(uname -m)" == "aarch64" ]] && ARCH="aa64"
 
 warn() {
 	echo -e "${CB}${CE}This script is unofficial, written by an AUR (Arch User Repository) user. Use it at YOUR OWN RISK.${CR}"
@@ -57,8 +58,8 @@ _common_install() {
 
 	echo -e "MemTest86 is installed into ${CB}$efidir/${CR} directory."
 	mkdir -pv "$efidir"
-	cp -v "$MEMTEST86_PATH/"!(*.efi) "$efidir/" # Move files in memtest ESP directory
-	cp -v "$MEMTEST86_PATH/boot$ARCH.efi" "$efidir/$efifile" # Copy and rename .efi file
+	cp -rv "$MEMTEST86_PATH/"!(*.efi) "$efidir/" # Move files in memtest ESP directory
+	cp -v  "$MEMTEST86_PATH/boot$ARCH.efi" "$efidir/$efifile" # Copy and rename .efi file
 }
 
 _write_grub_cfg() {
@@ -195,7 +196,7 @@ install() {
 	sed -i "s|@CHOICE@|$choice|g"       "$CONFFILE"
 	sed -i "s|install=0|install=1|g"    "$CONFFILE"
 
-	echo -e "\nMemTest86 has been installed in ESP."
+	echo "MemTest86 has been installed in ESP."
 }
 
 update() {
@@ -214,7 +215,7 @@ update() {
 		;;
 	esac
 
-	echo -e "\nMemTest86 has been updated in ESP."
+	echo "MemTest86 has been updated in ESP."
 }
 
 remove() {
@@ -267,7 +268,7 @@ remove() {
 	sed -i "s|$choice|@CHOICE@|g"       "$CONFFILE"
 	sed -i "s|install=1|install=0|g"    "$CONFFILE"
 
-	echo -e "\nMemTest86 has been removed from ESP."
+	echo "MemTest86 has been removed from ESP."
 }
 
 status() {
diff --git a/memtest86-efi-remove.hook b/memtest86-efi-remove.hook
index 97fe9f95bb55..e0288276ecd0 100644
--- a/memtest86-efi-remove.hook
+++ b/memtest86-efi-remove.hook
@@ -1,8 +1,7 @@
 [Trigger]
 Operation = Remove
 Type = File
-Target = /usr/share/memtest86-efi/bootia32.efi
-Target = /usr/share/memtest86-efi/bootx64.efi
+Target = usr/share/memtest86-efi/*.efi
 
 [Action]
 Description = Removing MemTest86 EFI from ESP
diff --git a/memtest86-efi-update.hook b/memtest86-efi-update.hook
index fc4d96cd24dd..bed579a2bc82 100644
--- a/memtest86-efi-update.hook
+++ b/memtest86-efi-update.hook
@@ -1,8 +1,7 @@
 [Trigger]
 Operation = Upgrade
 Type = File
-Target = /usr/share/memtest86-efi/bootia32.efi
-Target = /usr/share/memtest86-efi/bootx64.efi
+Target = usr/share/memtest86-efi/*.efi
 
 [Action]
 Description = Updating MemTest86 EFI into ESP