artools/0.27 (#62 )

* refactoring * drop echo Reviewed-on: #62
buildiso: write defaultBundle map for s6 cal
2022-04-25 17:35:02 +02:00 · 2022-04-12 16:54:05 +02:00 · 2022-04-11 16:10:57 +02:00 · 2022-04-11 02:06:20 +02:00 · 2022-04-10 20:44:11 +02:00 · 2022-02-14 17:42:36 +01:00
77 changed files with 1273 additions and 1740 deletions
--- a/19
+++ b/19
@@ -1,11 +1,10 @@
-VERSION=0.21
+V=0.27

 TOOLS = artools
 PREFIX ?= /usr
 SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
 DATADIR = $(PREFIX)/share
-CPIODIR = $(SYSCONFDIR)/initcpio

 BASE_CONF = \
 	data/conf/artools-base.conf
@@ -23,6 +22,8 @@ BASE_DATA = \
 PKG_CONF = \
 	data/conf/artools-pkg.conf

+SETARCH_ALIASES = \
+
 PKG_BIN = \
 	bin/pkg/buildpkg \
 	bin/pkg/deploypkg \
@@ -38,7 +39,9 @@ PKG_BIN = \
 	bin/pkg/find-libdeps \
 	bin/pkg/batchpkg \
 	bin/pkg/signpkg \
-	bin/pkg/checkrepo
+	bin/pkg/checkrepo \
+	bin/pkg/gitearepo \
+	bin/pkg/tidyarch

 LN_COMMITPKG = \
 	extrapkg \
@@ -105,7 +108,7 @@ FILEMODE = -m0644
 MODE =  -m0755
 LN = ln -sf
 RM = rm -f
-M4 = m4 -P
+M4 = m4 -P --define=m4_artools_pkg_version=$V
 CHMODAW = chmod a-w
 CHMODX = chmod +x

@@ -137,6 +140,9 @@ install_base:
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)

+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d
+	for a in ${SETARCH_ALIASES}; do install $(FILEMODE) setarch-aliases.d/$$a $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d; done
+
 install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 	install $(FILEMODE) $(PKG_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
@@ -160,10 +166,7 @@ install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches

-install_cpio:
-	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
-
-install_iso: install_cpio
+install_iso:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 	install $(FILEMODE) $(ISO_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)

--- a/README.md
+++ b/README.md
@@ -18,23 +18,18 @@ artools
 ##### Runtime:

 - base:
-  * openssh
-  * rsync
-  * haveged
  * os-prober
-  * gnupg
  * pacman

 - pkg:
  * namcap
  * git-subrepo
-  * jq
+  * rsync

 - iso:
  * dosfstools
  * libisoburn
  * squashfs-tools
-  * mkinitcpio
  * grub

 #### Configuration
--- a/bin/base/artix-chroot.in
+++ b/bin/base/artix-chroot.in
@@ -21,13 +21,13 @@ m4_include(lib/base/mount.sh)
 #{{{ functions

 chroot_part_mount() {
-    info "mount: [%s]" "$2"
+    msg2 "mount: [%s]" "$2"
    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
 }

 chroot_part_umount() {
    chroot_api_umount
-    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    msg2 "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
    unset CHROOT_ACTIVE_PART_MOUNTS
 }
@@ -35,7 +35,7 @@ chroot_part_umount() {
 detect(){
    local detected
    detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
-    echo "${detected}"
+    printf "%s\n" "${detected}"
 }

 # $1: os-prober array
@@ -44,7 +44,7 @@ get_os_name(){
    str="${str#*:}"
    str="${str#*:}"
    str="${str%:*}"
-    echo "$str"
+    printf "%s\n" "$str"
 }

 mount_os(){
@@ -80,7 +80,7 @@ select_os(){
            local last=${os##*:}
            case $last in
                'efi') count=$((count-1)) ;;
-                *) info "$i) $(get_os_name "$os")"; i=$((i+1)) ;;
+                *) msg2 "$i) $(get_os_name "$os")"; i=$((i+1)) ;;
            esac
        done
        i=0
@@ -106,16 +106,16 @@ select_os(){
 automount=false

 usage() {
-    echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
-    echo '    -a             Automount detected linux system'
-    echo '    -h             Print this help message'
-    echo ''
-    echo "    If 'command' is unspecified, ${0##*/} will launch /bin/sh."
-    echo ''
-    echo "    If 'automount' is true, ${0##*/} will launch /bin/bash"
-    echo "    and ${chrootdir}."
-    echo ''
-    echo ''
+    printf 'usage: %s -a [or] %s chroot-dir [command]\n' "${0##*/}" "${0##*/}"
+    printf '    -a             Automount detected linux system\n'
+    printf '    -h             Print this help message\n'
+    printf '\n'
+    printf "    If 'command' is unspecified, %s will launch /bin/sh.\n" "${0##*/}"
+    printf '\n'
+    printf "    If 'automount' is true, %s will launch /bin/bash\n" "${0##*/}"
+    printf '    and %s\n' "${chrootdir}"
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -125,7 +125,6 @@ while getopts ${opts} arg; do
    case "${arg}" in
        a) automount=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument ${arg}"; usage 1 ;;
    esac
 done
 shift $(( OPTIND - 1 ))
--- a/bin/base/basestrap.in
+++ b/bin/base/basestrap.in
@@ -55,19 +55,19 @@ copymirrorlist=1
 pacmode=-Sy

 usage() {
-    echo "usage: ${0##*/} [options] root [packages...]"
-    echo " -C <config>      Use an alternate config file for pacman"
-    echo " -c               Use the package cache on the host, rather than the target"
-    echo " -G               Avoid copying the host's pacman keyring to the target"
-    echo " -i               Avoid auto-confirmation of package selections"
-    echo " -M               Avoid copying the host's mirrorlist to the target"
-    echo ' -U               Use pacman -U to install packages'
-    echo " -h               Print this help message"
-    echo ''
-    echo ' basestrap installs packages to the specified new root directory.'
-    echo ' If no packages are given, basestrap defaults to the "base" group.'
-    echo ''
-    echo ''
+    printf "usage: %s [options] root [packages...]\n" "${0##*/}"
+    printf " -C <config>      Use an alternate config file for pacman\n"
+    printf " -c               Use the package cache on the host, rather than the target\n"
+    printf " -G               Avoid copying the host's pacman keyring to the target\n"
+    printf " -i               Avoid auto-confirmation of package selections\n"
+    printf " -M               Avoid copying the host's mirrorlist to the target\n"
+    printf ' -U               Use pacman -U to install packages\n'
+    printf " -h               Print this help message\n"
+    printf '\n'
+    printf ' basestrap installs packages to the specified new root directory.\n'
+    printf ' If no packages are given, basestrap defaults to the "base" group.\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -81,8 +81,7 @@ while getopts ${opts} arg; do
        G) copykeyring=0 ;;
        M) copymirrorlist=0 ;;
        U) pacmode=-U ;;
-        :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
-        ?) usage 0 ;;
+        h|?) usage 0 ;;
    esac
 done
 shift $(( OPTIND - 1 ))
--- a/bin/base/chroot-run.in
+++ b/bin/base/chroot-run.in
@@ -15,6 +15,7 @@
 m4_include(lib/base/message.sh)
 m4_include(lib/base/mount.sh)
 m4_include(lib/base/chroot.sh)
+m4_include(lib/base/chroot-version.sh)

 # $1: chroot
 kill_chroot_process(){
@@ -26,11 +27,12 @@ kill_chroot_process(){
                # this process is in the chroot...
                pid=$(basename "$(dirname "$root_dir")")
                name=$(ps -p "$pid" -o comm=)
-                info "Killing chroot process: %s (%s)" "$name" "$pid"
+                msg2 "Killing chroot process: %s (%s)" "$name" "$pid"
                kill -9 "$pid"
            fi
        fi
    done
+    sleep 1
 }

 # umask might have been changed in /etc/profile
@@ -43,18 +45,18 @@ files=()
 mount_args=("-B:/etc/hosts:/etc/hosts")

 usage() {
-    echo "Usage: ${0##*/} [options] working-dir [run arguments]"
-    echo "A wrapper around chroot. Provides support for pacman."
-    echo
-    echo ' options:'
-    echo '    -C <file>     Location of a pacman config file'
-    echo '    -M <file>     Location of a makepkg config file'
-    echo '    -c <dir>      Set pacman cache'
-    echo '    -f <file>     Copy file from the host to the chroot'
-    echo '    -s            Do not run setarch'
-    echo '    -b <list>     Bind mountargs'
-    echo '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]'
-    echo '    -h            This message'
+    printf "Usage: %s [options] working-dir [run arguments]\n" "${0##*/}"
+    printf "A wrapper around chroot. Provides support for pacman.\n"
+    printf '\n'
+    printf ' options:\n'
+    printf '    -C <file>     Location of a pacman config file\n'
+    printf '    -M <file>     Location of a makepkg config file\n'
+    printf '    -c <dir>      Set pacman cache\n'
+    printf '    -f <file>     Copy file from the host to the chroot\n'
+    printf '    -s            Do not run setarch\n'
+    printf '    -b <list>     Bind mountargs\n'
+    printf '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]\n'
+    printf '    -h            This message\n'
    exit 1
 }

@@ -69,7 +71,6 @@ while getopts ${opts} arg; do
        s) nosetarch=1 ;;
        b) bindmounts+=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
        h|?) usage ;;
-        *) error "invalid argument '$arg'"; usage ;;
    esac
 done
 shift $(( OPTIND - 1 ))
@@ -83,27 +84,24 @@ shift 1

 [[ -z $working_dir ]] && die 'Please specify a working directory.'

