Update linux and linux-zen packages for updated kernel mod path

lib.sh

@@ -561,7 +561,7 @@ get_linux_kernel_version() {
     # Check x86_64 linux kernel version
     #
     msg "Checking the online package database for the latest x86_64 linux kernel version..."
-    if ! get_webpage "https://www.archlinux.org/packages/core/x86_64/linux/" "(?<=<h2>linux )[\d\.-]+(?=</h2>)"; then
+    if ! get_webpage "https://www.archlinux.org/packages/core/x86_64/linux/" "(?<=<h2>linux )[\d\w\.-]+(?=</h2>)"; then
         exit 1
     fi
     latest_kernel_version=${webpage_output}
@@ -573,7 +573,7 @@ get_linux_lts_kernel_version() {
     # Check x86_64 linux-lts kernel version
     #
     msg "Checking the online package database for the latest x86_64 linux-lts kernel version..."
-    if ! get_webpage "https://www.archlinux.org/packages/core/x86_64/linux-lts/" "(?<=<h2>linux-lts )[\d\.-]+(?=</h2>)"; then
+    if ! get_webpage "https://www.archlinux.org/packages/core/x86_64/linux-lts/" "(?<=<h2>linux-lts )[\d\w\.-]+(?=</h2>)"; then
         exit 1
     fi
     latest_kernel_version=${webpage_output}

src/kernels/linux-zen.sh

@@ -40,7 +40,7 @@ update_linux_pkgbuilds() {
     kernel_version_full=$(kernel_version_full ${kernel_version})
     kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
     kernel_version_major=${kernel_version%-*}
-    kernel_mod_path="${kernel_version_major}-zen${kernel_version#*-}"
+    kernel_mod_path="${kernel_version/.zen/-zen}-zen"
     archzfs_package_group="archzfs-linux-zen"
     spl_pkgver=${zol_version}.${kernel_version_full_pkgver}
     zfs_pkgver=${zol_version}.${kernel_version_full_pkgver}
@@ -72,7 +72,7 @@ update_linux_git_pkgbuilds() {
     kernel_version_full=$(kernel_version_full ${kernel_version})
     kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
     kernel_version_major=${kernel_version%-*}
-    kernel_mod_path="${kernel_version_major}-zen${kernel_version#*-}"
+    kernel_mod_path="${kernel_version/.zen/-zen}-zen"
     archzfs_package_group="archzfs-linux-zen-git"
     zfs_pkgver="" # Set later by call to git_calc_pkgver
     zfs_pkgrel=${pkgrel_git}

src/kernels/linux.sh

@@ -41,7 +41,7 @@ update_linux_pkgbuilds() {
     kernel_version_full=$(kernel_version_full ${kernel_version})
     kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
     kernel_version_major=${kernel_version%-*}
-    kernel_mod_path="${kernel_version_major}-arch${kernel_version#*-}"
+    kernel_mod_path="${kernel_version/.arch/-arch}-ARCH"
     archzfs_package_group="archzfs-linux"
     spl_pkgver=${zol_version}.${kernel_version_full_pkgver}
     zfs_pkgver=${zol_version}.${kernel_version_full_pkgver}
@@ -75,7 +75,7 @@ update_linux_git_pkgbuilds() {
     kernel_version_full=$(kernel_version_full ${kernel_version})
     kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
     kernel_version_major=${kernel_version%-*}
-    kernel_mod_path="${kernel_version_major}-arch${kernel_version#*-}"
+    kernel_mod_path="${kernel_version/.arch/-arch}-ARCH"
     archzfs_package_group="archzfs-linux-git"
     zfs_pkgver="" # Set later by call to git_calc_pkgver
     zfs_pkgrel=${pkgrel_git}