diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | memtest86-efi | 36 |
3 files changed, 32 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = memtest86-efi pkgdesc = A free, thorough, stand alone memory test as an EFI application pkgver = 8.3 - pkgrel = 1 + pkgrel = 2 url = https://www.memtest86.com install = memtest86-efi.install arch = any @@ -17,7 +17,7 @@ pkgbase = memtest86-efi source = memtest86-efi-update.hook source = memtest86-efi-remove.hook sha512sums = 40fbe074a1e9b076a9329511cb444afd7eaecc4401173c05c66c464462ca70aa23e42f990d99ba526c65d7da51e0b45cd651b99406a9dcb15d51a11ce83550f4 - sha512sums = 9e4919d3a1d2435c3feed718b422be7206ec639268d79aee2ac419e9665d134829f507506da33903da547f73d22e0833335118cbe04cda0c5bbfc7e64aa3bd51 + sha512sums = 493bbdd83ad33602a8a125cd06c0da4b48de19c11748fe315723c3ac2bbdc577a28a61e93639d6067033110524ed8975a95930ae86280dcf286b3bf41d21c804 sha512sums = 947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8 sha512sums = 6952376b601b84da5fba14a7a5316d37b6083bae20f68f5b90b22d2728a19bf6d1fb367cf1adecfb82bf03e339b7dbf91f6d23f0d59731f89cf45240f16d5614 sha512sums = 1fe55a642e36005f5b7b58e5fb245e8029bb1a19b5f30d8ddba6bbf5a4b96c1bba35be0dfacee478034b8367fdde62d34a934dcd787f4c6702889615bac9f78a @@ -3,7 +3,7 @@ _pkgbasename=memtest86 pkgname=$_pkgbasename-efi pkgver=8.3 -pkgrel=1 +pkgrel=2 pkgdesc="A free, thorough, stand alone memory test as an EFI application" arch=('any') url="https://www.memtest86.com" @@ -20,7 +20,7 @@ source=(#"$pkgname-$pkgver.zip::https://www.memtest86.com/downloads/$_pkgbasenam "memtest86-efi-update.hook" "memtest86-efi-remove.hook") sha512sums=('40fbe074a1e9b076a9329511cb444afd7eaecc4401173c05c66c464462ca70aa23e42f990d99ba526c65d7da51e0b45cd651b99406a9dcb15d51a11ce83550f4' - '9e4919d3a1d2435c3feed718b422be7206ec639268d79aee2ac419e9665d134829f507506da33903da547f73d22e0833335118cbe04cda0c5bbfc7e64aa3bd51' + '493bbdd83ad33602a8a125cd06c0da4b48de19c11748fe315723c3ac2bbdc577a28a61e93639d6067033110524ed8975a95930ae86280dcf286b3bf41d21c804' '947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8' '6952376b601b84da5fba14a7a5316d37b6083bae20f68f5b90b22d2728a19bf6d1fb367cf1adecfb82bf03e339b7dbf91f6d23f0d59731f89cf45240f16d5614' '1fe55a642e36005f5b7b58e5fb245e8029bb1a19b5f30d8ddba6bbf5a4b96c1bba35be0dfacee478034b8367fdde62d34a934dcd787f4c6702889615bac9f78a') diff --git a/memtest86-efi b/memtest86-efi index 996e0ab94e76..1ee0921a1105 100644 --- a/memtest86-efi +++ b/memtest86-efi @@ -30,6 +30,20 @@ checkcommand() { fi } +promptuser() { + local defaultvalue="$1" + local newvalue="" + while true; do + read newvalue + if [[ -n "$defaultvalue" ]] || [[ -n "$newvalue" ]]; then + break + else + echo -en "Please enter a valid value: " > /dev/stderr + fi + done + [[ -n "$newvalue" ]] && echo "$newvalue" || echo "$defaultvalue" +} + _common_install() { efidir="$1" efifile="$2" @@ -75,19 +89,25 @@ install() { # Find ESP device number partition=$(fdisk -l | grep "EFI System" | awk '{print $1}' | tail -n1) - echo -en "Press Enter if ${CB}$partition${CR} is your ESP partition, " - echo -en "else enter device path manually (like ${CB}/dev/sdXY${CR}): " - read choice - [[ -n $choice ]] && partition=$choice + if [[ -n "$partition" ]]; then + echo -en "Press Enter if ${CB}$partition${CR} is your ESP partition, " + echo -en "else enter device path manually (like ${CB}/dev/sdXY${CR}): " + else + echo -en "Enter device path for your ESP partition (like ${CB}/dev/sdXY${CR}): " + fi + partition=$(promptuser "$partition") partnumber=$(echo $partition | grep -Eo '[0-9]+$') [[ $partition == "/dev/nvme"* ]] && device=$(echo $partition | cut -dp -f1) || device=${partition//$partnumber} # Find ESP mount point esp=$(mount | grep $partition | awk '{print $3}' | tail -n1) - echo -en "Press Enter if ${CB}$esp${CR} is your mount point, " - echo -en "else enter mount point manually (like ${CB}/boot/efi${CR}): " - read choice - [[ -n $choice ]] && esp=$choice + if [[ -n "$esp" ]]; then + echo -en "Press Enter if ${CB}$esp${CR} is your mount point for ESP partition, " + echo -en "else enter mount point manually (like ${CB}/boot/efi${CR}): " + else + echo -en "Enter the mount point for the ESP partition (like ${CB}/boot/efi${CR}): " + fi + esp=$(promptuser "$esp") # Check if ESP is mounted if ! mount | grep $partition | grep -q $esp; then |