-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
 if (( ${#cache_dirs[@]} == 0 )); then
-    mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+    mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi

 # shellcheck disable=2016
-host_mirrors=($("$pacconf_cmd" --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
+host_mirrors=($(pacman-conf --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))

 for host_mirror in "${host_mirrors[@]}"; do
    if [[ $host_mirror == *file://* ]]; then
        # shellcheck disable=2016
-        host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
-        info "host mirror: %s" "$host_mirror"
+        host_mirror=$(printf "%s\n" "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
        in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
    fi
 done

 while read -r line; do
    # shellcheck disable=2016
-    mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
+    mapfile -t lines < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
        --repo "$line" Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
    for line in "${lines[@]}"; do
        if [[ $line = file://* ]]; then
@@ -111,7 +109,7 @@ while read -r line; do
            in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
        fi
    done
-done < <("$pacconf_cmd" --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
+done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)

 copy_hostconf () {
    unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
@@ -148,12 +146,6 @@ chroot_extra_mount() {
    done
 }

-sync_host_localtime(){
-    if [[ -e /etc/localtime ]]; then
-        cp -L /etc/localtime "${working_dir}"/etc/localtime
-    fi
-}
-
 umask 0022

 # Sanity check
@@ -163,8 +155,6 @@ elif [[ $(cat "$working_dir/.artools") != "${CHROOTVERSION}" ]]; then
    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "${CHROOTVERSION}"
 fi

-#sync_host_localtime
-
 chroot_api_mount "${working_dir}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"

 chroot_extra_mount
@@ -175,7 +165,13 @@ eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"

 [[ -z $nosetarch ]] || unset CARCH

-${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
+if [[ -f "@datadir@/artools/setarch-aliases.d/${CARCH}" ]]; then
+	read -r set_arch < "@datadir@/artools/setarch-aliases.d/${CARCH}"
+else
+	set_arch="${CARCH}"
+fi
+
+${CARCH:+setarch "${set_arch}"} chroot "${working_dir}" "$@"

 ret=$?

--- a/bin/base/fstabgen.in
+++ b/bin/base/fstabgen.in
@@ -364,23 +364,19 @@ while read -r src target fstype opts fsroot; do
        pass=0
    fi

-    if [[ $fsroot != / ]]; then
-        if [[ $fstype = btrfs ]]; then
-            opts+=,subvol=${fsroot#/}
-        else
-            # it's a bind mount
-            src=$(findmnt -funcevo TARGET "$src")$fsroot
-            if [[ $src -ef $target ]]; then
-                # hrmm, this is weird. we're probably looking at a file or directory
-                # that was bound into a chroot from the host machine. Ignore it,
-                # because this won't actually be a valid mount. Worst case, the user
-                # just re-adds it.
-                continue
-            fi
-            fstype=none
-            opts+=,bind
-            pass=0
+    if [[ $fsroot != / && $fstype != btrfs ]]; then
+        # it's a bind mount
+        src=$(findmnt -funcevo TARGET "$src")$fsroot
+        if [[ $src -ef $target ]]; then
+            # hrmm, this is weird. we're probably looking at a file or directory
+            # that was bound into a chroot from the host machine. Ignore it,
+            # because this won't actually be a valid mount. Worst case, the user
+            # just re-adds it.
+            continue
        fi
+        fstype=none
+        opts+=,bind
+        pass=0
    fi

    # filesystem quirks
--- a/bin/base/mkchroot.in
+++ b/bin/base/mkchroot.in
@@ -14,6 +14,7 @@

 m4_include(lib/base/message.sh)
 m4_include(lib/base/chroot.sh)
+m4_include(lib/base/chroot-version.sh)

 working_dir=''
 umode=''
@@ -22,15 +23,15 @@ files=()
 chroot_args=()

 usage() {
-    echo "Usage: ${0##*/} [options] working-dir package-list..."
-    echo ' options:'
-    echo '    -U            Use pacman -U to install packages'
-    echo '    -C <file>     Location of a pacman config file'
-    echo '    -M <file>     Location of a makepkg config file'
-    echo '    -c <dir>      Set pacman cache'
-    echo '    -f <file>     Copy file from the host to the chroot'
-    echo '    -s            Do not run setarch'
-    echo '    -h            This message'
+    printf "Usage: %s [options] working-dir package-list...\n" "${0##*/}"
+    printf ' options:\n'
+    printf '    -U            Use pacman -U to install packages\n'
+    printf '    -C <file>     Location of a pacman config file\n'
+    printf '    -M <file>     Location of a makepkg config file\n'
+    printf '    -c <dir>      Set pacman cache\n'
+    printf '    -f <file>     Copy file from the host to the chroot\n'
+    printf '    -s            Do not run setarch\n'
+    printf '    -h            This message\n'
    exit 1
 }

@@ -45,7 +46,6 @@ while getopts ${opts} arg; do
        f) files+=("$OPTARG") ;;
        s) nosetarch=1 ;;
        h|?) usage ;;
-        *) error "invalid argument '%s'" "$arg"; usage ;;
    esac
    if [[ $arg != U ]]; then
        chroot_args+=("-$arg")
@@ -63,10 +63,8 @@ shift 1

 [[ -z $working_dir ]] && die 'Please specify a working directory.'

-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <($pacconf_cmd CacheDir)
+	mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi

 umask 0022
@@ -96,9 +94,9 @@ basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
    "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'

 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
-echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
-# echo 'KEYMAP=en' > "$working_dir/etc/vconsole.conf"
-echo "${CHROOTVERSION}" > "$working_dir/.artools"
+printf 'LANG=en_US.UTF-8\n' > "$working_dir/etc/locale.conf"
+# printf 'KEYMAP=en\n' > "$working_dir/etc/vconsole.conf"
+printf "%s\n" "${CHROOTVERSION}" > "$working_dir/.artools"

 dbus-uuidgen --ensure="$working_dir"/etc/machine-id

--- a/bin/iso/buildiso.in
+++ b/bin/iso/buildiso.in
@@ -86,9 +86,9 @@ make_rootfs() {

        basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"

-        copy_overlay "${ROOT_OVERLAY}" "${rootfs}"
+        copy_overlay "${root_overlay}" "${rootfs}"

-        [[ -z ${LIVE_LIST} ]] && configure_chroot "${rootfs}"
+        [[ -z ${live_list} ]] && configure_chroot "${rootfs}"

        clean_up_chroot "${rootfs}"

@@ -109,7 +109,7 @@ make_livefs() {

        basestrap "${basestrap_args[@]}" "${livefs}" "${packages[@]}"

-        copy_overlay "${LIVE_OVERLAY}" "${livefs}"
+        copy_overlay "${live_overlay}" "${livefs}"

        configure_chroot "${livefs}"

@@ -138,7 +138,7 @@ make_bootfs() {
        if "${use_dracut}"; then
            prepare_initramfs_dracut "${bootfs}"
        else
-            prepare_initramfs "${bootfs}"
+            prepare_initramfs_mkinitcpio "${bootfs}"
        fi

        umount_overlayfs
@@ -154,14 +154,14 @@ make_grub(){
        msg "Prepare [/iso/boot/grub]"

        local layer=${work_dir}/rootfs
-        [[ -n ${LIVE_LIST} ]] && layer=${work_dir}/livefs
+        [[ -n ${live_list} ]] && layer=${work_dir}/livefs

        prepare_grub "${work_dir}/rootfs" "$layer"

        if ${use_dracut}; then
            configure_grub_dracut
        else
-            configure_grub
+            configure_grub_mkinitcpio
        fi

        : > "${work_dir}"/grub.lock
@@ -181,7 +181,7 @@ gen_iso_fn(){
    for n in "${vars[@]}"; do
        name=${name:-}${name:+-}${n}
    done
-    echo "$name"
+    printf "%s\n" "$name"
 }

 prepare_build(){
@@ -207,6 +207,10 @@ prepare_build(){
    live_dir=/LiveOS

    mnt_dir=${chroots_iso}/${profile}/mnt
+
+    if [[ -n "${GPG_KEY}" ]]; then
+        ${use_dracut} || export_gpg_publickey
+    fi
 }

 display_settings(){
@@ -217,6 +221,8 @@ display_settings(){

    msg "ISO SETTINGS:"
    msg2 "ISO_VERSION: %s" "${ISO_VERSION}"
+    msg2 "COMPRESSION: %s" "${COMPRESSION}"
+    [[ "${COMPRESSION}" == 'zstd' ]] && msg2 "COMPRESSION_LEVEL: %s" "${COMPRESSION_LEVEL}"

    msg "BUILD:"
    show_profile
@@ -248,10 +254,10 @@ mk_boot(){
 }

 mk_chroots(){
-    load_pkgs "${ROOT_LIST}" "${INITSYS}"
+    load_pkgs "${root_list}"
    run_safe "make_rootfs"
-    if [[ -n ${LIVE_LIST} ]]; then
-        load_pkgs "${LIVE_LIST}" "${INITSYS}"
+    if [[ -n ${live_list} ]]; then
+        load_pkgs "${live_list}"
        run_safe "make_livefs"
    fi
 }
@@ -319,28 +325,28 @@ chroots_iso="${CHROOTS_DIR}/buildiso"
 arch=$(uname -m)

 usage() {
-    echo "Usage: ${cmd} [options]"
-    echo "    -p <profile>       Profile [default: ${profile}]"
-    echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_iso}]"
-    echo '    -t <dir>           Target directory'
-    echo "                       [default: ${ISO_POOL}]"
-    echo '    -i <name>          Init system to use'
-    echo "                       [default: ${INITSYS}]"
-    echo '    -g <key>           The gpg key for img signing'
-    echo "                       [default: ${GPG_KEY}]"
-    echo '    -m                 Set SquashFS image mode to persistence'
-    echo '    -c                 Disable clean work dir'
-    echo '    -x                 Build chroot only'
-    echo '    -s                 Squash chroot only'
-    echo '    -b                 Generate iso boot only'
-    echo '    -z                 Generate iso only'
-    echo '                       Requires pre built images (-x)'
-    echo '    -d                 Use dracut instead of mkinitcpio for iso initramfs'
-    echo '    -q                 Query settings and pretend build'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
+    printf 'Usage: %s [options]\n' "${cmd}"
+    printf '    -p <profile>       Profile [default: %s]\n' "${profile}"
+    printf '    -r <dir>           Chroots directory\n'
+    printf '                       [default: %s]\n' "${chroots_iso}"
+    printf '    -t <dir>           Target directory\n'
+    printf '                       [default: %s]\n' "${ISO_POOL}"
+    printf '    -i <name>          Init system to use\n'
+    printf '                       [default: %s]\n' "${INITSYS}"
+    printf '    -g <key>           The gpg key for img signing\n'
+    printf '                       [default: none]\n'
+    printf '    -m                 Set SquashFS image mode to persistence\n'
+    printf '    -c                 Disable clean work dir\n'
+    printf '    -x                 Build chroot only\n'
+    printf '    -s                 Squash chroot only\n'
+    printf '    -b                 Generate iso boot only\n'
+    printf '    -z                 Generate iso only\n'
+    printf '                       Requires pre built images (-x)\n'
+    printf '    -d                 Use dracut instead of mkinitcpio for iso initramfs\n'
+    printf '    -q                 Query settings and pretend build\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -362,7 +368,6 @@ while getopts "${opts}" arg; do
        d) use_dracut=true ;;
        q) pretend=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

--- a/bin/pkg/batchpkg.in
+++ b/bin/pkg/batchpkg.in
@@ -76,13 +76,13 @@ batch_update() {
 #}}}

 usage() {
-    echo "Usage: ${0##*/} [optional listname]"
-    echo '    -r                 Run generated commands'
-    echo '    -c                 Create subrepos from list'
-    echo '    -u                 Update subrepos from list'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
+    printf 'Usage: %s [optional listname]\n' "${0##*/}"
+    printf '    -r                 Run generated commands\n'
+    printf '    -c                 Create subrepos from list\n'
+    printf '    -u                 Update subrepos from list\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -98,7 +98,6 @@ while getopts "${opts}" arg; do
        c) create=true ;;
        u) update=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

--- a/bin/pkg/buildpkg.in
+++ b/bin/pkg/buildpkg.in
@@ -29,17 +29,17 @@ chroots_pkg="${CHROOTS_DIR}/buildpkg"
 arch=$(uname -m)

 usage() {
-    echo "Usage: ${0##*/} [options] -- [mkchrootpkg_args]"
-    echo "    -r <dir>           Create chroots in this directory"
-    echo "    -d <dir>           Destination repo chroot"
-    echo '    -c                 Recreate the chroot before building'
-    echo '    -m                 Major rebuild'
-    echo '    -N                 Disable check() function'
-    echo '    -C                 Run checkpkg after built'
-    echo '    -h                 This help'
-    echo ''
-    echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
-    echo ''
+    printf 'Usage: %s [options] -- [mkchrootpkg_args]\n' "${0##*/}"
+    printf '    -r <dir>           Create chroots in this directory\n'
+    printf '    -d <dir>           Destination repo chroot\n'
+    printf '    -c                 Recreate the chroot before building\n'
+    printf '    -m                 Major rebuild\n'
+    printf '    -N                 Disable check() function\n'
+    printf '    -C                 Run checkpkg after built\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf 'Default mkchrootpkg_args args: %s\n' "${mkchrootpkg_args[*]}"
+    printf '\n'
    exit "$1"
 }

@@ -54,7 +54,6 @@ while getopts "${opts}" arg; do
        C) mkchrootpkg_args+=(-C) ;;
        N) mkchrootpkg_args+=(-N) ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
    esac
 done

@@ -72,6 +71,12 @@ get_pacman_conf "${repo}"

 get_makepkg_conf

+if [[ -f "${DATADIR}/setarch-aliases.d/${arch}" ]]; then
+	read -r set_arch < "${DATADIR}/setarch-aliases.d/${arch}"
+else
+	set_arch="${arch}"
+fi
+
 check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME

 mkchrootpkg_args+=("${@:$OPTIND}")
@@ -92,7 +97,7 @@ if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then

    rm -rf --one-file-system "${chroots_pkg}/${repo}-${arch}"
    (umask 0022; mkdir -p "${chroots_pkg}/${repo}-${arch}")
-    setarch "${arch}" mkchroot \
+    setarch "${set_arch}" mkchroot \
        -C "${pacman_conf}" \
        -M "${makepkg_conf}" \
        "${chroots_pkg}/${repo}-${arch}/root" \
--- a/bin/pkg/buildtree.in
+++ b/bin/pkg/buildtree.in
@@ -15,115 +15,85 @@
 m4_include(lib/util-base.sh)
 m4_include(lib/util-pkg.sh)
 m4_include(lib/base/message.sh)
+m4_include(lib/pkg/common.sh)
 m4_include(lib/pkg/git.sh)
+m4_include(lib/pkg/gitea.sh)
 m4_include(lib/pkg/repo.sh)
 m4_include(lib/pkg/jenkins.sh)

 #{{{ new git repo

-get_compliant_name(){
-    local gitname="$1"
-    case "$gitname" in
-        *+) gitname=${gitname//+/plus} ;;
-        *+*) gitname=${gitname//+/-} ;;
-    esac
-    echo "$gitname"
-}
-
-subrepo_clone(){
-    local pkg="$1" org="$2" gitname
-    gitname=$(get_compliant_name "$pkg")
-    msg2 "Subrepo clone [%s] from (%s)" "$pkg" "$org/$gitname"
-    git subrepo clone "${GIT_SSH}":"$org"/"$gitname".git "$pkg"
-}
-
-create_repo() {
-    local pkg="$1" org="$2" gitname
-    gitname=$(get_compliant_name "$pkg")
-    local json="{ \"auto_init\": true, \"name\":\"$gitname\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
-
-    msg2 "Create package repo [%s] in org (%s)" "${pkg}" "${org}"
-
-    curl -s -X POST "${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}" \
-        -H "accept: application/json" \
-        -H "content-type: application/json" \
-        -d "$json"
-
-    echo
-}
-
 subrepo_new(){
-    cd "${TREE_DIR_ARTIX}/${GROUP}" || return
+    cd "${TREE_DIR_ARTIX}/${group}" || return

-    local org
-    org=$(get_pkg_org "${PACKAGE}")
+    local org gitname
+    org=$(get_pkg_org "${package}")
+    gitname=$(get_compliant_name "${package}")

-    create_repo "${PACKAGE}" "$org"
+    gitearepo -cr "$gitname"

-    add_repo_to_team "${PACKAGE}" "$org" "${TEAM}"
+    add_team_to_repo "$gitname" "$org" "${team}"

-    subrepo_clone "${PACKAGE}" "$org"
+    msg2 "Subrepo clone [%s] from (%s)" "${package}" "$org/$gitname"
+    git subrepo clone "${GIT_SSH}":"$org/$gitname".git "${package}"

-    mkdir -p "${TREE_DIR_ARTIX}/${GROUP}/${PACKAGE}/trunk"
+    prepare_dir "${TREE_DIR_ARTIX}/${group}/${package}/trunk"

-    commit_jenkins_files "${PACKAGE}"
+    commit_jenkins_files "${package}"
 }

 #}}}

 #{{{ pull

-clone_tree(){
-    local url="$1" tree="$2" os="${3:-Artix}"
-
-    msg "Cloning %s (%s) ..." "$tree" "$os"
-
-    git clone "$url/$tree".git
+config_tree() {
+    local dist="$1" vars="${2:-false}"
+    case "$dist" in
+        Artix)
+            if "$vars"; then
+                dist_tree=("${ARTIX_TREE[@]}")
+                dist_url="${GIT_SSH}:artixlinux"
+                dist_dir=${TREE_DIR_ARTIX}
+            else
+                git config --bool pull.rebase true
+                git config commit.gpgsign true
+                if [[ -n "${GPGKEY}" ]];then
+                    git config user.signingkey "${GPGKEY}"
+                else
+                    warning "No GPGKEY configured in makepkg.conf!"
+                fi
+            fi
+        ;;
+        Arch)
+            if "$vars"; then
+                dist_tree=("${ARCH_TREE[@]}")
+                dist_url="${HOST_TREE_ARCH}"
+                dist_dir=${TREE_DIR_ARCH}
+            else
+                git config --bool pull.rebase false
+                git config branch.master.mergeoptions --no-edit
+            fi
+        ;;
+    esac
 }

-pull_tree_arch(){
-    cd "${TREE_DIR_ARCH}" || return
-    for tree in "${ARCH_TREE[@]}";do
-        if [[ -d "${tree}" ]];then
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)" "Arch"
+update_tree() {
+    local dist="${1:-Artix}"
+    config_tree "$dist" true
+    cd "$dist_dir" || return
+    for tree in "${dist_tree[@]}"; do
+        if [[ -d "$tree" ]]; then
+            ( cd "$tree" || return
+                config_tree "$dist"
+                msg "Checking (%s) (%s)" "$tree" "$dist"
+                pull_tree "$tree" "$(get_local_head)"
            )
        else
-            clone_tree "${host_tree_arch}" "${tree}" "Arch"
-        fi
-    done
-}
-
-config_tree(){
-    local tree="$1"
-    cd "$tree" || return
-        git config --bool pull.rebase true
-        git config commit.gpgsign true
-        if [[ -n "${GPGKEY}" ]];then
-            git config user.signingkey "${GPGKEY}"
-        else
-            warning "No GPGKEY configured in makepkg.conf!"
-        fi
-    cd ..
-}
-
-pull_tree_artix(){
-    local repos=()
-    if ${sync_group}; then
-        repos=("${GROUP}")
-    else
-        repos=("${ARTIX_TREE[@]}")
-    fi
-    cd "${TREE_DIR_ARTIX}" || return
-    for tree in "${repos[@]}"; do
-        if [[ -d "${tree}" ]];then
-            config_tree "${tree}"
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)"
+            msg "Cloning (%s) (%s) ..." "$tree" "$dist"
+            git clone "$dist_url/$tree".git
+            ( cd "$tree" || return
+                config_tree "$dist"
            )
-        else
-            clone_tree "${host_tree_artix}" "${tree}"
-            config_tree "${tree}"
        fi
    done
 }
@@ -136,6 +106,7 @@ patch_pkg(){
    local pkgpath="$1"
    local pkg=${pkgpath%/*}
    pkg=${pkg##*/}
+    sed -e 's|arch-meson|artix-meson|' -i "$pkgpath"/PKGBUILD
    case $pkg in
        glibc)
            msg2 "Patching %s" "$pkg"
@@ -213,14 +184,14 @@ from_arch(){
    cd "${TREE_DIR_ARTIX}" || return

    local srcpath repo archpath artixpath
-    srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+    srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
+    [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${package}"

    repo=$(find_repo "$srcpath")
    msg "repo: %s" "${repo#*/}"

    archpath=$srcpath/$repo
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")

    show_deps "$archpath"

@@ -232,7 +203,7 @@ from_arch(){
            patch_pkg "$artixpath"
        fi
    else
-        die "Package '%s' does not exist!" "${PACKAGE}"
+        die "Package '%s' does not exist!" "${package}"
    fi
 }

@@ -240,8 +211,8 @@ from_arch(){

 view_build(){
    local archpath repo
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
+    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${package}"
    repo=$(find_repo "${archpath}")
    archpath=$archpath/$repo
    msg "repo: %s" "${repo#*/}"
@@ -250,9 +221,9 @@ view_build(){

 check_tree(){
    local archpath artixpath group
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
+    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${package}"
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
    group=${artixpath%/*}
    msg "group: %s" "${group##*/}"

@@ -261,8 +232,8 @@ check_tree(){
 }

 sync_repos(){
-    ${sync_arch} && pull_tree_arch
-    ${sync_artix} && pull_tree_artix
+    ${sync_arch} && update_tree "Arch"
+    ${sync_artix} && update_tree
 }

 load_makepkg_config
@@ -279,38 +250,34 @@ sync_artix=true
 import=false
 view=false
 createnew=false
-sync_group=false
 check=false

-PACKAGE=''
+package=''

-TEAM='community'
-GROUP="${ARTIX_TREE[0]}"
-
-host_tree_artix="${GIT_SSH}:artixlinux"
-host_tree_arch='https://github.com/archlinux'
+team='community'
+group="${ARTIX_TREE[0]}"

 usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo '    -p <pkg>      Package name'
-    echo '    -t <team>     Team name (only with -n)'
-    echo '                  Possible values: core,extra,community,multilib'
-    echo "                  [default: ${TEAM}]"
-    echo '    -g <group>    Group name, the superrepo (only with -n or -s)'
-    echo "                  [default: ${GROUP}]"
-    echo "    -s            Clone or pull repos"
-    echo "    -a            Don't clone or pull arch repos"
-    echo "    -b            Don't clone or pull artix repos"
-    echo '    -i            Import a package from arch repos'
-    echo '    -n            New remote subrepo and clone it'
-    echo '    -v            Check if a package is in the artix tree(s)'
-    echo '    -c            View package depends'
-    echo '    -x            Exclude testing (only with -i)'
-    echo '    -y            Exclude staging (only with -i)'
-    echo '    -z            Include kde & gnome unstable (only with -i)'
-    echo '    -h            This help'
-    echo ''
-    echo ''
+    printf "Usage: %s [options]\n" "${0##*/}"
+    printf '    -p <pkg>      Package name\n'
+    printf '    -t <team>     Team name (only with -n)\n'
+    printf '                  Possible values: core,extra,community,multilib\n'
+    printf "                  [default: %s]\n" "${team}"
+    printf '    -g <group>    Group name, the superrepo (only with -n)\n'
+    printf "                  [default: %s]\n" "${group}"
+    printf "    -s            Clone or pull repos\n"
+    printf "    -a            Don't clone or pull arch repos\n"
+    printf "    -b            Don't clone or pull artix repos\n"
+    printf '    -i            Import a package from arch repos\n'
+    printf '    -n            New remote subrepo and clone it\n'
+    printf '    -v            Check if a package is in the artix tree(s)\n'
+    printf '    -c            View package depends\n'
+    printf '    -x            Exclude testing (only with -i)\n'
+    printf '    -y            Exclude staging (only with -i)\n'
+    printf '    -z            Include kde & gnome unstable (only with -i)\n'
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -318,9 +285,9 @@ opts='p:t:g:sinabcvxyzh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        p) PACKAGE="$OPTARG" ;;
-        t) TEAM="$OPTARG" ;;
-        g) GROUP="$OPTARG"; sync_group=true ;;
+        p) package="$OPTARG" ;;
+        t) team="$OPTARG" ;;
+        g) group="$OPTARG" ;;
        s) sync=true ;;
        a) sync_arch=false ;;
        b) sync_artix=false ;;
@@ -332,7 +299,6 @@ while getopts "${opts}" arg; do
        y) staging=false ;;
        z) unstable=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

--- a/bin/pkg/checkpkg.in
+++ b/bin/pkg/checkpkg.in
@@ -197,7 +197,7 @@ for _pkgname in "${pkgname[@]}"; do
    if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
        message="Sonames differ in $_pkgname!"
        (( WARN )) && warning "$message" || msg "$message"
-        echo "$diff_output"
+        printf "%s\n" "$diff_output"
    else
        msg "No soname differences for %s." "$_pkgname"
    fi
--- a/bin/pkg/checkrepo.in
+++ b/bin/pkg/checkrepo.in
@@ -18,31 +18,42 @@ m4_include(lib/base/message.sh)
 m4_include(lib/pkg/repo.sh)
 m4_include(lib/pkg/table.sh)

+#{{{ db libs
+
+extract_db() {
+    local u="$1" cdir="$2"
+    rm -rf "$cdir"
+    mkdir -p "$cdir"
+    msg2 "%s" "${cdir##*/}"
+    curl -L -s "$u" | bsdtar -xf - -C "$cdir"
+}
+
 update_db_cache(){
-    msg "Updating database cache"
+    msg "Updating database cache ..."
+    local cachedir url
    for repo in "${searchrepos[@]}"; do
-        local cachedir=${db_cache_dir}/${linksdb_ext}/${CARCH}/${repo}
-        rm -rf "$cachedir"
-        mkdir -p "$cachedir"
-        msg2 "%s" "$repo"
-        curl -L -s "${REPOS_MIRROR}/${repo}/os/${CARCH}/${repo}.${linksdb_ext}" \
-            | bsdtar -xf - -C "$cachedir"
+        cachedir=${db_cache_dir}/linksdb/$repo
+        url=${REPOS_MIRROR}/$repo/os/${CARCH}/$repo.${linksdb_ext}
+        extract_db "$url" "$cachedir"
    done
    msg "Done"
 }

+#}}}
+
 #{{{ sogrep

 query_db() {
    for repo in "${searchrepos[@]}"; do
-        local db=${db_cache_dir}/${linksdb_ext}/${CARCH}/${repo}/
+        local db
+        db=${db_cache_dir}/linksdb/$repo/
        if [[ -d ${db} ]]; then
            while read -rd '' pkg; do
                read -r match
                pkg=${pkg#${db}}
                pkg="${pkg%/*}"
-                msg_row "${tableQ}" "${repo}" "${pkg}" "${match}"
-            done < <(grep -rZ "${library}" "${db}") | sort -u
+                msg_row "${tableQ}" "$repo" "$pkg" "${match}"
+            done < <(grep -rZ "$library" "$db") | sort -u
        fi
    done
 }
@@ -52,35 +63,84 @@ query_db() {
 #{{{ check db

 is_db_entry() {
-    local pkgname="$1" repo="${REPOS[$2]}"
+    local pkgname="$1" repo="${REPOS[$2]}" entry
+    entry=${db_cache_dir}/linksdb/$repo/$pkgname

-    if [[ -d ${db_cache_dir}/${linksdb_ext}/${CARCH}/$repo/$pkgname ]];then
+    if [[ -d "$entry" ]];then
        return 0
    fi
    return 1
 }

 check_db(){
-    local pkgpath="${1%/*}"
+    local pkgpath="${1}"

    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

-        # shellcheck disable=1090
-        . "$pkgbuild" 2>/dev/null
+            # 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
+}

-        artixver=$(get_full_version)
-        for name in "${pkgname[@]}"; do
+#}}}

-            if ! is_db_entry "$name-$artixver" "$repo"; then
-                msg_row "${tableU}" "$repo" "$name" "$artixver" "false"
+# {{{ check obsolete
+
+show_obsolete_table() {
+    local arch_mirror='https://mirror.f4st.host/archlinux'
+
+    local arch_repo artix_repo artix_db arch_db url
+    arch_repo="${searchrepos[@]}"
+    artix_repo="${REPOS[$arch_repo]}"
+
+    artix_db="${db_cache_dir}/artixdb/${artix_repo}"
+    arch_db="${db_cache_dir}/archdb/${arch_repo}"
+
+    msg "Updating database cache ..."
+    url=${REPOS_MIRROR}/${artix_repo}/os/$CARCH/${artix_repo}.${db_ext}
+    extract_db "$url" "${artix_db}"
+
+    url=${arch_mirror}/${arch_repo}/os/$CARCH/${arch_repo}.${db_ext}
+    extract_db "$url" "${arch_db}"
+    msg "Done"
+
+    msg_table_header "${tableQ}" "Repo" "Package" "Obsolete"
+    for p in "${artix_db}"/*; do
+        local pkg rel
+        pkg=${p##*/}
+        rel=${pkg##*-}
+        rel=${rel%.*}
+        pkg=${pkg%-*}
+        local p="$pkg-$rel"
+
+        if [[ "$p" != *openrc* ]] && [[ "$p" != *runit* ]] \
+        && [[ "$p" != *s6* ]] && [[ "$p" != *suite66* ]] \
+        && [[ "$p" != *udev* ]] && [[ "$p" != *elogind* ]] \
+        && [[ "$p" != *sysusers* ]] && [[ "$p" != *tmpfiles* ]] \
+        && [[ "$p" != *execline* ]] && [[ "$p" != *skalibs* ]] \
+        && [[ "$p" != *netifrc* ]] && [[ "$p" != *bootlogd* ]] \
+        && [[ "$p" != *pam_rundir* ]] && [[ "$p" != *artools* ]] \
+        && [[ "$p" != *archlinux* ]] && [[ "$p" != *iso-profiles* ]] \
+        && [[ "$p" != *calamares* ]] && [[ "$p" != *iso-initcpio* ]] \
+        && [[ "$p" != *dinit* ]] && [[ "$p" != *artix* ]] && [[ "$p" != *blocaled* ]]; then
+            if [[ ! -d "${arch_db}/$p" ]]; then
+                msg_row "${tableQ}" "${artix_repo}" "$p" "true"
            fi
-
-        done
-        unset artixver pkgbuild pkgver epoch pkgname pkgbase
+        fi
    done
 }

@@ -99,15 +159,18 @@ show_db_table(){
 db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"

 linksdb_ext="links.tar.${DBEXT}"
+db_ext="db.tar.${DBEXT}"

 load_makepkg_config

 sync=false
 check=false
 query=false
+all_db=false
+obsolete=false

 readonly tableU="%-20s %-35s %-30s %-10s"
-readonly tableQ="%-20s %-45s %s"
+readonly tableQ="%-20s %-55s %s"

 load_valid_names

@@ -146,28 +209,31 @@ searchrepos=(
 #}}}

 usage() {
-    echo "Usage: ${0##*/} [options] (with -q [libname])"
-    echo '    -r <repo>     Repo name to query'
-    echo '                  [default: all]'
-    echo "    -s            Sync repo databases"
-    echo '    -c            Check repos'
-    echo "    -q            Query repo databases for so libs"
-    echo '    -h            This help'
-    echo ''
-    echo ''
+    printf "Usage: %s [options] (with -q [libname])\n" "${0##*/}"
+    printf '    -r <repo>     Repo name to query\n'
+    printf '                  [default: all]\n'
+    printf "    -s            Sync repo databases\n"
+    printf '    -c            Check repos\n'
+    printf '    -a            Show repo db (-c)\n'
+    printf '    -o            Check for obsolete packages\n'
+    printf "    -q            Query repo databases for so libs\n"
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

-opts='r:qcsh'
+opts='r:qcsaoh'

 while getopts "${opts}" arg; do
    case "${arg}" in
        r) searchrepos=("$OPTARG") ;;
        s) sync=true ;;
        c) check=true ;;
+        a) all_db=true ;;
        q) query=true ;;
+        o) obsolete=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

@@ -180,3 +246,5 @@ ${sync} && update_db_cache
 ${check} && show_db_table

 ${query} && show_lib_table
+
+${obsolete} && show_obsolete_table
--- a/bin/pkg/commitpkg.in
+++ b/bin/pkg/commitpkg.in
@@ -15,7 +15,9 @@
 m4_include(lib/util-base.sh)
 m4_include(lib/util-pkg.sh)
 m4_include(lib/base/message.sh)
+m4_include(lib/pkg/common.sh)
 m4_include(lib/pkg/git.sh)
+m4_include(lib/pkg/gitea.sh)
 m4_include(lib/pkg/repo.sh)

 #{{{ functions
@@ -44,93 +46,63 @@ subrepo_pull(){
    git subrepo pull "$pkg"
 }

-prepare_commit(){
-    # create new layout, copy & remove repos
-    if [[ -d repos ]]; then
-        msg "Switching to new layout ..."
-        [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-
-        for r in repos/*; do
-            local name noarch
-            name=${r#*/}
-            noarch=${name%-*}
-            mkdir "$CARCH/${noarch}"
-            cp repos/"${name}"/* "$CARCH/${noarch}/"
-            git add "$CARCH/${noarch}"
-        done
-
-        git rm -r repos
-        git commit -m "switch to new repo layout"
-        msg "Done switch"
-    fi
-
-    if [[ $action == 'add' ]] || [[ $action == 'move' ]] ;then
-        [[ -d "$CARCH/${REPO_DEST}" ]] && git rm -r "$CARCH/${REPO_DEST}"
-        [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-        [[ ! -d "$CARCH/${REPO_DEST}" ]] && mkdir "$CARCH/${REPO_DEST}"
-    fi
-}
-
 check_rebuild(){
    if [[ -d "$CARCH"/"${valid_names[10]}" ]] \
-    && [[ "${REPO_DEST}" == "${valid_names[7]}" ]]; then
+    && [[ "${repo_dest}" == "${valid_names[7]}" ]]; then
        git rm -r "$CARCH"/"${valid_names[10]}"
        git commit -m "switch from ${valid_names[10]} to ${valid_names[7]}"
    elif [[ -d "$CARCH"/"${valid_names[7]}" ]] \
-    && [[ "${REPO_DEST}" == "${valid_names[10]}" ]]; then
+    && [[ "${repo_dest}" == "${valid_names[10]}" ]]; then
        git rm -r "$CARCH"/"${valid_names[7]}"
        git commit -m "switch from ${valid_names[7]} to ${valid_names[10]}"
    fi
 }

 check_team(){
-    if [[ "${REPO_SRC}" == "${valid_names[0]}" \
-    && "${REPO_DEST}" == "${valid_names[1]}" ]] || \
-        [[ "${REPO_SRC}" == "${valid_names[1]}" \
-        && "${REPO_DEST}" == "${valid_names[0]}" ]] || \
-        [[ "${REPO_SRC}" == "${valid_names[1]}" \
-        && "${REPO_DEST}" == "${valid_names[2]}" ]] || \
-        [[ "${REPO_SRC}" == "${valid_names[2]}" \
-        && "${REPO_DEST}" == "${valid_names[1]}" ]] ;then
+    if [[ "${repo_src}" == "${valid_names[0]}" && "${repo_dest}" == "${valid_names[1]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[1]}" && "${repo_dest}" == "${valid_names[0]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[1]}" && "${repo_dest}" == "${valid_names[2]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[2]}" && "${repo_dest}" == "${valid_names[1]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[0]}" && "${repo_dest}" == "${valid_names[2]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[2]}" && "${repo_dest}" == "${valid_names[0]}" ]]; then

-        local org
-        org=$(get_pkg_org "${PACKAGE}")
-        add_repo_to_team "${PACKAGE}" "$org" "${REPO_DEST}"
-        remove_repo_from_team "${PACKAGE}" "$org" "${REPO_SRC}"
+        local org gitname
+        org=$(get_pkg_org "${package}")
+        gitname=$(get_compliant_name "${package}")
+        add_team_to_repo "$gitname" "${org}" "${repo_dest}"
+        remove_team_from_repo "$gitname" "${org}" "${repo_src}"
    fi
 }

 path_config() {
-    [[ "${REPO_SRC}" != 'trunk' ]] && pkgbuild="$CARCH/${REPO_SRC}"/PKGBUILD
-
-    if [[ ! -f "$pkgbuild" ]]; then
-        pkgbuild=repos/"${REPO_SRC}-${CARCH}"/PKGBUILD
-        [[ -f repos/"${REPO_SRC}"-any/PKGBUILD ]] && pkgbuild=repos/"${REPO_SRC}"-any/PKGBUILD
-    fi
+    [[ "${repo_src}" != 'trunk' ]] && pkgbuild="$CARCH/${repo_src}"/PKGBUILD

    # shellcheck disable=1090
    . "$pkgbuild"
 }

+get_repo_commit_msg() {
+    printf "[%s] -> [%s] '%s' %s\n" "${repo_src}" "${repo_dest}" "${package}-$(get_full_version)" "${action}"
+}
+
+get_commit_msg() {
+    printf "[%s] '%s' %s\n" "${repo_src}" "${package}-$(get_full_version)" "${action}"
+}
+
 commit_pkg() {
    local commit_msg pkg
-    if ${remove};then
+    if ${remove}; then
        action='remove'
-        if [[ "${REPO_SRC}" == 'trunk' ]];then
-            pkg=${PACKAGE}
+        commit_msg=$(get_commit_msg)
+        msg "Action: %s" "$commit_msg"
+        if [[ "${repo_src}" == 'trunk' ]];then
            git rm -r trunk
        else
-            pkg="${PACKAGE}-$(get_full_version)"
-
-            prepare_commit
-
-            git rm -r "$CARCH/${REPO_SRC}"
+            git rm -r "$CARCH/${repo_src}"
        fi
-        commit_msg="[${REPO_SRC}] '$pkg' ${action}"
-        msg "Action: %s" "$commit_msg"
    else
        action='modify'
-        commit_msg="[${REPO_SRC}] '${PACKAGE}-$(get_full_version)' ${action}"
+        commit_msg=$(get_commit_msg)
        msg "Action: %s" "$commit_msg"
        git add .
    fi
@@ -139,32 +111,32 @@ commit_pkg() {

 repo_commit_pkg() {
    local commit_msg
-    if [[ "${REPO_SRC}" == 'trunk' ]];then
+
+    [[ -d "$CARCH/${repo_dest}" ]] && git rm -r "$CARCH/${repo_dest}"
+    [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
+    [[ ! -d "$CARCH/${repo_dest}" ]] && mkdir "$CARCH/${repo_dest}"
+
+    if [[ "${repo_src}" == 'trunk' ]]; then
        action='add'
-
-        prepare_commit
+        commit_msg=$(get_repo_commit_msg)
+        msg "Action: %s" "$commit_msg"
        check_rebuild
-
-        cp trunk/* "$CARCH/${REPO_DEST}"/
+        cp trunk/* "$CARCH/${repo_dest}"/
    else
        action='move'
        [[ ! -f $pkgbuild ]] && die "%s does not exist!" "$pkgbuild"
-
-        prepare_commit
-
-        cp "$CARCH/${REPO_SRC}"/* "$CARCH/${REPO_DEST}"/
-        git rm -r "$CARCH/${REPO_SRC}"
+        commit_msg=$(get_repo_commit_msg)
+        msg "Action: %s" "$commit_msg"
+        cp "$CARCH/${repo_src}"/* "$CARCH/${repo_dest}"/
+        git rm -r "$CARCH/${repo_src}"
    fi
-    commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$(get_full_version)' ${action}"
-    msg "Action: %s" "$commit_msg"
-
    git add .
    git commit -m "$commit_msg"
 }

 run(){
    local artixpath head group
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
    if [[ -n ${artixpath} ]];then
        group=${artixpath%/*}
        cd "${group}" || return
@@ -182,10 +154,13 @@ run(){

        cd "${group}" || return

-        ${push} && pull_tree "${group##*/}" "$head"
-#         subrepo_pull "${PACKAGE}"
-        subrepo_push "${PACKAGE}"
-        subrepo_clean "${PACKAGE}"
+        if ${push}; then
+            msg "Checking (%s) (Artix)" "${group##*/}"
+            pull_tree "${group##*/}" "$head"
+        fi
+
+        subrepo_push "${package}"
+        subrepo_clean "${package}"

        ${push} && push_tree "${group##*/}"

@@ -193,7 +168,7 @@ run(){

        [[ "${cmd}" != 'commitpkg' ]] && check_team
    else
-        die "Package '%s' does not exist!" "${PACKAGE}"
+        die "Package '%s' does not exist!" "${package}"
    fi
 }

@@ -202,7 +177,7 @@ is_valid_repo(){
    for repo in "${valid_names[@]}"; do
        _valid=${repo:-}${repo:+|}$_valid
    done
-    eval "case ${REPO_SRC} in
+    eval "case ${repo_src} in
        ${_valid}) return 0 ;;
        *) return 1 ;;
    esac"
@@ -214,25 +189,25 @@ load_makepkg_config

 load_valid_names

-REPO_SRC='trunk'
-PACKAGE=''
+repo_src='trunk'
+package=''
 remove=false
 push=false

 pkgbuild=trunk/PKGBUILD

 cmd=${0##*/}
-REPO_DEST=${cmd%pkg}
+repo_dest=${cmd%pkg}

 usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -s <name>          Source repository [default:${REPO_SRC}]"
-    echo '    -p <pkg>           Package name'
-    echo '    -r                 Delete from repo (commitpkg only)'
-    echo '    -u                 Push'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
+    printf "Usage: %s [options]\n" "${0##*/}"
+    printf "    -s <name>          Source repository [default: %s]\n" "${repo_src}"
+    printf '    -p <pkg>           Package name\n'
+    printf '    -r                 Delete from repo (commitpkg only)\n'
+    printf '    -u                 Push\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -240,12 +215,11 @@ opts='p:s:urh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        s) REPO_SRC="$OPTARG" ;;
-        p) PACKAGE="$OPTARG" ;;
+        s) repo_src="$OPTARG" ;;
+        p) package="$OPTARG" ;;
        r) remove=true ;;
        u) push=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

