armbian-update: Adjust kernel version verification

Author: ophub

build-armbian/armbian-files/common-files/usr/sbin/armbian-update

@@ -26,6 +26,7 @@
 #
 # init_var           : Initialize all runtime variables and parse options
 # query_version      : Query the latest kernel version from GitHub releases
+# verify_version     : Check if the kernel version is already installed
 # search_kernel      : Search for local or remote kernel packages
 # download_kernel    : Download kernel package from GitHub releases
 # check_kernel       : Verify kernel package integrity (.deb and .tar.gz)
@@ -313,14 +314,38 @@ query_version() {
     kernel_prefix="${1}"
     echo -e "${INFO} Querying the latest version for [ ${kernel_prefix} ]..."
 
-    # Using lookbehind (?<=...) to extract ONLY the patch number
+    # Using lookbehind (?<=...) to extract ONLY the patch number, such as 6.1.164 -> 164
     latest_kernel="$(
         curl -fsSL ${kernel_api}/releases/expanded_assets/kernel_${KERNEL_TAGS} |
             grep -oP "(?<=${kernel_prefix}\.)[0-9]+(?=\.tar\.gz)" |
             sort -urV | head -n 1
     )"
 }
 
+# Check whether the kernel version matching the system version has already been installed
+verify_version() {
+    # Check if the kernel is already installed
+    if [[ "${current_kernel}" == "${inputs_kernel}" ]]; then
+        echo -e "${INFO} The current kernel [ ${current_kernel} ] is already up to date."
+        echo -ne "${PROMPT} Do you want to force update? [y/n]: "
+        read force_update
+        case "${force_update,,}" in
+        y*)
+            echo -e "${INFO} Proceeding with force update..."
+            [[ "${local_found}" == "yes" ]] && {
+                [[ -f "sha256sums" ]] && mv -f sha256sums -t "${kernel_path}"
+                mv -f *".${download_type}"* -t "${kernel_path}"
+                [[ "${?}" -ne "0" ]] && error_msg "Failed to move local kernel files."
+            }
+            ;;
+        *)
+            echo -e "${FINISH} Update cancelled by user."
+            exit 0
+            ;;
+        esac
+    fi
+}
+
 # Search for local or remote kernel packages
 search_kernel() {
     cd ${current_path}
@@ -357,10 +382,6 @@ search_kernel() {
     if [[ "${local_found}" == "yes" ]]; then
         echo -e "${INFO} Found local kernel packages. Version: [ ${inputs_kernel} ] Type: [ ${download_type} ]"
 
-        [[ -f "sha256sums" ]] && mv -f sha256sums -t "${kernel_path}"
-        mv -f *".${download_type}"* -t "${kernel_path}"
-        [[ "${?}" -ne "0" ]] && error_msg "Failed to move local kernel files."
-
     else
         # Handle Online Query
         check_network
@@ -407,6 +428,9 @@ search_kernel() {
         echo -e "${INFO} Target online kernel: [ ${inputs_kernel} ]"
     fi
 
+    # Check whether the kernel version matching the system version has already been installed
+    verify_version
+
     sync && echo ""
 }
 
@@ -463,12 +487,6 @@ check_kernel() {
         kernel_name="$(echo "${target_file}" | grep -oP '(?<=linux-image_).*?(?=\.deb)')"
         # Extract kernel signature: 6.1.164-1-ophub_arm64 -> ophub
         kernel_signature="$(echo "${kernel_name}" | sed -E 's/^.*-([^-_]+)_.*/\1/')"
-        # Extract verify name: linux-image_6.1.164-1-ophub_arm64.deb -> 6.12.69-ophub
-        verify_name="$(
-            echo "${target_file}" |
-                grep -oP '(?<=linux-image_).*?(?=_arm64\.deb)' |
-                awk -F'-' '{print $1"-"$NF}'
-        )"
 
         # Set file list for verification
         check_list=(${kernel_deb_list[@]})
@@ -482,28 +500,13 @@ check_kernel() {
         kernel_name="$(echo "${target_file}" | grep -oP '(?<=boot-).*?(?=\.tar\.gz)')"
         # Extract kernel signature: 6.6.123-ophub -> ophub
         kernel_signature="${kernel_name#*-}"
-        verify_name="${kernel_name}"
 
         # Set file list for verification
         check_list=(${kernel_tar_list[@]})
     fi
 
     echo -e "${INFO} Kernel name: [ ${kernel_name} ]"
 
-    # Check if the kernel is already installed
-    if [[ "${kernel_uname}" == "${verify_name}" ]]; then
-        echo -e "${INFO} The current kernel [ ${kernel_uname} ] is already up to date."
-        echo -ne "${PROMPT} Do you want to force update? [y/n]: "
-        read force_update
-        case "${force_update,,}" in
-        y*) echo -e "${INFO} Proceeding with force update..." ;;
-        *)
-            echo -e "${FINISH} Update cancelled by user."
-            exit 0
-            ;;
-        esac
-    fi
-
     # Identify Kernel Version
     kernel_base="$(echo ${kernel_name} | grep -oP '\d+\.\d+\.\d+')"
     [[ -z "${kernel_base}" ]] && error_msg "Failed to detect a valid kernel version."