checkrepo: fix check_db() and speed it up

Reviewed-on: #59

bin/pkg/checkrepo.in

@@ -50,26 +50,32 @@ is_db_entry() {
 }
 
 check_db(){
-    local pkgpath="${1%/*}"
+    local pkgpath="${1}" oldpath="${1%/*}"/repos
 
     for repo in "${!REPOS[@]}"; do
+
         local pkgbuild artixver
-        [[ -f $pkgpath/$CARCH/$repo/PKGBUILD ]] && pkgbuild=$pkgpath/$CARCH/$repo/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-$CARCH/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-$CARCH/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-any/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-any/PKGBUILD
+        if [[ -f $pkgpath/$repo/PKGBUILD ]]; then
+            pkgbuild=$pkgpath/$repo/PKGBUILD
+        elif [[ -f $oldpath/$repo-$CARCH/PKGBUILD ]]; then
+            pkgbuild=$oldpath/$repo-$CARCH/PKGBUILD
+        elif [[ -f $oldpath/$repo-any/PKGBUILD ]]; then
+            pkgbuild=$oldpath/$repo-any/PKGBUILD
+        fi
 
-        # shellcheck disable=1090
-        . "$pkgbuild" 2>/dev/null
-        artixver=$(get_full_version)
-
-        for name in "${pkgname[@]}"; do
-            if ! is_db_entry "$name-$artixver" "$repo"; then
-                msg_row_red "${tableU}" "$repo" "$name" "$artixver" "false"
-            else
-                ${all_db} && msg_row "${tableU}" "$repo" "$name" "$artixver" "true"
-            fi
-        done
-        unset artixver pkgbuild pkgver epoch pkgname pkgbase
+        if [[ -f "$pkgbuild" ]]; then
+            # shellcheck disable=1090
+            . "$pkgbuild" 2>/dev/null
+            artixver=$(get_full_version)
+            for name in "${pkgname[@]}"; do
+                if ! is_db_entry "$name-$artixver" "$repo"; then
+                    msg_row_red "${tableU}" "$repo" "$name" "$artixver" "false"
+                else
+                    ${all_db} && msg_row "${tableU}" "$repo" "$name" "$artixver" "true"
+                fi
+            done
+            unset artixver pkgbuild pkgver epoch pkgname pkgbase
+        fi
     done
 }
 

data/conf/artools-iso.conf

@@ -8,7 +8,7 @@
 # the dist release; default: auto
 # ISO_VERSION=$(date +%Y%m%d)
 
-# possible values: openrc, runit, s6, suite66
+# possible values: openrc, runit, s6, suite66, dinit
 # INITSYS="openrc"
 
 # gpg key; leave empty or commented to skip img signing

lib/iso/calamares.sh

@@ -36,6 +36,11 @@ write_services_suite66_conf(){
     write_services_conf 'svDir' '/etc/66/service' 'runsvDir' '/var/lib/66/system' > "$conf"
 }
 
+write_services_dinit_conf(){
+    local conf="$1"/services-dinit.conf
+    write_services_conf 'initdDir' '/etc/dinit.d' 'runsvDir' '/etc/dinit.d/boot.d' > "$conf"
+}
+
 configure_calamares(){
     local mods="$1/etc/calamares/modules"
     if [[ -d "$mods" ]];then

lib/iso/dracut.sh

@@ -10,7 +10,7 @@ prepare_initramfs_dracut(){
     printf "%s\n" 'add_dracutmodules+=" dmsquash-live"' > "$mnt"/etc/dracut.conf.d/50-live.conf
 
     msg "Starting build: %s" "${kver}"
-    artools-chroot "$mnt" dracut -fqM /boot/initramfs.img "$kver"
+    artix-chroot "$mnt" dracut -fqM /boot/initramfs.img "$kver"
     msg "Image generation successful"
 
     cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img

lib/iso/initcpio.sh

@@ -40,7 +40,7 @@ prepare_initramfs_mkinitcpio() {
         export ARTIX_GNUPG_FD
     fi
 
-    artools-chroot "$mnt" mkinitcpio -k "$k" \
+    artix-chroot "$mnt" mkinitcpio -k "$k" \
         -c /etc/"$mkinitcpio_conf" \
         -g /boot/initramfs.img
 

lib/iso/services.sh

@@ -53,4 +53,14 @@ add_svc_suite66(){
     done
 }
 
+add_svc_dinit(){
+    local mnt="$1" names="$2"
+    for svc in $names; do
+        if [[ -d $mnt/etc/dinit.d/boot.d ]]; then
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+            chroot "$mnt" ln -s ../"$svc" /etc/dinit.d/boot.d/"$svc" &>/dev/null
+        fi
+    done
+}
+
 #}}}

lib/util-pkg.sh

@@ -31,7 +31,7 @@ load_pkg_config(){
         python-{world,galaxy}
     )
 
-    local init_tree=(packages-{openrc,runit,s6,suite66})
+    local init_tree=(packages-{openrc,runit,s6,suite66,dinit})
 
     local desktop_tree=(
         packages-{kf5,plasma,kde,qt6}