@@ -254,5 +228,5 @@ shift $(( OPTIND - 1 ))
 if is_valid_repo;then
    run
 else
-    die "source repository '%s' is not valid!" "${REPO_SRC}"
+    die "source repository '%s' is not valid!" "${repo_src}"
 fi
--- a/bin/pkg/comparepkg.in
+++ b/bin/pkg/comparepkg.in
@@ -34,11 +34,17 @@ write_list(){
 compare_m(){
    case ${artixrepo} in
        *testing*|*staging*|*rebuild)
-            if [[ "${a}" == "${b}" ]] || [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
+            if [[ "${a}" == "${b}" ]]; then
                msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            elif [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
+                msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
            else
-                msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-                [[ -n "$archrepo" ]] && write_list "${a}:${b}:$pkg" pkg_moves
+                msg_row_green "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+                if [[ -n "$archrepo" ]]; then
+                    write_list "${a}:${b}:$pkg" pkg_moves
+                else
+                    write_list "@repo@:${b}:$pkg" artix
+                fi
            fi
        ;;
    esac
@@ -46,7 +52,10 @@ compare_m(){

 compare_u(){
    if [ "$result" -eq -1 ];then
-        msg_row_upgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+#         local arel=${archver##*-} brel=${artixver##*-}
+#         local reldiff
+#         reldiff=$(( $arel-${brel%.*} ))
+        msg_row_red "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
        write_list "${a}:$pkg" pkg_upgrades
    fi
 }
@@ -54,7 +63,7 @@ compare_u(){
 compare_d(){
    if [ "$result" -eq 1 ];then
        if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
-            msg_row_downgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
        fi
    fi
 }
@@ -65,7 +74,7 @@ get_archpath(){
    for tree in "${ARCH_TREE[@]}"; do
        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && archpath=${TREE_DIR_ARCH}/$tree/$pkg
    done
-    echo "$archpath"
+    printf "%s\n" "$archpath"
 }

 pre_compare(){
@@ -140,6 +149,7 @@ show_downgrades_table(){
 show_move_table(){
    show_compare_header
    remove_list pkg_moves
+    remove_list artix
    tree_loop compare_move
 }

@@ -158,16 +168,16 @@ move=false
 readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"

 usage() {
-    echo "Usage: ${0##*/} [options] (with -q [libname])"
-    echo '    -u            Show upgrade packages'
-    echo '    -d            Show downgrade packages'
-    echo '    -m            Show packages to move'
-    echo "    -x            Don't inlcude testing packages"
-    echo "    -y            Don't inlcude staging packages"
-    echo '    -z            Include unstable kde and gnome'
-    echo '    -h            This help'
-    echo ''
-    echo ''
+    printf 'Usage: %s [options]\n' "${0##*/}"
+    printf '    -u            Show upgrade packages\n'
+    printf '    -d            Show downgrade packages\n'
+    printf '    -m            Show packages to move\n'
+    printf '    -x            Do not inlcude testing packages\n'
+    printf '    -y            Do not inlcude staging packages\n'
+    printf '    -z            Include unstable kde and gnome\n'
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -182,7 +192,6 @@ while getopts "${opts}" arg; do
        y) staging=false ;;
        z) unstable=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

--- a/bin/pkg/deploypkg.in
+++ b/bin/pkg/deploypkg.in
@@ -17,7 +17,7 @@ m4_include(lib/util-pkg.sh)
 m4_include(lib/base/message.sh)
 m4_include(lib/pkg/deploy.sh)

-#{{{ functions
+#{{{ deploy

 add(){
    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
@@ -29,9 +29,9 @@ add(){
 }

 remove(){
-    packages+=("$pkgname")
+    packages+=("$(get_pkgbasename "${pkgname}")")
    action='remove'
-    rm -v "$repo_path"/"$pkgname"*.pkg.tar.*
+    rm -v "$repo_path"/"${pkgname}"{,.sig}
 }

 repo_action(){
@@ -61,14 +61,14 @@ cmd=${0##*/}
 dest_repo=${cmd#*-}

 usage() {
-    echo "Usage: ${cmd} [options]"
-    echo '    -d <dest>          Destination repository'
-    echo '    -a                 Add package(s) to repository'
-    echo '    -r                 Remove package(s) from repository'
-    echo '    -l                 Use links db'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
+    printf "Usage: %s [options]\n" "${cmd}"
+    printf '    -d <dest>          Destination repository\n'
+    printf '    -a                 Add package(s) to repository\n'
+    printf '    -r                 Remove package(s) from repository\n'
+    printf '    -l                 Use links db\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

@@ -81,7 +81,6 @@ while getopts "${opts}" arg; do
        r) rm_pkg=true; add_pkg=false ;;
        l) linksdb=true ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

@@ -92,6 +91,10 @@ passfiles=("$@")
 repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}

 if [[ -n "${passfiles[*]}" ]]; then
-    ${add_pkg} && repo_action add
-    ${rm_pkg} && repo_action remove
+    if ${add_pkg}; then
+        repo_action add
+    fi
+    if ${rm_pkg}; then
+        repo_action remove
+    fi
 fi
--- a/bin/pkg/find-libdeps.in
+++ b/bin/pkg/find-libdeps.in
@@ -32,9 +32,9 @@ case $script_mode in
 esac

 if [[ -z $1 ]]; then
-    echo "${0##*/} [options] <package file|extracted package dir>"
-    echo "Options:"
-    echo "    --ignore-internal      ignore internal libraries"
+    printf "%s [options] <package file|extracted package dir>\n" "${0##*/}"
+    printf "Options:\n"
+    printf "    --ignore-internal      ignore internal libraries\n"
    exit 1
 fi

@@ -61,7 +61,7 @@ process_sofile() {
    fi
    if ! in_array "${soname}=${soversion}-${soarch}" "${soobjects[@]}"; then
        # libfoo.so=1-64
-        echo "${soname}=${soversion}-${soarch}"
+        printf "%s\n" "${soname}=${soversion}-${soarch}"
        soobjects+=("${soname}=${soversion}-${soarch}")
    fi
 }
--- a/bin/pkg/finddeps.in
+++ b/bin/pkg/finddeps.in
@@ -17,11 +17,11 @@ m4_include(lib/base/message.sh)
 match=$1

 if [[ -z $match ]]; then
-    echo 'Usage: finddeps <depname>'
-    echo ''
-    echo 'Find packages that depend on a given depname.'
-    echo 'Run this script from the top-level directory of your ABS tree.'
-    echo ''
+    printf 'Usage: finddeps <depname>\n'
+    printf '\n'
+    printf 'Find packages that depend on a given depname.\n'
+    printf 'Run this script from the top-level directory of your ABS tree.\n'
+    printf '\n'
    exit 1
 fi

--- a/bin/pkg/gitearepo.in
+++ b/bin/pkg/gitearepo.in
@@ -0,0 +1,88 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-21 artoo@artixlinux.org
+# Copyright (C) 2021 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/common.sh)
+
+#{{{ functions
+
+create_repo() {
+    local name="$1"
+    local org="$2"
+    local json url
+
+    json="{ \"auto_init\": true, \"name\":\"$name\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
+
+    url="${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}"
+
+    msg2 "Create package repo [%s] in org (%s)" "$name" "$org"
+
+    api_post "$url" -H "accept: application/json" \
+                    -H "content-type: application/json" \
+                    -d "$json"
+}
+
+transfer_repo() {
+    local name="$1"
+    local old_owner="$2"
+    local new_owner="landfill" json url
+    local json url
+
+    json="{  \"new_owner\": \"$new_owner\",  \"team_ids\": []}"
+
+    url="${GIT_URL}/api/v1/repos/$old_owner/$name/transfer?access_token=${GIT_TOKEN}"
+
+    msg2 "Transfer package repo [%s] in org (%s)" "$name" "$new_owner"
+
+    api_post "$url" -H  "accept: application/json" \
+                    -H  "Content-Type: application/json" \
+                    -d "$json"
+}
+
+#}}}
+
+usage() {
+    printf "Usage: %s [options]\n" "${0##*/}"
+    printf '    -r <repo>     Repo name\n'
+    printf '    -c            Create git repo\n'
+    printf '    -t            Transfer git repo to landfill org\n'
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+create=false
+transfer=false
+
+opts='r:cth'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) repo="$OPTARG" ;;
+        c) create=true ;;
+        t) transfer=true ;;
+        h|?) usage 0 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+
+org=$(get_pkg_org "${repo}")
+
+${create} && create_repo "${repo}" "${org}"
+
+${transfer} && transfer_repo "${repo}" "${org}"
--- a/bin/pkg/lddd.in
+++ b/bin/pkg/lddd.in
@@ -40,7 +40,7 @@ for tree in $PATH $libdirs $extras; do
            #  Is an ELF binary.
            if (( $(ldd "$i" 2>/dev/null | grep -c 'not found') != 0 )); then
                #  Missing lib.
-                echo "$i:" >> "$TEMPDIR/raw.txt"
+                printf "%s\n" "$i:" >> "$TEMPDIR/raw.txt"
                ldd "$i" 2>/dev/null | grep 'not found' >> "$TEMPDIR/raw.txt"
            fi
        fi
--- a/bin/pkg/links-add.in
+++ b/bin/pkg/links-add.in
@@ -35,7 +35,6 @@ REPO_DB_PREFIX=
 REPO_DB_SUFFIX=
 LOCKFILE=
 CLEAN_LOCK=0
-# PREVENT_DOWNGRADE=0

 # ensure we have a sane umask set
 umask 0022
@@ -53,7 +52,6 @@ Multiple packages to add can be specified on the command line.\n"
        printf -- "\n"
        printf -- "Options:\n"
        printf -- "  -n, --new         only add packages that are not already in the database\n"
-#         printf -- "$(gettext "  -p, --prevent-downgrade  do not add package to database if a newer version is already present\n")"
    elif [[ $cmd == "links-remove" ]] ; then
        printf -- "Usage: links-remove [options] <path-to-db> <packagename> ...\n"
        printf -- "\n"
@@ -89,7 +87,7 @@ find_pkgentry() {
    for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
        name=${pkgentry##*/}
        if [[ ${name%-*-*} = "$pkgname" ]]; then
-            echo "$pkgentry"
+            printf "%s\n" "$pkgentry"
            return 0
        fi
    done
@@ -103,7 +101,7 @@ check_gpg() {
    fi

    if (( ! VERIFY )); then
-        if ! gpg --list-key "${GPGKEY}" &>/dev/null; then
+        if ! gpg --list-secret-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then
            if [[ -n "$GPGKEY" ]]; then
                error "The key ${GPGKEY} does not exist in your keyring."
            elif (( ! KEY )); then
@@ -121,11 +119,11 @@ create_signature() {
    local ret=0
    msg "Signing database '%s'..." "${dbfile##*/.tmp.}"

-    local SIGNWITHKEY=""
+    local SIGNWITHKEY=()
    if [[ -n $GPGKEY ]]; then
-        SIGNWITHKEY="-u ${GPGKEY}"
+        SIGNWITHKEY=(-u "${GPGKEY}")
    fi
-    gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY}" "$dbfile" &>/dev/null || ret=$?
+    gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "$dbfile" &>/dev/null || ret=$?

    if (( ! ret )); then
        msg2 "Created signature file '%s'" "${dbfile##*/.tmp.}.sig"
@@ -155,21 +153,13 @@ verify_signature() {
 }

 verify_repo_extension() {
-    local repofile=$1
+    local junk=()
+    if [[ $1 = *.links.tar* ]] && get_compression_command "$1" junk; then
+        return 0
+    fi

-    case $repofile in
-        *.links.tar.gz)  TAR_OPT="z" ;;
-        *.links.tar.bz2) TAR_OPT="j" ;;
-        *.links.tar.xz)  TAR_OPT="J" ;;
-        *.links.tar.zst) TAR_OPT="--zstd" ;;
-        *.links.tar.Z)   TAR_OPT="Z" ;;
-        *.links.tar)     TAR_OPT="" ;;
-        *) error "'%s' does not have a valid database archive extension." \
-                "$repofile"
-            exit 1 ;;
-    esac
-
-    printf '%s' "$TAR_OPT"
+    error "'%s' does not have a valid database archive extension." "$1"
+    exit 1
 }

 # write an entry to the pacman database
@@ -201,18 +191,6 @@ db_write_entry() {
        if (( ONLYADDNEW )); then
            return 0
        fi
-#     else
-#         pkgentry=$(find_pkgentry "$pkgname")
-#         if [[ -n $pkgentry ]]; then
-#
-#             local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc")
-#             if (( $(vercmp "$version" "$pkgver") > 0 )); then
-#                 warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname"
-#                 if (( PREVENT_DOWNGRADE )); then
-#                     return 0
-#                 fi
-#             fi
-#         fi
    fi

    # remove an existing entry if it exists, ignore failures
@@ -232,8 +210,9 @@ db_write_entry() {
    msg2 "Creating '%s' db entry..." "${REPO_DB_NAME}"

    local linksentry=$tmpdir/${REPO_DB_NAME}/$pkgname-$pkgver/${REPO_DB_NAME}
+    local files=$(find "$tmppkg" -type f ! -ipath "*/Documentation/*")

-    for f in $(find "$tmppkg" -type f); do
+    for f in ${files}; do
        readelf -d "$f" 2> /dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'
    done | sort -u > "$linksentry"

@@ -259,7 +238,7 @@ db_remove_entry() {

        # remove entries in "links" database
        local linksentry
-        linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
+        linksentry=$(printf "%s\n" "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
        rm -rf "$linksentry"

        pkgentry=$(find_pkgentry "$pkgname")
@@ -279,7 +258,7 @@ prepare_repo_db() {
    fi

    # check lock file
-    if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then
+    if ( set -o noclobber; printf "%s\n" "$$" > "$LOCKFILE") 2> /dev/null; then
        CLEAN_LOCK=1
    else
        error "Failed to acquire lockfile: %s." "$LOCKFILE"
@@ -396,7 +375,6 @@ rotate_db() {
 }

 create_db() {
-    TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE")
    # $LOCKFILE is already guaranteed to be absolute so this is safe
    dirname=${LOCKFILE%/*}

@@ -405,13 +383,13 @@ create_db() {
    tempname=$dirname/.tmp.$filename

    pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
-    if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then
-        bsdtar -c"${TAR_OPT}"f "$tempname" *
-    else
+    local files=(*)
+    if [[ ${files[*]} = '*' ]]; then
        # we have no packages remaining? zip up some emptyness
        warning "No packages remain, creating empty database."
-        bsdtar -c"${TAR_OPT}"f "$tempname" -T /dev/null
+        files=(-T /dev/null)
    fi
+    bsdtar -cf - "${files[@]}" | compress_as "$filename" > "$tempname"
    popd >/dev/null

    create_signature "$tempname"
@@ -421,7 +399,7 @@ trap_exit() {
    # unhook all traps to avoid race conditions
    trap '' EXIT TERM HUP QUIT INT ERR

-    echo
+    printf '\n'
    error "$@"
    clean_up 1
 }
@@ -475,7 +453,6 @@ while (( $# )); do
        -s|--sign) SIGN=1 ;;
        -k|--key) KEY=1 ; shift; GPGKEY=$1 ;;
        -v|--verify) VERIFY=1 ;;
-#         -p|--prevent-downgrade) PREVENT_DOWNGRADE=1 ;;
        *) args+=("$1") ;;
    esac
    shift
@@ -493,7 +470,7 @@ else
    LOCKFILE=$PWD/$REPO_DB_FILE.lck
 fi

-verify_repo_extension "$REPO_DB_FILE" >/dev/null
+verify_repo_extension "$REPO_DB_FILE"

 REPO_DB_PREFIX=${REPO_DB_FILE##*/}
 REPO_DB_PREFIX=${REPO_DB_PREFIX%.links.*}
--- a/bin/pkg/mkchrootpkg.in
+++ b/bin/pkg/mkchrootpkg.in
@@ -15,6 +15,9 @@
 m4_include(lib/base/message.sh)
 m4_include(lib/base/chroot.sh)

+export BUILDTOOL=artools-pkg
+export BUILDTOOLVER=m4_artools_pkg_version
+
 shopt -s nullglob

 default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
@@ -32,7 +35,6 @@ clean_first=0
 run_namcap=0
 run_checkpkg=0
 temp_chroot=0
-run_nocheck=0

 bindmounts=()

@@ -42,43 +44,43 @@ copy=$USER
 src_owner=${SUDO_USER:-$USER}

 usage() {
-    echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
-    echo ' Run this script in a PKGBUILD dir to build a package inside a'
-    echo ' clean chroot. Arguments passed to this script after the'
-    echo ' end-of-options marker (--) will be passed to makepkg.'
-    echo ''
-    echo ' The chroot dir consists of the following directories:'
-    echo ' <chrootdir>/{root, copy} but only "root" is required'
-    echo ' by default. The working copy will be created as needed'
-    echo ''
-    echo 'The chroot "root" directory must be created via the following'
-    echo 'command:'
-    echo '    mkchroot <chrootdir>/root base-devel'
-    echo ''
-    echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER'
-    echo 'from makepkg.conf(5), if those variables are not part of the'
-    echo 'environment.'
-    echo ''
-    echo "Default makepkg args: ${default_makepkg_args[*]}"
-    echo ''
-    echo 'Flags:'
-    echo '-h         This help'
-    echo '-c         Clean the chroot before building'
-    echo '-d <dir>   Bind directory into build chroot as read-write'
-    echo '-D <dir>   Bind directory into build chroot as read-only'
-    echo '-u         Update the working copy of the chroot before building'
-    echo '           This is useful for rebuilds without dirtying the pristine'
-    echo '           chroot'
-    echo '-r <dir>   The chroot dir to use'
-    echo '-I <pkg>   Install a package into the working copy of the chroot'
-    echo '-l <copy>  The directory to use as the working copy of the chroot'
-    echo '           Useful for maintaining multiple copies'
-    echo "           Default: $copy"
-    echo '-n         Run namcap on the package'
-    echo '-C         Run checkpkg on the package'
-    echo '-N         Disable check() function'
-    echo '-T         Build in a temporary directory'
-    echo '-U         Run makepkg as a specified user'
+    printf 'Usage: %s [options] -r <chrootdir> [--] [makepkg args]\n' "${0##*/}"
+    printf ' Run this script in a PKGBUILD dir to build a package inside a\n'
+    printf ' clean chroot. Arguments passed to this script after the\n'
+    printf ' end-of-options marker (--) will be passed to makepkg.\n'
+    printf '\n'
+    printf ' The chroot dir consists of the following directories:\n'
+    printf ' <chrootdir>/{root, copy} but only "root" is required\n'
+    printf ' by default. The working copy will be created as needed\n'
+    printf '\n'
+    printf "The chroot 'root' directory must be created via the following\n"
+    printf 'command:\n'
+    printf '    mkchroot <chrootdir>/root base-devel\n'
+    printf '\n'
+    printf 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER\n'
+    printf 'from makepkg.conf(5), if those variables are not part of the\n'
+    printf 'environment.\n'
+    printf '\n'
+    printf 'Default makepkg args: %s\n' "${default_makepkg_args[*]}"
+    printf '\n'
+    printf 'Flags:\n'
+    printf ' -h         This help\n'
+    printf ' -c         Clean the chroot before building\n'
+    printf ' -d <dir>   Bind directory into build chroot as read-write\n'
+    printf ' -D <dir>   Bind directory into build chroot as read-only\n'
+    printf ' -u         Update the working copy of the chroot before building\n'
+    printf '           This is useful for rebuilds without dirtying the pristine\n'
+    printf '           chroot\n'
+    printf ' -r <dir>   The chroot dir to use\n'
+    printf ' -I <pkg>   Install a package into the working copy of the chroot\n'
+    printf ' -l <copy>  The directory to use as the working copy of the chroot\n'
+    printf '            Useful for maintaining multiple copies\n'
+    printf '            Default: %s\n' "$copy"
+    printf ' -n         Run namcap on the package\n'
+    printf ' -C         Run checkpkg on the package\n'
+    printf ' -N         Disable check() function\n'
+    printf ' -T         Build in a temporary directory\n'
+    printf ' -U         Run makepkg as a specified user\n'
    exit 1
 }

@@ -180,7 +182,7 @@ prepare_chroot() {
        "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
    do
        grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
-        echo "$x" >>"$copydir/etc/makepkg.conf"
+        printf "%s\n" "$x" >>"$copydir/etc/makepkg.conf"
    done

    cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
@@ -194,6 +196,8 @@ EOF
        printf '#!/bin/bash\n'
        declare -f _chrootbuild
        declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
+        declare -p BUILDTOOL 2>/dev/null
+		declare -p BUILDTOOLVER 2>/dev/null
        printf '_chrootbuild "$@" || exit\n'

        if (( run_namcap )); then
@@ -219,7 +223,10 @@ _chrootbuild() {
    # use "$" in arguments to commands with "sudo -i".  ${foo} or
    # ${1} is OK, but $foo or $1 isn't.
    # https://bugzilla.sudo.ws/show_bug.cgi?id=765
-    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+    sudo --preserve-env=SOURCE_DATE_EPOCH \
+        -preserve-env=BUILDTOOL \
+		--preserve-env=BUILDTOOLVER \
+        -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
    ret=$?
    case $ret in
        0|14)
@@ -232,7 +239,7 @@ _chrootbuild() {
 _chrootnamcap() {
    pacman -S --needed --noconfirm namcap
    for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
-        echo "Checking ${pkgfile##*/}"
+        printf "Checking %s\n" "${pkgfile##*/}"
        sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
    done
 }
@@ -242,12 +249,21 @@ download_sources() {
    chown "$makepkg_user:" "$WORKDIR"

    # Ensure sources are downloaded
-    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
+    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
        env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
        die "Could not download sources."
 }

+move_logfiles() {
+    local l
+    for l in "$copydir"/logdest/*; do
+        [[ $l == */logpipe.* ]] && continue
+        chown "$src_owner" "$l"
+        mv "$l" "$LOGDEST"
+    done
+}
+
 move_products() {
    local pkgfile
    for pkgfile in "$copydir"/pkgdest/*; do
@@ -260,12 +276,7 @@ move_products() {
        fi
    done

-    local l
-    for l in "$copydir"/logdest/*; do
-        [[ $l == */logpipe.* ]] && continue
-        chown "$src_owner" "$l"
-        mv "$l" "$LOGDEST"
-    done
+    move_logfiles

    for s in "$copydir"/srcpkgdest/*; do
        chown "$src_owner" "$s"
@@ -290,7 +301,7 @@ while getopts "${opts}" arg; do
        I) install_pkgs+=("$OPTARG") ;;
        l) copy="$OPTARG" ;;
        n) run_namcap=1; makepkg_args+=(--install) ;;
-        N) run_nocheck=1; makepkg_args+=(--nocheck) ;;
+        N) makepkg_args+=(--nocheck) ;;
        C) run_checkpkg=1 ;;
        T) temp_chroot=1; copy+="-$$" ;;
        U) makepkg_user="$OPTARG" ;;
@@ -302,7 +313,7 @@ done
 [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
 makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}

-check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER

 # Canonicalize chrootdir, getting rid of trailing /
 chrootdir=$(readlink -e "$passeddir")
@@ -380,6 +391,7 @@ then
    move_products
 else
    (( ret += 1 ))
+    move_logfiles
 fi

 (( temp_chroot )) && delete_chroot "$copydir" "$copy"
--- a/bin/pkg/pkg2yaml.in
+++ b/bin/pkg/pkg2yaml.in
@@ -17,6 +17,24 @@ m4_include(lib/base/yaml.sh)

 #{{{ functions

+print_package_names() {
+    local version=$(get_full_version)
+    local architecture pkg
+    for pkg in ${pkgname[@]}; do
+        architecture=$(get_pkg_arch $pkg)
+        printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT"
+    done
+}
+
+print_debug_package_names() {
+    local version=$(get_full_version)
+    local architecture
+    if check_option "debug" "y" && check_option "strip" "y"; then
+        architecture=$(get_pkg_arch)
+        printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkgbase" "debug" "$version" "$architecture" "$PKGEXT"
+    fi
+}
+
 srcyaml_write_attr(){
    local ident1="$1" ident2="$2" ident3="$3"
    local attrname=$4 attrvalues=("${@:5}")
@@ -108,13 +126,19 @@ yaml_write_fileinfo(){
    pkgbase=${pkgbase:-$pkgname}
    Yaml+=$(write_yaml_map 0 "version" "${version:-0}")
    Yaml+=$(write_empty_line)
-    local pkgfile
-    pkgfile=$(print_all_package_names)
+    local pkgfile debug_pkg
+    pkgfile=$(print_package_names)
    Yaml+=$(write_yaml_map 0 "files")
    for f in ${pkgfile}; do
        Yaml+=$(write_yaml_seq 2 "${f##*/}")
    done
    Yaml+=$(write_empty_line)
+    debug_pkg=$(print_debug_package_names)
+    Yaml+=$(write_yaml_map 0 "debug")
+    for d in ${debug_pkg}; do
+        Yaml+=$(write_yaml_seq 2 "${d##*/}")
+    done
+    Yaml+=$(write_empty_line)
 }

 write_srcyaml(){
@@ -122,16 +146,16 @@ write_srcyaml(){
    yaml_write_global
    yaml_write_package
    yaml_write_fileinfo
-    printf '%s' "${Yaml}"
+    printf '%s\n' "${Yaml}"
 }

 #}}}

 usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -d            Don't include details"
-    echo '    -h            This help'
-    echo ''
+    printf 'Usage: %s [options]\n' "${0##*/}"
+    printf '    -d            Do not include details\n'
+    printf '    -h            This help\n'
+    printf '\n'
    exit "$1"
 }

@@ -143,7 +167,6 @@ while getopts "${opts}" arg; do
    case "${arg}" in
        d) details=false ;;
        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
    esac
 done

@@ -152,10 +175,10 @@ shift $(( OPTIND - 1 ))
 srcpath=$(readlink -f "$1")

 [[ -f "$srcpath"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$srcpath"
-PACKAGE="$srcpath"/PKGBUILD; shift
+package="$srcpath"/PKGBUILD; shift

 # shellcheck disable=1090
-. "$PACKAGE"
+. "${package}"

 load_makepkg_config

--- a/bin/pkg/tidyarch.in
+++ b/bin/pkg/tidyarch.in
@@ -0,0 +1,202 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-20 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/repo.sh)
+
+git_rm() {
+    local r="$1"
+    if ! "$run_f"; then
+        printf "git rm -r %s\n" "$r"
+        printf "git commit -m 'remove %s'\n" "${r##*/}"
+    else
+        git rm -r  "$r"
+        git commit -m "remove ${r##*/}"
+    fi
+}
+
+compare_ver() {
+    local a="$1" b="$2" tree="$3" func="$4" va vb
+    # shellcheck disable=1090
+    source "$a"/PKGBUILD 2>/dev/null
+    va=$(get_full_version)
+    unset pkgver epoch pkgrel arch
+    # shellcheck disable=1090
+    source "$b"/PKGBUILD 2>/dev/null
+    vb=$(get_full_version)
+    unset pkgver epoch pkgrel arch
+    msg2 "a: %s b: %s" "$va" "$vb"
+    local ret
+    ret=$(vercmp "$va" "$vb")
+    msg2 "ret: %s" "$ret"
+    if [ "$ret" -gt 0 ]; then
+        git_rm "$b"
+    elif [ "$ret" -lt 0 ]; then
+        git_rm "$a"
+    else
+        case "$tree" in
+            "${ARCH_TREE[0]}") git_rm "$a" ;;
+            "${ARCH_TREE[1]}") git_rm "$b" ;;
+        esac
+    fi
+}
+
+check_duplicates() {
+    mapfile -t duplicates < <(find "${TREE_DIR_ARCH}" -mindepth 2 -maxdepth 2 -type d -not -path "*.git" -printf '%f\n' | sort | uniq -d)
+
+    for p in "${duplicates[@]}"; do
+        msg "%s" "$p"
+        local av bv a b
+
+        a="${TREE_DIR_ARCH}/${ARCH_TREE[0]}"
+        # shellcheck disable=1090
+        source "$a/$p"/trunk/PKGBUILD 2>/dev/null
+        av=$(get_full_version)
+
+        b="${TREE_DIR_ARCH}/${ARCH_TREE[1]}"
+        # shellcheck disable=1090
+        source "$b/$p"/trunk/PKGBUILD 2>/dev/null
+        bv=$(get_full_version)
+
+        msg2 "a: %s b: %s" "$av" "$bv"
+        ret=$(vercmp "$av" "$bv")
+        msg2 "ret: %s" "$ret"
+
+        if [ "$ret" -gt 0 ]; then
+            cd "$b"
+            msg2 "%s" "${b##*/}"
+            git_rm "$p"
+        elif [ "$ret" -lt 0 ]; then
+            cd "$a"
+            msg2 "%s" "${a##*/}"
+            git_rm "$p"
+        fi
+    done
+}
+# git config core.mergeoptions --no-edit
+check_tree() {
+    for tree in "${ARCH_TREE[@]}"; do
+        cd "${TREE_DIR_ARCH}/$tree" || exit
+
+        mapfile -t pkgs < <(find . -mindepth 2 -maxdepth 2 -type d -name repos | sort)
+
+        for p in "${pkgs[@]}"; do
+
+            mapfile -t repos < <(find "$p" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort)
+
+            local repos_dir=$p
+            p=${p%/*}
+            p=${p##*/}
+            local size=${#repos[@]}
+
+            if (( "$size" > 1 )); then
+                if [[ "${repos[1]}" != "${valid_names[11]}"-* ]] || [[ "${repos[1]}" != "${valid_names[12]}"-* ]]; then
+
+                    local a="$repos_dir/${repos[0]}" b="$repos_dir/${repos[1]}"
+
+                    # repo mismatches
+                    if [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[1]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[7]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[4]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[0]}"-* ]] && [[ "${repos[1]}" == "${valid_names[1]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[0]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[3]}"-* ]] && [[ "${repos[1]}" == "${valid_names[7]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[3]}"-* ]] && [[ "${repos[1]}" == "${valid_names[4]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+                    fi
+
+                    # same repo name but different arch
+                    if [[ "${repos[0]}" == "${valid_names[0]}"-any ]] && [[ "${repos[1]}" == "${valid_names[0]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[1]}"-any ]] && [[ "${repos[1]}" == "${valid_names[1]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-any ]] && [[ "${repos[1]}" == "${valid_names[2]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+                    fi
+                fi
+            fi
+        done
+    done
+}
+
+usage() {
+    printf 'Usage: %s\n' "${0##*/}"
+    printf '    -f                 Apply filter\n'
+    printf '    -r                 Run removal\n'
+    printf '    -d                 Check for duplicates\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+load_makepkg_config
+
+load_valid_names
+
+filter=false
+dupl=false
+run_f=false
+
+opts='hrfd'
+
+while getopts ${opts} arg; do
+    case "${arg}" in
+        f) filter=true ;;
+        r) run_f=true ;;
+        d) dupl=true ;;
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+"$filter" && check_tree
+
+"$dupl" && check_duplicates
--- a/data/conf/artools-iso.conf
+++ b/data/conf/artools-iso.conf
@@ -8,8 +8,14 @@
 # the dist release; default: auto
 # ISO_VERSION=$(date +%Y%m%d)

-# possible values: openrc, runit, s6
+# possible values: openrc, runit, s6, suite66, dinit
 # INITSYS="openrc"

 # gpg key; leave empty or commented to skip img signing
 # GPG_KEY=""
+
+# possible values: zstd (default), xz
+# COMPRESSION="zstd"
+
+# zstd only: range 1..22
+# COMPRESSION_LEVEL=15
--- a/data/conf/artools-pkg.conf
+++ b/data/conf/artools-pkg.conf
@@ -10,25 +10,38 @@
 # customize buildtree; uncomment to include
 # TREE_NAMES_ARTIX=(
 #         packages-kernel
+#         packages-llvm
 #         packages-openrc
 #         packages-runit
 #         packages-s6
-#         packages-python
+#         packages-suite66
+#         packages-dinit
 #         packages-perl
 #         packages-java
 #         packages-ruby
-#         packages-kf5
+#         packages-gtk
+#         packages-qt5
+#         packages-qt6
+#         packages-xorg
 #         packages-plasma
 #         packages-kde
 #         packages-gnome
 #         packages-cinnamon
 #         packages-lxqt
+#         packages-lxde
 #         packages-mate
 #         packages-xfce
 #         packages-wm
 #         packages-devel
-#         packages-lib32
 #         packages-qt6
+#         packages-office
+#         packages-misc
+#         python-world
+#         python-galaxy
+#         python-galaxy-groups
+#         python-misc
+#         packages-python
+#         packages-lib32
 # )

 # TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
@@ -38,3 +51,9 @@

 # default mirror for checkrepo
 # REPOS_MIRROR="http://mirror1.artixlinux.org/repos"
+
+# enable if trouble with default github arch mirror
+# ARCH_TREE=(packages community)
+
+# enable if trouble with default github arch mirror
+# HOST_TREE_ARCH='https://git.archlinux.org/svntogit'
--- a/data/pacman/makepkg.conf
+++ b/data/pacman/makepkg.conf
@@ -11,10 +11,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
-          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
          'rsync::/usr/bin/rsync --no-motd -z %u %o'
          'scp::/usr/bin/scp -C %u %o')

@@ -26,6 +26,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
 VCSCLIENTS=('bzr::bzr'
+            'fossil::fossil'
            'git::git'
            'hg::mercurial'
            'svn::subversion')
@@ -38,21 +39,25 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"

 #-- Compiler and Linker Flags
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+#CPPFLAGS=""
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -fstack-clash-protection -fcf-protection"
+CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
-DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CFLAGS="-g"
+DEBUG_CXXFLAGS="-g"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"

 #########################################################################
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -75,7 +80,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -86,11 +91,12 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
+#-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)

-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(md5)
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
+INTEGRITY_CHECK=(sha256)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
 #-- Options to be used when stripping shared libraries. See `man strip' for details.
@@ -146,4 +152,10 @@ COMPRESSLZ=(lzip -c -f)
 PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'

+#########################################################################
+# OTHER
+#########################################################################
+#
+#-- Command used to run pacman as root, instead of trying sudo and su
+#PACMAN_AUTH=()
 # vim: set ft=sh ts=2 sw=2 et:
--- a/data/pacman/pacman-default.conf
+++ b/data/pacman/pacman-default.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
@@ -83,15 +85,6 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist

-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32-gremlins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32]
-#Include = /etc/pacman.d/mirrorlist
-
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
--- a/data/pacman/pacman-docker.conf
+++ b/data/pacman/pacman-docker.conf
@@ -38,10 +38,11 @@ NoExtract  = usr/share/vim/vim*/lang/*
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
-
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -51,7 +52,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
@@ -96,16 +97,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-#[extra]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[community]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-gnome-wobble.conf
+++ b/data/pacman/pacman-gnome-wobble.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
@@ -92,18 +94,6 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist

-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32-goblins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32-gremlins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32]
-#Include = /etc/pacman.d/mirrorlist
-
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
--- a/data/pacman/pacman-goblins.conf
+++ b/data/pacman/pacman-goblins.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
@@ -89,18 +91,6 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist

-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32-goblins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32-gremlins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32]
-#Include = /etc/pacman.d/mirrorlist
-
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
--- a/data/pacman/pacman-gremlins.conf
+++ b/data/pacman/pacman-gremlins.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
@@ -83,15 +85,6 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist

-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32-gremlins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32]
-#Include = /etc/pacman.d/mirrorlist
-
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
--- a/data/pacman/pacman-kde-wobble.conf
+++ b/data/pacman/pacman-kde-wobble.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
@@ -92,18 +94,6 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist

-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32-goblins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32-gremlins]
-#Include = /etc/pacman.d/mirrorlist
-
-#[lib32]
-#Include = /etc/pacman.d/mirrorlist
-
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
--- a/data/pacman/pacman-lib32-goblins.conf
+++ b/data/pacman/pacman-lib32-goblins.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
--- a/data/pacman/pacman-lib32-gremlins.conf
+++ b/data/pacman/pacman-lib32-gremlins.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
--- a/data/pacman/pacman-lib32.conf
+++ b/data/pacman/pacman-lib32.conf
@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
+ParallelDownloads = 5

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional

 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux artix`.
+# packagers with `pacman-key --populate artix`.

 #
 # REPOSITORIES
--- a/initcpio/Makefile
+++ b/initcpio/Makefile
@@ -1,23 +0,0 @@
-DIRMODE = -dm0755
-MODE =  -m0755
-
-CPIOHOOKS = \
-	$(wildcard hooks/*)
-
-CPIOINST = \
-	$(wildcard install/*)
-
-SCRIPT = \
-	$(wildcard script/*)
-
-install_initcpio:
-	install $(DIRMODE) $(DESTDIR)$(CPIODIR)/hooks
-	install $(MODE) $(CPIOHOOKS) $(DESTDIR)$(CPIODIR)/hooks
-
-	install $(DIRMODE) $(DESTDIR)$(CPIODIR)/install
-	install $(MODE) $(CPIOINST) $(DESTDIR)$(CPIODIR)/install
-	install $(MODE) $(SCRIPT) $(DESTDIR)$(CPIODIR)
-
-install: install_initcpio
-
-.PHONY: install
--- a/initcpio/hooks/artix
+++ b/initcpio/hooks/artix
@@ -1,275 +0,0 @@
-# args: source, newroot, mountpoint
-_mnt_dmsnapshot() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}";
-    local img_name="${img_fullname%%.*}"
-    local dm_snap_name="${dm_snap_prefix}_${img_name}"
-    local ro_dev ro_dev_size rw_dev
-
-    ro_dev=$(losetup --find --show --read-only "${img}")
-    echo ${ro_dev} >> ${live_root}/used_block_devices
-    ro_dev_size=$(blockdev --getsz ${ro_dev})
-
-    if [[ "${cow_persistent}" == "P" ]]; then
-        if [[ -f "${cow}/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '${cow}/${cow_directory}/${img_name}.cow', using as persistent."
-        else
-            msg ":: Creating '${cow}/${cow_directory}/${img_name}.cow' as persistent."
-            truncate -s "${cow_spacesize}" "${cow}/${cow_directory}/${img_name}.cow"
-        fi
-    else
-        if [[ -f "${cow}/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '${cow}/${cow_directory}/${img_name}.cow' but non-persistent requested, removing."
-            rm -f "${cow}/${cow_directory}/${img_name}.cow"
-        fi
-        msg ":: Creating '${cow}/${cow_directory}/${img_name}.cow' as non-persistent."
-        truncate -s "${cow_spacesize}" "${cow}/${cow_directory}/${img_name}.cow"
-    fi
-
-    rw_dev=$(losetup --find --show "${cow}/${cow_directory}/${img_name}.cow")
-    echo ${rw_dev} >> ${live_root}/used_block_devices
-
-    dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
-
-    if [[ "${cow_persistent}" != "P" ]]; then
-        rm -f "${cow}/${cow_directory}/${img_name}.cow"
-    fi
-
-    _mnt_dev "/dev/mapper/${dm_snap_name}" "${mnt}" "-w" "defaults"
-    echo $(readlink -f /dev/mapper/${dm_snap_name}) >> ${live_root}/used_block_devices
-}
-
-# args: source, newroot, mountpoint
-_mnt_overlayfs() {
-    local src="${1}"
-    local newroot="${2}"
-    local mnt="${3}"
-    local work_dir="${overlay_root}/work"
-    local upper_dir="${overlay_root}/upper"
-
-    mkdir -p "${upper_dir}" "${work_dir}"
-
-    mount -t overlay overlay -o lowerdir="${src}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
-}
-
-# args: /path/to/image_file, mountpoint
-_mnt_sfs() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}"
-    local sfs_dev
-    local oper=$( [[ -n "${ip}" && -n "${miso_http_srv}" ]] && echo "mv" || echo "cp" )
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg -n ":: Copying squashfs image to RAM..."
-        if ! "${oper}" "${img}" "${cp2ram}/${img_fullname}" ; then
-            echo "ERROR: while copy '${img}' to '${cp2ram}/${img_fullname}'"
-            launch_interactive_shell
-        fi
-        img="${cp2ram}/${img_fullname}"
-        msg "done."
-    fi
-    sfs_dev=$(losetup --find --show --read-only "${img}")
-    echo ${sfs_dev} >> ${live_root}/used_block_devices
-    _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
-}
-
-# args: device, mountpoint, flags, opts
-_mnt_dev() {
-    local dev="${1}"
-    local mnt="${2}"
-    local flg="${3}"
-    local opts="${4}"
-
-    mkdir -p "${mnt}"
-
-    msg ":: Mounting '${dev}' to '${mnt}'"
-
-    while ! poll_device "${dev}" 30; do
-        echo "ERROR: '${dev}' device did not show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
-        msg ":: Device '${dev}' mounted successfully."
-    else
-        echo "ERROR; Failed to mount '${dev}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-_verify_checksum() {
-    local _status
-    cd "${bootmnt}/${root}"
-    sha512sum -c $1.img.sha512 > /tmp/checksum.log 2>&1
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-_verify_signature() {
-    local _status
-    cd "${bootmnt}/${root}"
-    gpg --homedir /gpg --status-fd 1 --verify $1.img.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-run_hook() {
-    [[ -z "${copytoram_size}" ]] && copytoram_size="75%"
-    [[ -z "${root}" ]] && root="LiveOS"
-
-    [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="artix"
-    [[ -z "${artixdevice}" ]] && artixdevice="/dev/disk/by-label/${label}"
-    [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"
-    [[ -z "${overlay_root_size}" ]] && overlay_root_size="75%"
-
-    if [[ -n "${cow_label}" ]]; then
-        cow_device="/dev/disk/by-label/${cow_label}"
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    elif [[ -n "${cow_device}" ]]; then
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    else
-        cow_persistent="N"
-    fi
-
-    [[ -z "${cow_flags}" ]] && cow_flags="defaults"
-    [[ -z "${cow_directory}" ]] && cow_directory="persistent_${label}"
-    [[ -z "${cow_chunksize}" ]] && cow_chunksize="8"
-    [[ -z "${overlay}" ]] && overlay=""
-
-    lower_dir=''
-    live_root="/run/artix"
-    bootmnt="${live_root}/bootmnt"
-    overlay_root="${live_root}/overlay_root"
-    cow="${live_root}/cowspace"
-    cp2ram="${live_root}/copytoram"
-
-    # set mount handler for artix
-    mount_handler="artix_mount_handler"
-}
-
-_check_sum() {
-    local fs="${1}"
-    if [[ -f "${bootmnt}/${root}/${fs}.img" ]]; then
-        if [[ -f "${bootmnt}/${root}/${fs}.img.md5" ]]; then
-            msg -n ":: Self-test requested, please wait..."
-            if _verify_checksum "${fs}"; then
-                msg "done. Checksum is OK, continue booting."
-            else
-                echo "ERROR: one or more files are corrupted"
-                echo "see /tmp/checksum.log for details"
-                launch_interactive_shell
-            fi
-        else
-            echo "ERROR: checksum=y option specified but ${root}/${fs}.img.md5 not found"
-            launch_interactive_shell
-        fi
-    fi
-}
-
-_check_sig() {
-    local fs="${1}"
-    if [[ -f "${bootmnt}/${root}/${fs}.img" ]]; then
-        if [[ -f "${bootmnt}/${root}/${fs}.img.sig" ]]; then
-            msg -n ":: Signature verification requested, please wait..."
-            if _verify_signature "${fs}"; then
-                msg "done. Signature is OK, continue booting."
-            else
-                echo "ERROR: one or more files are corrupted"
-                launch_interactive_shell
-            fi
-        else
-            echo "ERROR: verify=y option specified but ${root}/${fs}.img.sig not found"
-            launch_interactive_shell
-        fi
-    fi
-}
-
-_gen_arg() {
-    local arg="${1}"
-    echo "${lower_dir:-}${lower_dir:+:}${arg}"
-}
-
-_mount_root_overlayfs() {
-    local sfs="${1}"
-    local src="${bootmnt}/${root}"
-    local dest_sfs="${live_root}/sfs"
-    local dest_img="${live_root}/img"
-
-    if [[ -f "${src}/${sfs}.img" ]]; then
-        _mnt_sfs "${src}/${sfs}.img" "${dest_sfs}/${sfs}"
-        local find_img="${dest_sfs}/${sfs}/LiveOS/${sfs}.img"
-        if [[ -f "${find_img}" ]]; then
-            mkdir -p ${dest_img}
-            lower_dir=$(_gen_arg "${dest_img}/${sfs}")
-            _mnt_dmsnapshot "${find_img}" "${dest_img}/${sfs}"
-        else
-            lower_dir=$(_gen_arg "${dest_sfs}/${sfs}")
-        fi
-    fi
-}
-
-# This function is called normally from init script, but it can be called
-# as chain from other mount handlers.
-# args: /path/to/newroot
-artix_mount_handler() {
-    local newroot="${1}"
-
-    if ! mountpoint -q "${bootmnt}"; then
-        _mnt_dev "${artixdevice}" "${bootmnt}" "-r" "defaults"
-        if [[ "${copytoram}" != "y" ]]; then
-            echo $(readlink -f ${artixdevice}) >> ${live_root}/used_block_devices
-        fi
-    fi
-
-    if [[ "${checksum}" == "y" ]]; then
-        _check_sum "rootfs"
-        [[ -n "${overlay}" ]] && _check_sum "${overlay}"
-    fi
-
-    if [[ "${verify}" == "y" ]]; then
-        _check_sig "rootfs"
-        [[ -n "${overlay}" ]] && _check_sig "${overlay}"
-    fi
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Mounting ${cp2ram} (tmpfs) filesystem, size=${copytoram_size}"
-        mkdir -p ${cp2ram}
-        mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram ${cp2ram}
-    fi
-
-    if [[ -n "${cow_device}" ]]; then
-        _mnt_dev "${cow_device}" "${cow}" "-r" "${cow_flags}"
-        echo $(readlink -f ${cow_device}) >> ${live_root}/used_block_devices
-        mount -o remount,rw "${cow}"
-    else
-        msg ":: Mounting ${cow} (tmpfs) filesystem, size=${cow_spacesize}..."
-        mkdir -p ${cow}
-        mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace ${cow}
-    fi
-    mkdir -p -m 0700 "${cow}/${cow_directory}"
-
-    msg -n ":: Mounting overlay root (tmpfs) filesystem, size=${overlay_root_size}..."
-    mkdir -p ${overlay_root}
-    mount -t tmpfs -o "size=${overlay_root_size}",mode=0755 overlay_root ${overlay_root}
-
-    [[ -n "${overlay}" ]] && _mount_root_overlayfs "${overlay}"
-    _mount_root_overlayfs "rootfs"
-
-    _mnt_overlayfs "${lower_dir}" "${newroot}" "/"
-
-    if [[ "${copytoram}" == "y" ]]; then
-        umount -d ${bootmnt}
-        mkdir -p ${bootmnt}/${root}
-        mount -o bind ${cp2ram} ${bootmnt}/${root}
-    fi
-}
-
-# vim:ft=sh:ts=4:sw=4:et:
--- a/initcpio/hooks/artix_loop_mnt
+++ b/initcpio/hooks/artix_loop_mnt
@@ -1,35 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}"
-    [[ -z "${img_flags}" ]] && img_flags="defaults"
-    if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then
-        mount_handler="artix_loop_mount_handler"
-    fi
-}
-
-artix_loop_mount_handler () {
-    newroot="${1}"
-
-    local _dev_loop
-
-    msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
-    _mnt_dev "${img_dev}" "${live_root}/img_dev" "-r" "${img_flags}"
-    if [[ "${copytoram}" != "y" ]]; then
-        echo $(readlink -f ${img_dev}) >> ${live_root}/used_block_devices
-    fi
-
-    if _dev_loop=$(losetup --find --show --read-only "${live_root}/img_dev/${img_loop}"); then
-        artixdevice="${_dev_loop}"
-    else
-        echo "ERROR: Setting loopback device for file '${live_root}/img_dev/${img_loop}'"
-        launch_interactive_shell
-    fi
-
-    artix_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        losetup -d ${_dev_loop} 2>/dev/null
-        umount ${live_root}/img_dev
-    fi
-}
--- a/initcpio/hooks/artix_pxe_common
+++ b/initcpio/hooks/artix_pxe_common
@@ -1,72 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    # Do *not* declare 'bootif_dev' local! We need it in run_latehook().
-    local i net_mac bootif_mac
-    # These variables will be parsed from /tmp/net-*.conf generated by ipconfig
-    local DEVICE
-    local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
-    local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH
-    local filename
-    # /tmp/net-*.conf
-
-    if [[ -n "${ip}" ]]; then
-        if [[ -n "${BOOTIF}" ]]; then
-            bootif_mac=${BOOTIF#01-}
-            bootif_mac=${bootif_mac//-/:}
-            for i in /sys/class/net/*/address; do
-                read net_mac < ${i}
-                if [[ "${bootif_mac}" == "${net_mac}" ]]; then
-                    bootif_dev=${i#/sys/class/net/}
-                    bootif_dev=${bootif_dev%/address}
-                    break
-                fi
-            done
-            if [[ "${ip}" == "dhcp" ]]; then
-               ip=":::::${bootif_dev}:dhcp"
-            else
-               ip="${ip}::${bootif_dev}"
-           fi
-        fi
-
-        # setup network and save some values
-        if ! ipconfig -t 20 "ip=${ip}"; then
-                echo "ERROR; Failed to configure network"
-                echo "   Falling back to interactive prompt"
-                echo "   You can try to fix the problem manually, log out when you are finished"
-                launch_interactive_shell
-        fi
-
-        . /tmp/net-*.conf
-
-        pxeserver=${ROOTSERVER}
-
-        # setup DNS resolver
-        if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then
-            echo "# added by artix_pxe_common hook" > /etc/resolv.conf
-            echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf
-        fi
-        if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then
-            echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf
-        fi
-        if [[ -n "${DNSDOMAIN}" ]]; then
-            echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
-            echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf
-        fi
-    fi
-}
-
-run_latehook () {
-    if [[ -n "${ip}" ]]; then
-        [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
-
-        if [[ "${copytoram}" == "y" ]]; then
-            if [[ -n "${bootif_dev}" ]]; then
-                ip addr flush dev "${bootif_dev}"
-                ip link set "${bootif_dev}" down
-            fi
-        elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
-            cp /etc/resolv.conf /new_root/etc/resolv.conf
-        fi
-    fi
-}
--- a/initcpio/hooks/artix_pxe_http
+++ b/initcpio/hooks/artix_pxe_http
@@ -1,63 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${artix_http_srv}" ]]; then
-
-        # booting with http is always copy-to-ram, so set here to make sure
-        # addresses are flushed and interface is set down
-        copytoram="y"
-
-        artix_http_srv=$(eval echo ${artix_http_srv})
-        [[ -z "${artix_http_spc}" ]] && artix_http_spc="75%"
-
-        mount_handler="artix_pxe_http_mount_handler"
-    fi
-}
-
-# Fetch a file with CURL
-#
-# $1 URL
-# $2 Destination directory inside httpspace/${root}
-_curl_get() {
-    local _url="${1}"
-    local _dst="${2}"
-
-    msg ":: Downloading '${_url}'"
-    if ! curl -L -f -o "${live_root}/httpspace/${root}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
-        echo "ERROR: Downloading '${_url}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-_get_sfs() {
-    local _sfs="${2}"
-    local _src=${artix_http_srv}${root}
-    if [[ ! -z "$( curl -s --head "${_src}/${_sfs}.img" | grep "OK" )" ]]; then
-        _curl_get "${_src}/${_sfs}.img" "/"
-
-        if [[ "${checksum}" == "y" ]]; then
-            _curl_get "${_src}/${_sfs}.md5" "/"
-        fi
-        if [[ "${verify}" == "y" ]]; then
-            _curl_get "${_src}/${_sfs}.img.sig" "/"
-        fi
-    fi
-}
-
-artix_pxe_http_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Mounting ${live_root}/httpspace (tmpfs) filesystem, size='${artix_http_spc}'"
-    mkdir -p "${live_root}/httpspace"
-    mount -t tmpfs -o size="${artix_http_spc}",mode=0755 httpspace "${live_root}/httpspace"
-
-    _get_sfs "rootfs"
-    [[ -n "${overlay}" ]] && _mount_root_overlayfs "${overlay}"
-
-    mkdir -p "${bootmnt}"
-    mount -o bind ${live_root}/httpspace ${bootmnt}
-
-    artix_mount_handler ${newroot}
-}
--- a/initcpio/hooks/artix_pxe_nbd
+++ b/initcpio/hooks/artix_pxe_nbd
@@ -1,47 +0,0 @@
-# vim: set ft=sh:
-
-run_earlyhook() {
-    if [[ -n "${ip}" && -n "${artix_nbd_srv}" ]]; then
-        # Module autoloading like with loop devices does not work, doing manually...
-        modprobe nbd 2> /dev/null
-    fi
-}
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${artix_nbd_srv}" ]]; then
-
-        artix_nbd_srv=$(eval echo ${artix_nbd_srv})
-        [[ -z "${artix_nbd_name}" ]] && artix_nbd_name="artix"
-
-        mount_handler="artix_pxe_nbd_mount_handler"
-    fi
-}
-
-artix_pxe_nbd_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Waiting for boot device..."
-    while ! poll_device /dev/nbd0 30; do
-        echo "ERROR: boot device didn't show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    msg ":: Setup NBD from ${artix_nbd_srv} at /dev/nbd0"
-    if [[ "${copytoram}" != "n" ]]; then
-        nbd-client ${artix_nbd_srv} -N ${artix_nbd_name} /dev/nbd0
-        copytoram="y"
-    else
-        nbd-client ${artix_nbd_srv} -N ${artix_nbd_name} -persist /dev/nbd0
-    fi
-
-    artixdevice=/dev/nbd0
-
-    artix_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Disconnect NBD from ${artix_nbd_srv} at /dev/nbd0"
-        nbd-client -d /dev/nbd0
-    fi
-}
--- a/initcpio/hooks/artix_pxe_nfs
+++ b/initcpio/hooks/artix_pxe_nfs
@@ -1,30 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${artix_nfs_srv}" ]]; then
-
-        artix_nfs_srv=$(eval echo ${artix_nfs_srv})
-        [[ -n "${artix_nfs_opt}" ]] && artix_nfs_opt="-o ${artix_nfs_opt}"
-
-        mount_handler="artix_nfs_mount_handler"
-    fi
-}
-
-artix_nfs_mount_handler() {
-    newroot="${1}"
-    mkdir -p "${bootmnt}"
-    msg ":: Mounting '${artix_nfs_srv}'"
-    # Do not put "${artix_nfs_opt}" nfsmount fails!
-    if ! nfsmount ${artix_nfs_opt} "${artix_nfs_srv}" "${bootmnt}"; then
-        echo "ERROR: Mounting '${artix_nfs_srv}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-
-    if [[ "${copytoram}" != "n" ]]; then
-        copytoram="y"
-    fi
-
-    artix_mount_handler ${newroot}
-}
--- a/initcpio/hooks/artix_shutdown
+++ b/initcpio/hooks/artix_shutdown
@@ -1,6 +0,0 @@
-run_cleanuphook() {
-    rm -rf /usr/lib/modules
-    cp -ax / /run/initramfs
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/install/artix
+++ b/initcpio/install/artix
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "cdrom"
-    add_module "loop"
-    add_module "dm-snapshot"
-    add_module "overlay"
-
-    add_runscript
-
-    add_binary /usr/lib/udev/cdrom_id
-    add_binary blockdev
-    add_binary dmsetup
-    add_binary losetup
-    add_binary mountpoint
-    add_binary truncate
-    add_binary gpg
-    add_binary grep
-
-    add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
-    add_file /usr/lib/udev/rules.d/10-dm.rules
-    add_file /usr/lib/udev/rules.d/95-dm-notify.rules
-    add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
-    if [[ $ARTIX_GNUPG_FD ]]; then
-        mkdir -p "$BUILDROOT$dest"/gpg
-        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$ARTIX_GNUPG_FD
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/install/artix_kms
+++ b/initcpio/install/artix_kms
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "radeon"
-    add_module "nouveau"
-    add_module "i915"
-    add_module "via-agp"
-    add_module "sis-agp"
-    add_module "intel-agp"
-}
-
-help() {
-    cat << HELPEOF
-Adds all common KMS drivers to the initramfs image.
-HELPEOF
-}
--- a/initcpio/install/artix_loop_mnt
+++ b/initcpio/install/artix_loop_mnt
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via loop device.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/install/artix_pxe_common
+++ b/initcpio/install/artix_pxe_common
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig
-
-    # Add hosts support files+dns
-    add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_files.so.2)
-    add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_dns.so.2)
-
-    add_dir /etc
-    echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/install/artix_pxe_http
+++ b/initcpio/install/artix_pxe_http
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-
-    add_binary curl
-
-    add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and HTTP.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/install/artix_pxe_nbd
+++ b/initcpio/install/artix_pxe_nbd
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nbd"
-
-    add_runscript
-
-    add_binary nbd-client
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NBD.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/install/artix_pxe_nfs
+++ b/initcpio/install/artix_pxe_nfs
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nfs"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/nfsmount /bin/nfsmount
-}
-
-help() {
-    cat <<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NFS.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/install/artix_shutdown
+++ b/initcpio/install/artix_shutdown
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary cp
-
-    add_runscript
-
-    add_file /etc/initcpio/artix_shutdown /shutdown
-}
-
-help() {
-    cat <<HELPEOF
-This hook will create a shutdown initramfs in /run/initramfs
-that we can pivot to on shutdown in order to unmount / and
-and others mount points, dm-snapshot devices and loopback devices.
-Mostly usefull for dm-snapshot persistent.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
--- a/initcpio/script/artix_shutdown
+++ b/initcpio/script/artix_shutdown
@@ -1,37 +0,0 @@
-#!/bin/ash
-
-# /oldroot depends on things inside /oldroot/run/artix...
-mkdir /oldrun
-mount -n --move /oldroot/run /oldrun
-
-# Unmount all mounts now.
-umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)
-
-# Remove all dm-snapshot devices.
-dmsetup remove_all
-
-# Remove all loopback devices.
-for _lup in $(grep ^/dev/loop /oldrun/artix/used_block_devices | tac); do
-    if ! losetup -d ${_lup} 2> /dev/null; then
-        umount -d ${_lup}
-    fi
-done
-
-# Unmount the space used to store *.cow.
-umount /oldrun/artix/cowspace
-
-# Unmount boot device if needed (no copytoram=y used)
-if [[ ! -d /oldrun/artix/copytoram ]]; then
-    if [[ -d /oldrun/artix/img_dev ]]; then
-        umount /oldrun/artix/img_dev
-    else
-        umount /oldrun/bootmnt
-    fi
-fi
-
-# reboot / poweroff / halt, depending on the argument passed by init
-# if something invalid is passed, we halt
-case "$1" in
-  reboot|poweroff|halt) "$1" -f ;;
-  *) halt -f;;
-esac
--- a/lib/base/chroot-version.sh
+++ b/lib/base/chroot-version.sh
@@ -0,0 +1,3 @@
+#!/hint/bash
+
+CHROOTVERSION=0.10
--- a/lib/base/chroot.sh
+++ b/lib/base/chroot.sh
@@ -2,8 +2,6 @@

 #{{{ chroot

