ayufan: dev: update the upgrade_bootloader.sh script

Author: ayufan

dev-ayufan/root/usr/local/lib/u-boot-rockchip/loader-common

@@ -110,10 +110,11 @@ boot_device() {
 
 version2() {
     echo "$1:"
-    if VER=$(strings "$2" | grep "^U-Boot [0-9]*.[0-9]*-[a-z0-9.-]* ("); then
-        echo "- Version: $VER"
-        echo "- Board: $(strings "$2" | grep -E "^board=")"
-        echo "- FDT: $(strings "$2" | grep -E "^fdtfile=")"
+    local match=$(strings "$2" | grep -m 3 -E "^board=|^fdtfile=|^U-Boot [0-9]*.[0-9]*-[a-z0-9.-]* \(")
+    if [[ -n "$match" ]]; then
+        echo "- Version: $(echo "$match" | grep -E "^U-Boot ")"
+        echo "- Board: $(echo "$match" | grep -E "^board=")"
+        echo "- FDT: $(echo "$match" | grep -E "^fdtfile=")"
     else
         echo "- Not installed on $2."
     fi

dev-ayufan/root/usr/local/sbin/upgrade_bootloader.sh

@@ -4,52 +4,56 @@ set -eo pipefail
 
 source /usr/local/lib/u-boot-rockchip/loader-common
 
-cnt=1
-methods=()
-
-version2 "Latest version" "$SD_LOADER"
-echo "0) Do not do any changes."
-echo
-methods[0]="# no-op"
-
-while read MNT_DEV; do
-    version2 "$MNT_DEV" "$MNT_DEV"
-
-    echo "$cnt) Install u-boot on $MNT_DEV"
-    methods[$cnt]="dd if=\"$SD_LOADER\" of=\"$MNT_DEV\" iflag=fullblock oflag=direct"
-    cnt=$((cnt+1))
-    echo "$cnt) Remove bootloader on $MNT_DEV"
-    methods[$cnt]="dd if=/dev/zero of=\"$MNT_DEV\" iflag=fullblock oflag=direct"
-    cnt=$((cnt+1))
-    echo
-done < <(blkid /dev/disk/by-id/{ata,usb,mmc}-* -o device -t PARTLABEL="loader1")
-
-if find_mtd; then
-    version2 "SPI Flash" "$MTD_DEV"
-
-    echo "$cnt) Install u-boot on $MTD_DEV"
-    methods[$cnt]="flash_erase \"$MTD_DEV\" \"$MTD_OFFSET\" 0 && nandwrite -s \"$MTD_OFFSET\" \"$MTD_DEV\" \"$SPI_LOADER\""
-    cnt=$((cnt+1))
-    echo "$cnt) Remove bootloader on $MTD_DEV"
-    methods[$cnt]="flash_erase \"$MTD_DEV\" \"$MTD_OFFSET\" 0"
-    cnt=$((cnt+1))
-    echo
-fi
-
-while true; do
-    echo "Select one of the options or Ctrl-C to abort:"
-    read OPTION
-    echo
-
-    if [[ "$OPTION" == "0" ]]; then
-        exit
-    elif [[ -z "${methods[$OPTION]}" ]]; then
-        echo "The '$OPTION' is invalid option"
-        continue
+prompt() {
+    cnt=1
+    methods=()
+
+    echo "############################"
+    version2 "Latest version" "$SD_LOADER"
+
+    while read MNT_DEV; do
+        version2 "$MNT_DEV" "$MNT_DEV"
+
+        echo "$cnt) Install u-boot on $MNT_DEV"
+        methods[$cnt]="dd if=\"$SD_LOADER\" of=\"$MNT_DEV\" iflag=fullblock oflag=direct"
+        cnt=$((cnt+1))
+        echo "$cnt) Remove bootloader on $MNT_DEV"
+        methods[$cnt]="dd if=/dev/zero of=\"$MNT_DEV\" iflag=fullblock oflag=direct"
+        cnt=$((cnt+1))
+        echo
+    done < <(blkid /dev/disk/by-id/{ata,usb,mmc}-* -o device -t PARTLABEL="loader1")
+
+    if find_mtd; then
+        version2 "SPI Flash" "$MTD_DEV"
+
+        echo "$cnt) Install u-boot on $MTD_DEV"
+        methods[$cnt]="flash_erase \"$MTD_DEV\" \"$MTD_OFFSET\" 0 && nandwrite -s \"$MTD_OFFSET\" \"$MTD_DEV\" \"$SPI_LOADER\""
+        cnt=$((cnt+1))
+        echo "$cnt) Remove bootloader on $MTD_DEV"
+        methods[$cnt]="flash_erase \"$MTD_DEV\" \"$MTD_OFFSET\" 0"
+        cnt=$((cnt+1))
+        echo
     fi
+    echo "############################"
+
+    while true; do
+        echo "Select one of the options or Ctrl-C to abort:"
+        read OPTION
+        echo
+
+        if [[ -z "${methods[$OPTION]}" ]]; then
+            echo "The '$OPTION' is invalid option"
+            continue
+        fi
+
+        echo "Executing '${methods[$OPTION]}'..."
+        confirm
+        eval "${methods[$OPTION]}"
+        echo
+        return
+    done
+}
 
-    echo "Executing '${methods[$OPTION]}'..."
-    confirm
-    eval "${methods[$OPTION]}"
-    echo
+while true; do
+    prompt
 done