Finish fixing scraper.sh

build.sh

@@ -301,9 +301,11 @@ fi
 get_kernel_update_funcs
 debug_print_default_vars
 
+
 export script_dir mode kernel_name
 source_safe "src/kernels/${kernel_name}.sh"
 
+
 for func in "${update_funcs[@]}"; do
     debug "Evaluating '${func}'"
     "${func}"
@@ -321,6 +323,7 @@ for func in "${update_funcs[@]}"; do
     fi
 done
 
+
 if have_command "sign"; then
     sign_packages
 fi

conf.sh

@@ -25,5 +25,5 @@ gpg_sign_key='0EE7A126'
 
 chroot_path="/opt/chroot/x86_64/$(whoami)"
 
-# Package backup directory (for adding packages to demz-repo-archiso)
+# Package backup directory
 package_backup_dir="/data/pacman/repo/archive_archzfs"

scraper.sh

@@ -127,7 +127,7 @@ check_archiso() {
     #
     msg "Checking archiso download page for linux kernel version changes..."
     check_webpage "https://www.archlinux.org/download/" "(?<=Included Kernel:</strong> )[\d\.]+" \
-        "${ARCHISO_KERNEL_VERSION}"
+        "${kernel_version_archiso}"
     check_result "archiso kernel version" "archiso"
 }
 
@@ -138,7 +138,7 @@ check_linux_kernel() {
     #
     msg "Checking the online package database for x86_64 linux kernel version changes..."
     check_webpage "https://www.archlinux.org/packages/core/x86_64/linux/" "(?<=<h2>linux )[\d\.-]+(?=</h2>)" \
-        "${STD_KERNEL_VERSION}"
+        "${kernel_version}"
     check_result "x86_64 linux kernel package" "linux x86_64"
 }
 
@@ -149,7 +149,7 @@ check_linux_lts_kernel() {
     #
     msg "Checking the online package database for x86_64 linux-lts kernel version changes..."
     check_webpage "https://www.archlinux.org/packages/core/x86_64/linux-lts/" "(?<=<h2>linux-lts )[\d\.-]+(?=</h2>)" \
-        "${LTS_KERNEL_VERSION}"
+        "${kernel_version}"
     check_result "x86_64 linux-lts kernel package" "linux-lts x86_64"
 }
 
@@ -164,9 +164,23 @@ check_zol_version() {
 }
 
 
-check_archiso
+get_kernel_update_funcs
+debug_print_default_vars
+
+
+export script_dir mode kernel_name
+source_safe "src/kernels/linux.sh"
+
+
 check_linux_kernel
+check_archiso
+
+
+source_safe "src/kernels/linux-lts.sh"
 check_linux_lts_kernel
+
+
+# check_archiso
 check_zol_version