-CHROOTVERSION=0.10
-
 orig_argv=("$0" "$@")
 check_root() {
    local keepenv="$1"
--- a/lib/base/message.sh
+++ b/lib/base/message.sh
@@ -14,15 +14,10 @@ shopt -s extglob
 if [[ -t 2 && "$TERM" != dumb ]]; then
    colorize
 else
+    # shellcheck disable=2034
    declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi

-info() {
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
 stat_busy() {
    local mesg=$1; shift
    # shellcheck disable=2059
--- a/lib/base/mount.sh
+++ b/lib/base/mount.sh
@@ -13,7 +13,7 @@ trap_setup(){
 }

 chroot_mount() {
-#     info "mount: [%s]" "$2"
+#     msg2 "mount: [%s]" "$2"
    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
 }

@@ -75,7 +75,7 @@ chroot_api_mount() {

 chroot_api_umount() {
    if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
-#         info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+#         msg2 "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
        umount "${CHROOT_ACTIVE_MOUNTS[@]}"
    fi
    unset CHROOT_ACTIVE_MOUNTS
--- a/lib/base/yaml.sh
+++ b/lib/base/yaml.sh
@@ -3,11 +3,11 @@
 #{{{ yaml

 write_yaml_header(){
-    printf '%s' '---'
+    printf '%s\n' '---'
 }

 write_empty_line(){
-    printf '\n%s\n' ' '
+    printf '\n'
 }

 write_yaml_map(){
--- a/lib/iso/calamares.sh
+++ b/lib/iso/calamares.sh
@@ -2,30 +2,6 @@

 #{{{ calamares

-write_users_conf(){
-    local yaml
-    yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 'defaultGroups')
-    local IFS=','
-    for g in "${ADDGROUPS[@]}"; do
-        yaml+=$(write_yaml_seq 2 "$g")
-    done
-    unset IFS
-    yaml+=$(write_yaml_map 0 'autologinGroup' 'autologin')
-    yaml+=$(write_yaml_map 0 'doAutologin' 'false')
-    yaml+=$(write_yaml_map 0 'sudoersGroup' 'wheel')
-    yaml+=$(write_yaml_map 0 'setRootPassword' 'true')
-    yaml+=$(write_yaml_map 0 'availableShells' '/bin/bash, /bin/zsh')
-#     yaml+=$(write_yaml_map 0 'passwordRequirements')
-#     yaml+=$(write_yaml_map 2 'minLength' '-1')
-#     yaml+=$(write_yaml_map 2 'maxLength' '-1')
-#     yaml+=$(write_yaml_map 2 'libpwquality')
-#     yaml+=$(write_yaml_seq 4 "minlen=8")
-#     yaml+=$(write_yaml_seq 4 "minclass=80")
-    yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
-}
-
 write_services_conf(){
    local key1="$1" val1="$2" key2="$3" val2="$4"
    local yaml
@@ -37,7 +13,7 @@ write_services_conf(){
        yaml+=$(write_yaml_seq 2 "$svc")
    done
    yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
+    printf '%s\n' "${yaml}"
 }

 write_services_openrc_conf(){
@@ -53,43 +29,24 @@ write_services_runit_conf(){
 write_services_s6_conf(){
    local conf="$1"/services-s6.conf
    write_services_conf 'svDir' '/etc/s6/sv' 'dbDir' '/etc/s6/rc/compiled' > "$conf"
+    printf '%s\n' "defaultBundle: default" >> "$conf"
 }

-write_postcfg(){
-    local yaml
-    yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 'keyrings')
-    for k in archlinux artix;do
-        yaml+=$(write_yaml_seq 2 "$k")
-    done
-    yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
+write_services_suite66_conf(){
+    local conf="$1"/services-suite66.conf
+    write_services_conf 'svDir' '/etc/66/service' 'runsvDir' '/var/lib/66/system' > "$conf"
 }

-write_unpackfs() {
-    local yaml
-    yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 'unpack')
-#     if ${persist}; then
-#         yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
-#         yaml+=$(write_yaml_map 4 'sourcefs' '"ext4"')
-#     else
-    yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
-    yaml+=$(write_yaml_map 4 'sourcefs' '"squashfs"')
-#     fi
-    yaml+=$(write_yaml_map 4 'destination' '""')
-    yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
+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
-        msg2 "Configuring Calamares"
-        write_users_conf > "$mods"/users.conf
+        msg2 "Configuring: Calamares"
        write_services_"${INITSYS}"_conf "$mods"
-        write_postcfg > "$mods"/postcfg.conf
-        write_unpackfs > "$mods"/unpackfs.conf
        sed -e "s|services-openrc|services-${INITSYS}|" \
            -i "$1"/etc/calamares/settings.conf
    fi
--- a/lib/iso/config.sh
+++ b/lib/iso/config.sh
@@ -2,52 +2,27 @@

 #{{{ session

-configure_hosts(){
-    sed -e "s|localhost.localdomain|localhost.localdomain ${HOST_NAME}|" -i "$1"/etc/hosts
-}
-
-configure_logind(){
-    local conf=$1/etc/"$2"/logind.conf
-    if [[ -e "$conf" ]];then
-        msg2 "Configuring logind ..."
-        sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
-    fi
-}
-
 configure_services(){
    local mnt="$1"
-    info "Configuring [%s] services" "${INITSYS}"
-    add_svc_"${INITSYS}" "$mnt" "${SERVICES[*]} ${SERVICES_LIVE[*]}"
-    info "Done configuring [%s] services" "${INITSYS}"
+    add_svc_"${INITSYS}" "$mnt" "${SERVICES[*]}"
 }

-configure_system(){
-    local mnt="$1"
-    configure_logind "$mnt" "elogind"
-    echo "${HOST_NAME}" > "$mnt"/etc/hostname
-}

 write_live_session_conf(){
    local conf=''
    conf+=$(printf '%s\n' '# live session configuration')
    conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
-    conf+=$(printf "\nUSER_NAME=%s\n" "${USER_NAME}")
    conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
-    conf+=$(printf "\nADDGROUPS='%s'\n" "${ADDGROUPS}")
    printf '%s' "$conf"
 }

 configure_chroot(){
    local fs="$1"
    msg "Configuring [%s]" "${fs##*/}"
-    configure_hosts "$fs"
-    configure_system "$fs"
    configure_services "$fs"
    configure_calamares "$fs"
    [[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
-    msg2 "Writing live.conf"
+    msg2 "Writing: live.conf"
    write_live_session_conf > "$fs/etc/artools/live.conf"
    msg "Done configuring [%s]" "${fs##*/}"
 }
--- a/lib/iso/dracut.sh
+++ b/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
--- a/lib/iso/grub.sh
+++ b/lib/iso/grub.sh
@@ -2,20 +2,6 @@

 #{{{ grub

-configure_grub(){
-    msg "Configuring grub kernel options ..."
-    local ro_opts=()
-    local rw_opts=()
-    local kopts=("label=${iso_label}")
-
-    [[ "${profile}" != 'base' ]] && kopts+=('overlay=livefs')
-
-    sed -e "s|@kopts@|${kopts[*]}|" \
-        -e "s|@ro_opts@|${ro_opts[*]}|" \
-        -e "s|@rw_opts@|${rw_opts[*]}|" \
-        -i "${iso_root}"/boot/grub/kernels.cfg
-}
-
 prepare_grub(){
    local platform=i386-pc img='core.img' prefix=/boot/grub
    local lib="$1"/usr/lib/grub
@@ -23,7 +9,6 @@ prepare_grub(){
    local livecfg="$2"/usr/share/grub
    local grub=${iso_root}/boot/grub efi=${iso_root}/efi/boot

-
    prepare_dir "${grub}/${platform}"

    cp "${livecfg}"/cfg/*.cfg "${grub}"
--- a/lib/iso/initcpio.sh
+++ b/lib/iso/initcpio.sh
@@ -2,56 +2,71 @@

 #{{{ initcpio

-write_mkinitcpio_conf() {
-    msg2 "Writing mkinitcpio.conf ..."
-    local conf="$1/etc/mkinitcpio-artix.conf"
-    printf "%s\n" 'MODULES=(loop dm-snapshot)' > "$conf"
-    printf "%s\n" 'COMPRESSION="xz"' >> "$conf"
-    if [[ "${profile}" == 'base' ]];then
-        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
-                            artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs
-                            artix_kms modconf block filesystems keyboard keymap)' >> "$conf"
-    else
-        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
-                            artix_kms modconf block filesystems keyboard keymap)' >> "$conf"
+make_checksum(){
+    local file="$1"
+    msg2 "Creating md5sum ..."
+    cd "${iso_root}${live_dir}"
+    md5sum "$file" > "$file".md5
+    cd "${OLDPWD}"
+}
+
+make_sig () {
+    local file="$1"
+    msg2 "Creating signature file..."
+    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
+    su "${owner}" -c "gpg --detach-sign --output $file.sig --default-key ${GPG_KEY} $file"
+    chown "root:root" "${iso_root}${live_dir}"
+}
+
+export_gpg_publickey() {
+    key_export=${WORKSPACE_DIR}/pubkey.gpg
+    if [[ ! -e "${key_export}" ]]; then
+        gpg --batch --output "${key_export}" --export "${GPG_KEY}"
    fi
 }

-prepare_initcpio(){
-    msg2 "Copying initcpio ..."
-    local dest="$1"
-    cp /etc/initcpio/hooks/artix* "$dest"/etc/initcpio/hooks
-    cp /etc/initcpio/install/artix* "$dest"/etc/initcpio/install
-    cp /etc/initcpio/artix_shutdown "$dest"/etc/initcpio
-}
+prepare_initramfs_mkinitcpio() {
+    local mnt="$1" packages=() mkinitcpio_conf k

-prepare_initramfs(){
-    local mnt="$1"
+    mkinitcpio_conf=mkinitcpio-default.conf
+    [[ "${profile}" == 'base' ]] && mkinitcpio_conf=mkinitcpio-pxe.conf
+    k=$(<"$mnt"/usr/src/linux/version)

-    prepare_initcpio "$mnt"
+    read_from_list "${common_dir}/Packages-boot"
+    basestrap "${basestrap_args[@]}" "$mnt" "${packages[@]}"

-    write_mkinitcpio_conf "$mnt"
-
-    if [[ -n ${GPG_KEY} ]]; then
-        su "${owner}" -c "gpg --export ${GPG_KEY} >/tmp/GPG_KEY"
-        exec 17<>/tmp/GPG_KEY
+    if [[ -n "${GPG_KEY}" ]]; then
+        exec {ARTIX_GNUPG_FD}<>"${key_export}"
+        export ARTIX_GNUPG_FD
    fi
-    local _kernel
-     _kernel=$(<"$mnt"/usr/src/linux/version)
-    ARTIX_GNUPG_FD=${GPG_KEY:+17} artools-chroot "$mnt" \
-        /usr/bin/mkinitcpio -k "${_kernel}" \
-        -c /etc/mkinitcpio-artix.conf \
+
+    artix-chroot "$mnt" mkinitcpio -k "$k" \
+        -c /etc/"$mkinitcpio_conf" \
        -g /boot/initramfs.img

    if [[ -n "${GPG_KEY}" ]]; then
-        exec 17<&-
+        exec {ARTIX_GNUPG_FD}<&-
+        unset ARTIX_GNUPG_FD
    fi
-    if [[ -f /tmp/GPG_KEY ]]; then
-        rm /tmp/GPG_KEY
+    if [[ -f "${key_export}" ]]; then
+        rm "${key_export}"
    fi
-
    cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img
    prepare_boot_extras "$mnt"
 }

+configure_grub_mkinitcpio() {
+    msg "Configuring grub kernel options ..."
+    local ro_opts=()
+    local rw_opts=()
+    local kopts=("label=${iso_label}")
+
+    [[ "${profile}" != 'base' ]] && kopts+=('overlay=livefs')
+
+    sed -e "s|@kopts@|${kopts[*]}|" \
+        -e "s|@ro_opts@|${ro_opts[*]}|" \
+        -e "s|@rw_opts@|${rw_opts[*]}|" \
+        -i "${iso_root}"/boot/grub/kernels.cfg
+}
+
 #}}}
--- a/lib/iso/iso.sh
+++ b/lib/iso/iso.sh
@@ -5,13 +5,13 @@
 get_disturl(){
    # shellcheck disable=1091
    . /usr/lib/os-release
-    echo "${HOME_URL}"
+    printf "%s\n" "${HOME_URL}"
 }

 get_osname(){
    # shellcheck disable=1091
    . /usr/lib/os-release
-    echo "${NAME}"
+    printf "%s\n" "${NAME}"
 }

 assemble_iso(){
--- a/lib/iso/mount.sh
+++ b/lib/iso/mount.sh
@@ -3,7 +3,7 @@
 #{{{ mount

 track_img() {
-    info "mount: [%s]" "$2"
+    msg2 "mount: [%s]" "$2"
    mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
 }

@@ -15,7 +15,7 @@ mount_img() {

 umount_img() {
    if [[ -n "${IMG_ACTIVE_MOUNTS[*]}" ]];then
-        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
+        msg2 "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
        umount "${IMG_ACTIVE_MOUNTS[@]}"
        unset IMG_ACTIVE_MOUNTS
        rm -r "$1"
@@ -23,7 +23,7 @@ umount_img() {
 }

 track_fs() {
-    info "overlayfs mount: [%s]" "$5"
+    msg2 "overlayfs mount: [%s]" "$5"
    mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
 }

@@ -45,7 +45,7 @@ mount_overlayfs(){

 umount_overlayfs(){
    if [[ -n "${FS_ACTIVE_MOUNTS[*]}" ]];then
-        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
+        msg2 "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
        umount "${FS_ACTIVE_MOUNTS[@]}"
        unset FS_ACTIVE_MOUNTS
        rm -rf "${mnt_dir}/work"
--- a/lib/iso/profile.sh
+++ b/lib/iso/profile.sh
@@ -5,80 +5,82 @@
 show_profile(){
    msg2 "iso_file: %s" "${iso_file}"
    msg2 "AUTOLOGIN: %s" "${AUTOLOGIN}"
-    msg2 "HOST_NAME: %s" "${HOST_NAME}"
-    msg2 "USER_NAME: %s" "${USER_NAME}"
    msg2 "PASSWORD: %s" "${PASSWORD}"
-    msg2 "ADDGROUPS: %s" "${ADDGROUPS}"
-    msg2 "SERVICES_LIVE: %s" "${SERVICES_LIVE[*]}"
    msg2 "SERVICES: %s" "${SERVICES[*]}"
 }

 load_profile(){
    local profile_dir="${DATADIR}/iso-profiles"
-    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profile_dir=${WORKSPACE_DIR}/iso-profiles
+    [[ -d "${WORKSPACE_DIR}"/iso-profiles ]] && profile_dir="${WORKSPACE_DIR}"/iso-profiles

-    ROOT_LIST="$profile_dir/${profile}/Packages-Root"
-    ROOT_OVERLAY="$profile_dir/${profile}/root-overlay"
+    root_list="$profile_dir/${profile}/Packages-Root"
+    root_overlay="$profile_dir/${profile}/root-overlay"

-    [[ -f "$profile_dir/${profile}/Packages-Live" ]] && LIVE_LIST="$profile_dir/${profile}/Packages-Live"
-    [[ -d "$profile_dir/${profile}/live-overlay" ]] && LIVE_OVERLAY="$profile_dir/${profile}/live-overlay"
+    [[ -f "$profile_dir/${profile}/Packages-Live" ]] && live_list="$profile_dir/${profile}/Packages-Live"
+    [[ -d "$profile_dir/${profile}/live-overlay" ]] && live_overlay="$profile_dir/${profile}/live-overlay"
+
+    common_dir="${DATADIR}/iso-profiles/common"
+    [[ -d "$profile_dir"/common ]] && common_dir="${profile_dir}"/common

    [[ -f $profile_dir/${profile}/profile.conf ]] || return 1

    # shellcheck disable=1090
    [[ -r "$profile_dir/${profile}"/profile.conf ]] && . "$profile_dir/${profile}"/profile.conf

-    DISPLAYMANAGER=${DISPLAYMANAGER:-'none'}
-
-    AUTOLOGIN=${AUTOLOGIN:-"true"}
-    [[ ${DISPLAYMANAGER} == 'none' ]] && AUTOLOGIN="false"
-
-    HOST_NAME=${HOST_NAME:-'artix'}
-
-    USER_NAME=${USER_NAME:-'artix'}
+    AUTOLOGIN=${AUTOLOGIN:-true}

    PASSWORD=${PASSWORD:-'artix'}

-    ADDGROUPS=${ADDGROUPS:-"video,power,optical,network,lp,scanner,wheel,users,log"}
-
    if [[ -z "${SERVICES[*]}" ]];then
        SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
    fi

-    if [[ ${DISPLAYMANAGER} != "none" ]];then
-        case "${INITSYS}" in
-            'openrc') SERVICES+=('xdm') ;;
-            'runit'|'s6') SERVICES+=("${DISPLAYMANAGER}") ;;
-        esac
-    fi
-
-    SERVICES_LIVE=('artix-live' 'pacman-init')
-
    return 0
 }

-load_pkgs(){
-    local pkglist="$1" init="$2"
-    info "Loading Packages: [%s] ..." "${pkglist##*/}"
+read_from_list() {
+    local list="$1"
+    local _space="s| ||g"
+    local _clean=':a;N;$!ba;s/\n/ /g'
+    local _com_rm="s|#.*||g"

-    local _init="s|@$init||g" _init_rm1 _init_rm2
-    case "$init" in
-        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6.*||g" ;;
-        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
-        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
-    esac
+    local _init="s|@initsys@|${INITSYS}|g"

-    local _space="s| ||g" \
-        _clean=':a;N;$!ba;s/\n/ /g' \
-        _com_rm="s|#.*||g"
-
-    packages=($(sed "$_com_rm" "$pkglist" \
+    msg2 "Loading Packages: [%s] ..." "${list##*/}"
+    packages+=($(sed "$_com_rm" "$list" \
            | sed "$_space" \
-            | sed "$_purge" \
            | sed "$_init" \
-            | sed "$_init_rm1" \
-            | sed "$_init_rm2" \
            | sed "$_clean"))
 }

+read_from_services() {
+    for svc in "${SERVICES[@]}"; do
+        case "$svc" in
+            sddm|gdm|lightdm|mdm|greetd|lxdm|xdm)
+                packages+=("$svc-${INITSYS}"); display_manager="$svc" ;;
+            NetworkManager) packages+=("networkmanager-${INITSYS}") ;;
+            connmand) packages+=("connman-${INITSYS}") ;;
+            cupsd) packages+=("cups-${INITSYS}") ;;
+            bluetoothd) packages+=("bluez-${INITSYS}") ;;
+            syslog-ng|metalog) packages+=("$svc-${INITSYS}") ;;
+        esac
+    done
+}
+
+load_pkgs(){
+    local pkglist="$1"
+    packages=()
+
+    if [[ "${pkglist##*/}" == "Packages-Root" ]]; then
+        read_from_list "${common_dir}/Packages-base"
+        read_from_list "${common_dir}/Packages-apps"
+        read_from_list "${common_dir}/Packages-${INITSYS}"
+        [[ -n "${live_list}" ]] && read_from_list "${common_dir}/Packages-xorg"
+        read_from_list "$pkglist"
+        read_from_services
+    else
+        read_from_list "$pkglist"
+    fi
+}
+
 #}}}
--- a/lib/iso/services.sh
+++ b/lib/iso/services.sh
@@ -2,19 +2,11 @@

 #{{{ services

-set_xdm(){
-    if [[ -f "$1"/etc/conf.d/xdm ]];then
-        local conf='DISPLAYMANAGER="'${DISPLAYMANAGER}'"'
-        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" "$1"/etc/conf.d/xdm
-    fi
-}
-
 add_svc_openrc(){
    local mnt="$1" names="$2" rlvl="${3:-default}"
    for svc in $names; do
        if [[ -f $mnt/etc/init.d/$svc ]];then
-            msg2 "Setting %s ..." "$svc"
-            [[ $svc == "xdm" ]] && set_xdm "$mnt"
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
            chroot "$mnt" rc-update add "$svc" "$rlvl" &>/dev/null
        fi
    done
@@ -24,29 +16,53 @@ add_svc_runit(){
    local mnt="$1" names="$2" rlvl="${3:-default}"
    for svc in $names; do
        if [[ -d $mnt/etc/runit/sv/$svc ]]; then
-            msg2 "Setting %s ..." "$svc"
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
            chroot "$mnt" ln -s /etc/runit/sv/"$svc" /etc/runit/runsvdir/"$rlvl" &>/dev/null
        fi
    done
 }

 add_svc_s6(){
-    local mnt="$1" names="$2" rlvl="${3:-default}" error ret
+    local mnt="$1" names="$2" rlvl="${3:-default}" dep
+    dep="$mnt"/etc/s6/sv/"$display_manager"-srv/dependencies.d
    for svc in $names; do
-        error=false
-        chroot "$mnt" s6-rc-db -c /etc/s6/rc/compiled type "$svc" &> /dev/null || error=true
-        ret="$?"
-        if [ $ret -eq 0 ] && [[ "$error" == false ]]; then
-            msg2 "Setting %s ..." "$svc"
-            chroot "$mnt" s6-rc-bundle-update -c /etc/s6/rc/compiled add "$rlvl" "$svc"
+        msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+        chroot "$mnt" s6-service add "$rlvl" "$svc"
+        if [[ "$svc" == "$display_manager" ]]; then
+            if [[ -d "$dep" ]]; then
+                touch "$dep"/artix-live
+            fi
        fi
    done

+    chroot "$mnt" s6-db-reload -r
+
+    local src=/etc/s6/current skel=/etc/s6/skel getty='/usr/bin/agetty -L -8 tty7 115200'
    # rebuild s6-linux-init binaries
-    chroot "$mnt" rm -r /etc/s6/current
-    chroot "$mnt" s6-linux-init-maker -1 -N -f /etc/s6/skel -G "/usr/bin/agetty -L -8 tty1 115200" -c /etc/s6/current /etc/s6/current
-    chroot "$mnt" mv /etc/s6/current/bin/init /etc/s6/current/bin/s6-init
-    chroot "$mnt" cp -a /etc/s6/current/bin /usr
+    chroot "$mnt" rm -r "$src"
+    chroot "$mnt" s6-linux-init-maker -1 -N -f "$skel" -G "$getty" -c "$src" "$src"
+    chroot "$mnt" mv "$src"/bin/init "$src"/bin/s6-init
+    chroot "$mnt" cp -a "$src"/bin /usr
+}
+
+add_svc_suite66(){
+    local mnt="$1" names="$2"
+    for svc in $names; do
+        if [[ -f "$mnt"/etc/66/service/"$svc" ]]; then
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+            chroot "$mnt" 66-enable -t default "$svc" &>/dev/null
+        fi
+    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
 }

 #}}}
--- a/lib/iso/squash.sh
+++ b/lib/iso/squash.sh
@@ -2,24 +2,6 @@

 #{{{ squash

-make_sig () {
-    local file="$1"
-    msg2 "Creating signature file..."
-    cd "${iso_root}${live_dir}"
-    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
-    su "${owner}" -c "gpg --detach-sign --default-key ${GPG_KEY} $file"
-    chown -R root "${iso_root}${live_dir}"
-    cd "${OLDPWD}"
-}
-
-make_checksum(){
-    local file="$1"
-    msg2 "Creating md5sum ..."
-    cd "${iso_root}${live_dir}"
-    md5sum "$file" > "$file".md5
-    cd "${OLDPWD}"
-}
-
 make_ext_img(){
    local src="$1"
    local size=32G
@@ -85,14 +67,14 @@ make_sfs() {

        mksfs_args+=("${sfs_out}")

-        mksfs_args+=(-comp xz -b 256K -Xbcj x86 -noappend)
+        mksfs_args+=(-comp "${COMPRESSION}" "${COMPRESSION_ARGS[@]}" -noappend)

        mksquashfs "${mksfs_args[@]}"

        if ! ${use_dracut}; then
            make_checksum "${img_name}"
            if [[ -n ${GPG_KEY} ]];then
-                make_sig "${img_name}"
+                make_sig "${iso_root}${live_dir}/${img_name}"
            fi
        fi
        if ${persist}; then
--- a/lib/pkg/common.sh
+++ b/lib/pkg/common.sh
@@ -0,0 +1,36 @@
+#!/hint/bash
+
+#{{{ common functions
+
+get_compliant_name(){
+    local gitname="$1"
+    case "$gitname" in
+        *+) gitname=${gitname//+/plus}
+    esac
+    printf "%s\n" "$gitname"
+}
+
+get_pkg_org(){
+    local pkg="$1" org sub
+    case ${pkg} in
+        ruby-*) org="packagesRuby" ;;
+        perl-*) org="packagesPerl" ;;
+        python-*|python2-*) org="packagesPython" ;;
+        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
+    esac
+    printf "%s\n" "$org"
+}
+
+api_put() {
+    curl -s -X PUT "$@"
+}
+
+api_delete() {
+    curl -s -X DELETE "$@"
+}
+
+api_post() {
+    curl -s -X POST "$@"
+}
+
+#}}}
--- a/lib/pkg/deploy.sh
+++ b/lib/pkg/deploy.sh
@@ -1,6 +1,6 @@
 #!/hint/bash

-#{{{ deploy
+#{{{ functions

 find_cached_pkgfile() {
    local searchdirs=("$PKGDEST" "$PWD") results=()
@@ -25,4 +25,13 @@ find_cached_pkgfile() {
    esac
 }

+get_pkgbasename() {
+    local name="$1"
+    local rm_pkg=${name%.pkg.tar*}
+    rm_pkg=${rm_pkg%-*}
+    rm_pkg=${rm_pkg%-*}
+    rm_pkg=${rm_pkg%-*}
+    printf "%s\n" "$rm_pkg"
+}
+
 #}}}
--- a/lib/pkg/git.sh
+++ b/lib/pkg/git.sh
@@ -2,51 +2,6 @@

 #{{{ git

-get_pkg_org(){
-    local pkg="$1" org sub
-    case ${pkg} in
-        ruby-*) org="packagesRuby" ;;
-        perl-*) org="packagesPerl" ;;
-        python-*|python2-*) org="packagesPython" ;;
-        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
-    esac
-    echo "$org"
-}
-
-get_team_id() {
-    local org="$1" team="$2"
-    local id
-    id=$(curl -s -X GET "${GIT_URL}/api/v1/orgs/$org/teams/search?q=$team&access_token=${GIT_TOKEN}" \
-        -H  "accept: application/json" | jq '.data[] .id')
-    echo "$id"
-}
-
-add_repo_to_team() {
-    local pkg="$1" org="$2" team="$3"
-    local id
-    id=$(get_team_id "$org" "$team")
-    local gitname
-    gitname=$(get_compliant_name "$pkg")
-
-    msg2 "Adding package repo [%s] to team (%s)" "$gitname" "$team"
-
-    curl -s -X PUT "${GIT_URL}/api/v1/teams/$id/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
-        -H  "accept: application/json"
-}
-
-remove_repo_from_team() {
-    local pkg="$1" org="$2" team="$3"
-    local id
-    id=$(get_team_id "$org" "$team")
-    local gitname
-    gitname=$(get_compliant_name "$pkg")
-
-    msg2 "Removing package repo [%s] from team (%s)" "$gitname" "$team"
-
-    curl -s -X DELETE "${GIT_URL}/api/v1/teams/$id/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
-        -H  "accept: application/json"
-}
-
 get_local_head(){
    git log --pretty=%H ...refs/heads/master^ | head -n 1
 }
@@ -67,12 +22,9 @@ has_changeset(){
 }

 pull_tree(){
-    local tree="$1" local_head="$2" os="${3:-Artix}"
-    local remote_head
-    remote_head=$(get_remote_head)
-
-    msg "Checking (%s) (%s)" "${tree}" "$os"
-    if has_changeset "${local_head}" "${remote_head}";then
+    local tree="$1" lh="$2" rh
+    rh=$(get_remote_head)
+    if has_changeset "${lh}" "${rh}";then
        git pull origin master
    fi
 }
--- a/lib/pkg/gitea.sh
+++ b/lib/pkg/gitea.sh
@@ -0,0 +1,31 @@
+#!/hint/bash
+
+#{{{ gitea api
+
+add_team_to_repo() {
+    local name="$1"
+    local org="$2"
+    local team="$3"
+    local url
+
+    url="${GIT_URL}/api/v1/repos/$org/$name/teams/$team?access_token=${GIT_TOKEN}"
+
+    msg2 "Adding team (%s) to package repo [%s]" "$team" "$name"
+
+    api_put "$url" -H  "accept: application/json"
+}
+
+remove_team_from_repo() {
+    local name="$1"
+    local org="$2"
+    local team="$3"
+    local url
+
+    url="${GIT_URL}/api/v1/repos/$org/$name/teams/$team?access_token=${GIT_TOKEN}"
+
+    msg2 "Removing team (%s) from package repo [%s]" "$team" "$name"
+
+    api_delete "$url" -H  "accept: application/json"
+}
+
+#}}}
--- a/lib/pkg/jenkins.sh
+++ b/lib/pkg/jenkins.sh
@@ -6,11 +6,11 @@ write_jenkinsfile(){
    local pkg="$1"
    local jenkins=$pkg/Jenkinsfile

-    echo "@Library('artix-ci') import org.artixlinux.RepoPackage" > "$jenkins"
+    printf "@Library('artix-ci') import org.artixlinux.RepoPackage\n" > "$jenkins"
    {
-    echo ''
-    echo 'PackagePipeline(new RepoPackage(this))'
-    echo ''
+    printf '\n'
+    printf 'PackagePipeline(new RepoPackage(this))\n'
+    printf '\n'
    } >> "$jenkins"

    git add "$jenkins"
@@ -21,11 +21,11 @@ write_agentyaml(){
    local agent="$pkg"/.artixlinux/agent.yaml label='master'
    [[ -d $pkg/.artixlinux ]] || mkdir "$pkg"/.artixlinux

-    echo '---' > "$agent"
+    printf '---\n' > "$agent"
    {
-    echo ''
-    echo "label: $label"
-    echo ''
+    printf '\n'
+    printf "label: %s\n" "$label"
+    printf '\n'
    } >> "$agent"

    git add "$agent"
@@ -37,7 +37,7 @@ commit_jenkins_files(){
    write_jenkinsfile "$pkg"
    write_agentyaml "$pkg"

-    git commit -m "initial commit"
+    git commit -m "initial ci commit"
 }

 #}}}
--- a/lib/pkg/repo.sh
+++ b/lib/pkg/repo.sh
@@ -29,21 +29,21 @@ find_repo(){
        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=repos/"$r"-any
        [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$pkgarch/$r"
    done
-    echo "$repo"
+    printf "%s\n" "$repo"
 }

 find_pkg(){
    local searchdir="$1" pkg="$2" result
    result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    echo "$result"
+    printf "%s\n" "$result"
 }

 tree_loop(){
    local func="$1" pkgs
    for tree in "${ARTIX_TREE[@]}"; do
-        pkgs=$(find "${TREE_DIR_ARTIX}/$tree" -name repos -o -name "$CARCH")
-        for package in ${pkgs}; do
-            "$func" "$package"
+        mapfile -t pkgs < <(find "${TREE_DIR_ARTIX}/$tree" -name "$CARCH" | sort)
+        for _package in "${pkgs[@]}"; do
+            "$func" "$_package"
        done
    done
 }
--- a/lib/pkg/table.sh
+++ b/lib/pkg/table.sh
@@ -5,32 +5,31 @@
 msg_table_header(){
    local mesg=$1; shift
    # shellcheck disable=2059
-    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@"
 }

-msg_row_downgrade(){
+msg_row_yellow(){
    local mesg=$1; shift
    # shellcheck disable=2059
-    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@"
 }

-msg_row_notify(){
+msg_row_green(){
    local mesg=$1; shift
    # shellcheck disable=2059
-    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@"
 }

 msg_row(){
    local mesg=$1; shift
-#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
    # shellcheck disable=2059
-    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@"
 }

-msg_row_upgrade(){
+msg_row_red(){
    local mesg=$1; shift
    # shellcheck disable=2059
-    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@"
 }

 #}}}
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -19,6 +19,18 @@ load_iso_config(){

    GPG_KEY=${GPG_KEY:-''}

+    COMPRESSION="${COMPRESSION:-zstd}"
+
+    COMPRESSION_LEVEL="${COMPRESSION_LEVEL:-15}"
+
+    if [[ -z "${COMPRESSION_ARGS[*]}" ]]; then
+        COMPRESSION_ARGS=(-Xcompression-level "${COMPRESSION_LEVEL}")
+    fi
+
+    if [[ "${COMPRESSION}" == 'xz' ]]; then
+        COMPRESSION_ARGS=(-Xbcj x86)
+    fi
+
    return 0
 }

--- a/lib/util-pkg.sh
+++ b/lib/util-pkg.sh
@@ -13,9 +13,9 @@ load_pkg_config(){

    local git_domain="gitea.artixlinux.org"

-    GIT_URL="https://${git_domain}"
+    GIT_URL=${GIT_URL:-"https://${git_domain}"}

-    GIT_SSH="gitea@${git_domain}"
+    GIT_SSH=${GIT_SSH:-"gitea@${git_domain}"}

    GIT_TOKEN=${GIT_TOKEN:-''}

@@ -23,16 +23,19 @@ load_pkg_config(){

    ARTIX_TREE=(
        packages community
-        packages-{gfx,gtk,media,net,qt5,xorg}
+        packages-{gfx,media,net}
    )

-    local dev_tree=(packages-{python,perl,java,ruby})
+    local dev_tree=(
+        packages-{llvm,python,perl,java,ruby,misc}
+        python-{world,galaxy,galaxy-groups,misc}
+    )

-    local init_tree=(packages-{openrc,runit,s6})
+    local init_tree=(packages-{openrc,runit,s6,suite66,dinit})

    local desktop_tree=(
-        packages-{kf5,plasma,kde,qt6}
-        packages-{lxqt,gnome,cinnamon,mate,xfce,wm}
+        packages-{kf5,plasma,kde,qt5,qt6,xorg,gtk}
+        packages-{lxqt,gnome,cinnamon,mate,xfce,wm,lxde}
    )

    [[ -z ${TREE_NAMES_ARTIX[*]} ]] && \
@@ -49,13 +52,16 @@ load_pkg_config(){

    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}

+    [[ -z ${ARCH_TREE[*]} ]] && \
    ARCH_TREE=(svntogit-{packages,community})

    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}

    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}

-    DBEXT=${DBEXT:-'xz'}
+    HOST_TREE_ARCH=${HOST_TREE_ARCH:-'https://github.com/archlinux'}
+
+    DBEXT=${DBEXT:-'gz'}

    return 0
 }
Author	SHA1	Message	Date
artoo	a53fb9e839	artools/0.27 (#62 ) * refactoring * drop echo Reviewed-on: #62	2022-04-25 17:35:02 +02:00
artoo	1d85f8000c	buildiso: write defaultBundle map for s6 cal	2022-04-12 16:54:05 +02:00
artoo	21c44dba79	checkrepo: update pkg filter	2022-04-11 16:10:57 +02:00
artoo	f4e3abae46	buildiso: clean up s6 sv handling	2022-04-11 02:06:20 +02:00
artoo	a7cef500ad	s6 (#61 ) Reviewed-on: #61 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2022-04-10 20:44:11 +02:00
artoo	f7c29d1c98	makepkg.conf: drop -fvar-tracking-assignments flag	2022-02-14 17:42:36 +01:00
Dudemanguy	f1b2af947b	s6: remove s6-rc-bundle-update usage This is deprecated, so we should remove it from the buildiso script. Instead, files are touched in the defaults/contents.d directory and the database is reloaded.	2022-02-08 14:58:31 +01:00
artoo	5637ba0f8f	pkg1yaml: yaml sequence debug pkgs	2022-02-01 20:02:29 +01:00
artoo	a383531e5d	pkg2yaml: don't include debug packages for pkgnames	2022-01-30 18:58:31 +01:00
artoo	6b4acbdd94	comparepkg: fix upg cmp	2021-12-25 15:23:20 +01:00
artoo	b7fd0a4e41	enable lto, upd conf	2021-12-23 19:07:38 +01:00
artoo	b734357ea9	checkrepo: refactoring	2021-11-29 22:58:49 +01:00
artoo	74d44873e7	checkrepo: add obsolete pkg check	2021-11-29 16:41:49 +01:00
artoo	91e038c3f5	don't find arch vcs repos	2021-11-28 13:59:20 +01:00
artoo	8548a584f3	restore arch vcs repo detect	2021-11-28 13:57:07 +01:00
artoo	38fb213e13	pkg tools: remove old layout support	2021-11-26 19:04:17 +01:00
artoo	fade611ae7	checkrepo: fix check_db() and speed it up	2021-11-26 10:55:11 +01:00
Chris Cromer	8cdb68ce6a	fix call to artools-chroot when artools-pkg is not installed	2021-11-08 16:21:23 -03:00
artoo	7d949afeb7	Merge pull request 'add initial support for dinit' (#59 ) from konimex/artools:master into master Reviewed-on: #59	2021-11-05 16:36:30 +01:00
Muhammad Herdiansyah	6f037f6faf	add initial support for dinit	2021-10-27 17:02:50 +07:00
artoo	ba1e6644ea	arch-patches (#58 ) Reviewed-on: #58 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2021-09-11 00:19:34 +02:00
artoo	3f90082cc1	update tree names	2021-07-24 18:01:46 +02:00
artoo	915db85b7d	commitpkg: fix team check	2021-07-24 16:21:31 +02:00
artoo	a5a29259e5	pkg (#57 ) Reviewed-on: #57 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2021-07-24 15:50:33 +02:00
artoo	c5f8bc7e20	lib/table: don't redirect to stderr	2021-07-21 15:35:24 +02:00
artoo	11dd9be3f1	comp (#56 ) Reviewed-on: #56 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2021-07-13 11:07:33 +02:00
artoo	f058b9155b	iso.conf: better explaining comments	2021-07-11 10:31:06 +02:00
artoo	7c3d1343e8	buildiso: fix checksum file	2021-07-11 09:24:06 +02:00
artoo	80b14b7f1f	buildiso: make suqsh compression configurable	2021-07-11 00:08:03 +02:00
artoo	29a1e98c0e	buildiso: add -l arg	2021-07-10 22:23:23 +02:00
artoo	8bcb311bbd	buildiso: make compression level configurable	2021-07-10 22:14:39 +02:00
artoo	0c5816fac2	buildiso: fix suite66	2021-07-10 20:50:41 +02:00
artoo	4b802be860	buildiso: optional initcpio (#55 ) Reviewed-on: #55 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2021-07-10 20:41:39 +02:00
artoo	8621191465	links-add: remove preserve option	2021-07-09 00:18:08 +02:00
artoo	b019f42ee1	chroot-run: sleep 1 after killing chroot process	2021-07-06 01:18:37 +02:00
artoo	205d668630	update pkg conf defaults	2021-07-05 22:36:00 +02:00
artoo	3ae2972d2b	commitpkg: fix remove commit msg	2021-07-04 23:10:12 +02:00
artoo	5ad1bb49d1	data/pacman: sync conf with pacman-6.0.0-3	2021-07-02 00:33:22 +02:00
Dudemanguy	b7e7e4c53a	buildiso: use tty7 for s6-linux-init	2021-06-29 19:07:07 -05:00
Nathan Owens	5c58a6cc5b	Update 'lib/iso/services.sh' Signed-off-by: Nathan Owens <ndowens@artixlinux.org>	2021-06-20 19:17:50 +02:00
artoo	a12d0a4778	buildiso: default to 'default' tree name	2021-06-05 16:04:09 +02:00
artoo	4293f5a967	Merge pull request 'commitpkg: adjust msg' (#52 ) from msg into master Reviewed-on: #52	2021-06-01 19:27:33 +02:00
artoo	d3e42f60e1	commitpkg: adjust msg	2021-05-30 19:43:51 +02:00
artoo	7605aaf55c	buildiso: don't write calamares unpack.conf	2021-05-26 20:20:49 +02:00
artoo	b57c5e668c	links-add: fix db check	2021-05-26 17:52:13 +02:00
artoo	db17939f7d	buildiso: don't write postcfg.conf	2021-05-25 16:35:19 +02:00
artoo	0818ea40e8	links-add: arch backports * handle GPGKEY with spaces * do not accept public-only keys for signing * use more libmakepkg to handle common compression routines	2021-05-22 20:57:29 +02:00
artoo	9b2a478aed	add missing m4_include	2021-05-20 20:19:08 +02:00
artoo	2c3578a850	gitea (#51 ) Reviewed-on: #51 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2021-05-15 20:51:00 +02:00
artoo	2dcb55cef4	gitea-api (#50 ) Reviewed-on: #50 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2021-05-15 16:41:18 +02:00
artoo	81d890cead	default to gz for repo databases	2021-05-15 00:57:33 +02:00
artoo	33685e164d	commitpkg: revert git add package only	2021-05-06 19:08:17 +02:00
artoo	f419683149	proto: update	2021-05-06 18:58:13 +02:00
artoo	54f31daccb	comparepkg: adjust to artix.list	2021-05-06 17:40:07 +02:00
artoo	be0cfb636e	Makefile: install proto pkgbuilds	2021-05-06 17:22:26 +02:00
artoo	4108a038fa	rename suite66	2021-05-06 17:22:02 +02:00
artoo	4634c78520	commitpkg: only git add the pkg dir	2021-05-06 17:11:58 +02:00
artoo	a9409d3837	update proto pkgbuiild	2021-05-06 17:11:27 +02:00
artoo	02c3a079a2	comparepkg: sort pkgs; write artix pkg moves	2021-05-06 16:19:30 +02:00
artoo	72993117fa	add proto pkgbuild	2021-05-05 17:34:47 +02:00
artoo	6e0c336c67	buildiso: write proper calameres services-66.conf	2021-05-03 16:53:20 +02:00
artoo	a396dafed9	buildiso: show service msg	2021-05-03 11:07:26 +02:00
artoo	c613471459	fstabgen: arch backport	2021-05-03 11:06:48 +02:00
artoo	7abd0c9453	add 66 support for package tree	2021-04-30 22:06:13 +02:00
artoo	390cc84bbf	buildiso: fix 66 service adding	2021-04-30 17:37:06 +02:00
artoo	2f1cf770cd	artools/0.23 (#49 ) Reviewed-on: #49 Co-authored-by: artoo <artoo@artixlinux.org> Co-committed-by: artoo <artoo@artixlinux.org>	2021-04-29 21:27:56 +02:00
artoo	2f5a374523	comparepkg: highlight rebuild trigger pkg	2021-04-25 16:27:20 +02:00
artoo	76ca2dfdc7	deploypkg: fix return code	2021-02-08 20:00:56 +01:00
artoo	f05688dc12	rm char	2021-02-07 10:21:13 +01:00
artoo	091b5deaa8	mkchrootpkg: only expose failed build logs instead of products	2021-02-07 10:18:53 +01:00
artoo	93e4beb61f	makepkg.conf: make rsync use new-style compression in makepkg.conf	2021-01-28 15:45:54 +01:00
artoo	76b4ff511d	mkchrootpkg: Expose failed build logs/products	2021-01-28 15:44:23 +01:00
artoo	2995207e6b	remove code now done in live-services (#48 ) buildiso: simplify dm serivce buildiso: remove openrc specific DM service handling remove code now done in live-services Reviewed-on: #48 Co-Authored-By: artoo <artoo@artixlinux.org> Co-Committed-By: artoo <artoo@artixlinux.org>	2021-01-08 19:06:41 +01:00
artoo	5aa8bd3333	comparepkg: remove obsolete help opt	2021-01-05 17:58:41 +01:00
artoo	699ea06445	Merge pull request 's6: force artix-live dependency on displaymanagers' (#47 ) from Dudemanguy/artools:master into master Reviewed-on: #47	2021-01-05 17:56:22 +01:00
Dudemanguy	4b9a883113	s6: force artix-live dependency on displaymanagers A bit of a hack, but it's good enough. The liveiso has the problem of the display manager service starting before the artix-live service starts. This means the artix user isn't created yet and thus autologin fails. What needs to happen is that every display manager service should have a dependency on artix-live. However, s6-rc has no way to specify optional dependencies so simply adding it to the script package can't be a solution. Instead what we can do is to just check for the existence of these services when building the iso (this is the only case where we care about this dependency) and manually add it to the dependencies file and rebuild the database.	2021-01-05 10:31:48 -06:00
artoo	74ab2c71b1	v0.22 (#46 ) artix-chroot: tweak msg remove unused func & var buildiso: small msg cosmetics deploypkg: use full filenames on removal readd lost get_compliant_name() update artools-pkg.conf links-add: don't elf read kernel documentation chroot-run: remove & tweak msgs links-add: unquote files var tweak msgs shellcheck ignore colors remove info() and use only use config vars in caps Makefile: start 0.22 Reviewed-on: #46 Co-Authored-By: artoo <artoo@artixlinux.org> Co-Committed-By: artoo <artoo@artixlinux.org>	2020-12-26 00:12:19 +01:00