merge branch 'artools/0.30'

merge branch 'arch-git'
remove pacman-docker.conf
2023-05-22 01:24:01 +02:00 · 2023-05-21 20:16:55 +02:00 · 2023-05-13 16:22:30 +02:00 · 2023-05-03 23:45:58 +02:00 · 2023-05-03 17:50:19 +02:00 · 2023-05-03 17:47:01 +02:00
95 changed files with 3426 additions and 3297 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ data/schemas/*.conf
 .project
 iso-profiles
 live-services
+artixpkg_cmds
+PKGBUILD
--- a/140
+++ b/140
@@ -1,11 +1,11 @@
-VERSION=0.21
+V=0.30

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

 BASE_CONF = \
 	data/conf/artools-base.conf
@@ -17,75 +17,68 @@ BASE_BIN = \
 	bin/base/artix-chroot \
 	bin/base/fstabgen

-BASE_DATA = \
-	$(wildcard data/pacman/pacman*.conf)
+BASE_LIB =\
+	$(wildcard lib/base/*.sh)
+
+PACMAN_CONF = \
+	$(wildcard data/pacman/*.conf)

 PKG_CONF = \
 	data/conf/artools-pkg.conf

+SETARCH_ALIASES = \
+
 PKG_BIN = \
 	bin/pkg/buildpkg \
 	bin/pkg/deploypkg \
-	bin/pkg/commitpkg \
-	bin/pkg/comparepkg \
+	bin/pkg/links-add \
 	bin/pkg/mkchrootpkg \
 	bin/pkg/pkg2yaml \
-	bin/pkg/buildtree \
+	bin/pkg/makerepropkg \
 	bin/pkg/lddd \
-	bin/pkg/links-add \
 	bin/pkg/checkpkg \
 	bin/pkg/finddeps \
 	bin/pkg/find-libdeps \
-	bin/pkg/batchpkg \
 	bin/pkg/signpkg \
-	bin/pkg/checkrepo
-
-LN_COMMITPKG = \
-	extrapkg \
-	corepkg \
-	testingpkg \
-	stagingpkg \
-	communitypkg \
-	community-testingpkg \
-	community-stagingpkg \
-	multilibpkg \
-	multilib-testingpkg \
-	multilib-stagingpkg \
-	kde-unstablepkg \
-	gnome-unstablepkg \
-	rebuildpkg
+	bin/pkg/checkrepo \
+	bin/pkg/artixpkg \
+	bin/pkg/mkdepgraph \
+	bin/pkg/diffpkg \
+	bin/pkg/export-pkgbuild-keys

 LN_BUILDPKG = \
 	buildpkg-system \
+	buildpkg-system-gremlins \
+	buildpkg-system-goblins \
 	buildpkg-world \
-	buildpkg-gremlins \
-	buildpkg-goblins \
-	buildpkg-galaxy \
-	buildpkg-galaxy-gremlins \
-	buildpkg-galaxy-goblins \
+	buildpkg-world-gremlins \
+	buildpkg-world-goblins \
 	buildpkg-lib32 \
 	buildpkg-lib32-gremlins \
 	buildpkg-lib32-goblins \
 	buildpkg-kde-wobble \
 	buildpkg-gnome-wobble

-LN_DEPLOYPKG = \
-	deploypkg-system \
-	deploypkg-world \
-	deploypkg-gremlins \
-	deploypkg-goblins \
-	deploypkg-galaxy \
-	deploypkg-galaxy-gremlins \
-	deploypkg-galaxy-goblins \
-	deploypkg-lib32 \
-	deploypkg-lib32-gremlins \
-	deploypkg-lib32-goblins \
-	deploypkg-kde-wobble \
-	deploypkg-gnome-wobble
+PKG_LIB =\
+	$(wildcard lib/pkg/*.sh)

-PKG_DATA = \
-	data/pacman/makepkg.conf \
-	data/valid-names.conf
+PKG_LIB_API =\
+	$(wildcard lib/pkg/api/*.sh)
+
+PKG_LIB_CI =\
+	$(wildcard lib/pkg/ci/*.sh) \
+
+PKG_LIB_GIT =\
+	$(wildcard lib/pkg/git/*.sh) \
+
+PKG_LIB_REPO =\
+	$(wildcard lib/pkg/repo/*.sh)
+
+# PKG_DATA = \
+# 	data/valid-names.conf
+
+MAKEPKG_CONF = \
+	data/makepkg/x86_64.conf \

 PATCHES = \
 	$(wildcard data/patches/*.patch)
@@ -96,6 +89,9 @@ ISO_CONF = \
 ISO_BIN = \
 	bin/iso/buildiso

+ISO_LIB =\
+	$(wildcard lib/iso/*.sh)
+
 LN_BUILDISO = \
 	buildiso-gremlins \
 	buildiso-goblins
@@ -105,7 +101,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

@@ -114,12 +110,13 @@ BIN = $(BASE_BIN) $(PKG_BIN) $(ISO_BIN)
 all: $(BIN)

 EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
 	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g"

-%: %.in Makefile lib/util-base.sh
+%: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | $(M4) | $(EDIT) >$@
+	@$(M4) $@.in | $(EDIT) >$@
 	@$(CHMODAW) "$@"
 	@$(CHMODX) "$@"
 	@bash -O extglob -n "$@"
@@ -134,8 +131,14 @@ install_base:
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)

-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
+	install $(FILEMODE) $(BASE_LIB) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
+
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/pacman.conf.d
+	install $(FILEMODE) $(PACMAN_CONF) $(DESTDIR)$(DATADIR)/$(TOOLS)/pacman.conf.d
+
+	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)
@@ -144,29 +147,40 @@ install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(PKG_BIN) $(DESTDIR)$(BINDIR)

+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
+	install $(FILEMODE) $(PKG_LIB) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
+
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/api
+	install $(FILEMODE) $(PKG_LIB_API) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/api
+
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/ci
+	install $(FILEMODE) $(PKG_LIB_CI) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/ci
+
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/git
+	install $(FILEMODE) $(PKG_LIB_GIT) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/git
+
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/repo
+	install $(FILEMODE) $(PKG_LIB_REPO) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/repo
+
 	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides

 	$(LN) links-add $(DESTDIR)$(BINDIR)/links-remove

-	for l in $(LN_COMMITPKG); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
 	for l in $(LN_BUILDPKG); do $(LN) buildpkg $(DESTDIR)$(BINDIR)/$$l; done
-	for l in $(LN_DEPLOYPKG); do $(LN) deploypkg $(DESTDIR)$(BINDIR)/$$l; done

-	$(LN) artix-chroot $(DESTDIR)$(BINDIR)/artools-chroot
+# 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+# 	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)

-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/makepkg.conf.d
+	install $(FILEMODE) $(MAKEPKG_CONF) $(DESTDIR)$(DATADIR)/$(TOOLS)/makepkg.conf.d

-	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)

+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+	install $(FILEMODE) $(ISO_LIB) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(ISO_BIN) $(DESTDIR)$(BINDIR)

--- 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
+  * parallel

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

 #### Configuration
@@ -64,11 +59,25 @@ Specifying args will override artools-{base,pkg,iso}.conf settings.
 Both, pacman.conf and makepkg.conf for chroots are loaded from

 ```bash
-usr/share/artools/{makepkg,pacman-*}.conf
+usr/share/artools/makepkg.conf.d/makepkg.conf
+```
+
+```bash
+usr/share/artools/pacmanconf.d/${repo}.conf
 ```

 and can be overridden dropping them in

+```bash
+$HOME/.config/artools/makepkg.conf.d/
+```
+
+```bash
+$HOME/.config/artools/pacman.conf.d/
+```
+
+artools-*.conf:
+
 ```bash
 $HOME/.config/artools/
 ```
--- a/bin/base/artix-chroot.in
+++ b/bin/base/artix-chroot.in
@@ -14,138 +14,39 @@

 shopt -s extglob

-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/mount.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}

-#{{{ functions
-
-chroot_part_mount() {
-    info "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[@]}"
-    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_PART_MOUNTS
-}
-
-detect(){
-    local detected
-    detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
-    echo "${detected}"
-}
-
-# $1: os-prober array
-get_os_name(){
-    local str=$1
-    str="${str#*:}"
-    str="${str#*:}"
-    str="${str%:*}"
-    echo "$str"
-}
-
-mount_os(){
-    CHROOT_ACTIVE_PART_MOUNTS=()
-    CHROOT_ACTIVE_MOUNTS=()
-
-    trap_setup chroot_part_umount
-
-    chroot_part_mount "$2" "$1"
-
-    local mounts
-    mounts=$(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' "$1"/etc/fstab)
-
-    for entry in ${mounts}; do
-        entry=${entry//UUID=}
-        local dev=${entry%:*} mp=${entry#*:}
-        case "${entry#*:}" in
-            '/'|'swap'|'none') continue ;;
-            *) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
-        esac
-    done
-
-    chroot_setup "$1" true
-    chroot_add_resolv_conf "$1"
-}
-
-select_os(){
-    local os_list=( "$(detect)" ) count=${#os_list[@]}
-    if [[ ${count} -gt 1 ]];then
-        msg "Detected systems:"
-        local i=0
-        for os in "${os_list[@]}"; do
-            local last=${os##*:}
-            case $last in
-                'efi') count=$((count-1)) ;;
-                *) info "$i) $(get_os_name "$os")"; i=$((i+1)) ;;
-            esac
-        done
-        i=0
-        msg "Select system to mount [0-%s] : " "$((count-1))"
-        read -r select
-    else
-        select=0
-    fi
-    local os_str=${os_list[$select]} type
-    type=$os_str
-    root=${os_str%%:*}
-    type=${type##*:}
-    if [[ "${type##*:}" == 'linux' ]];then
-        msg "Mounting (%s) [%s]" "$(get_os_name "$os_str")" "$root"
-        mount_os "$1" "$root"
-    else
-        die "You can't mount %s!" "$select"
-    fi
-}
-
-#}}}
-
-automount=false
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/chroot.sh
+source "${LIBDIR}"/base/mount.sh

 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 chroot-dir [command]\n' "${0##*/}"
+    printf '    -h             Print this help message\n'
+    printf '\n'
+    printf "    If 'command' is unspecified, %s will launch /bin/sh.\n" "${0##*/}"
+    printf '\n'
+    printf '\n'
    exit "$1"
 }

-opts=':ha'
+opts=':h'

 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 ))

 check_root

-if ${automount};then
-    chrootdir=/mnt
-    run_args=(/bin/bash)
+chrootdir=$1
+shift

-    select_os "${chrootdir}"
-else
-    chrootdir=$1
-    shift
-    run_args=("$@")
+[[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"

-    [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
+chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
+chroot_add_resolv_conf "${chrootdir}"

-    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
-    chroot_add_resolv_conf "${chrootdir}"
-fi
-
-SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "${run_args[@]}"
+SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "$@"
--- a/bin/base/basestrap.in
+++ b/bin/base/basestrap.in
@@ -22,9 +22,11 @@

 shopt -s extglob

-m4_include(lib/base/message.sh)
-m4_include(lib/base/mount.sh)
-m4_include(lib/base/chroot.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/mount.sh
+source "${LIBDIR}"/base/chroot.sh

 #{{{ functions

@@ -55,19 +57,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 +83,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
@@ -12,9 +12,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
-m4_include(lib/base/mount.sh)
-m4_include(lib/base/chroot.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/mount.sh
+source "${LIBDIR}"/base/chroot.sh
+source "${LIBDIR}"/base/chroot-version.sh

 # $1: chroot
 kill_chroot_process(){
@@ -26,11 +29,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 +47,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 +73,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 +86,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 +111,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 +148,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 +157,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 +167,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
@@ -14,7 +14,9 @@

 shopt -s extglob

-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh

 #{{{ filesystems

@@ -364,23 +366,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
@@ -12,8 +12,11 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/chroot.sh
+source "${LIBDIR}"/base/chroot-version.sh

 working_dir=''
 umode=''
@@ -22,15 +25,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 +48,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 +65,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
@@ -92,13 +92,13 @@ for f in "${files[@]}"; do
    cp "$f" "$working_dir$f"
 done

-basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
+unshare --mount 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=C.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
@@ -12,24 +12,27 @@
 # 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-iso.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/base/common.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/iso/mount.sh)
-m4_include(lib/iso/services.sh)
-m4_include(lib/base/yaml.sh)
-m4_include(lib/iso/calamares.sh)
-m4_include(lib/iso/config.sh)
-m4_include(lib/iso/firmware.sh)
-m4_include(lib/iso/dracut.sh)
-m4_include(lib/iso/initcpio.sh)
-m4_include(lib/iso/grub.sh)
-m4_include(lib/iso/squash.sh)
-m4_include(lib/iso/iso.sh)
-m4_include(lib/iso/profile.sh)
-m4_include(lib/iso/trap.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+source "${LIBDIR}"/base/util.sh
+source "${LIBDIR}"/iso/util.sh
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/chroot.sh
+source "${LIBDIR}"/iso/mount.sh
+source "${LIBDIR}"/iso/services.sh
+source "${LIBDIR}"/base/yaml.sh
+source "${LIBDIR}"/iso/calamares.sh
+source "${LIBDIR}"/iso/config.sh
+source "${LIBDIR}"/iso/firmware.sh
+source "${LIBDIR}"/iso/dracut.sh
+source "${LIBDIR}"/iso/initcpio.sh
+source "${LIBDIR}"/iso/grub.sh
+source "${LIBDIR}"/iso/squash.sh
+source "${LIBDIR}"/iso/iso.sh
+source "${LIBDIR}"/iso/profile.sh
+source "${LIBDIR}"/iso/trap.sh

 clean_up_chroot(){
    local path mnt="$1"
@@ -86,9 +89,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 +112,7 @@ make_livefs() {

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

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

        configure_chroot "${livefs}"

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

        umount_overlayfs
@@ -154,14 +157,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 +184,7 @@ gen_iso_fn(){
    for n in "${vars[@]}"; do
        name=${name:-}${name:+-}${n}
    done
-    echo "$name"
+    printf "%s\n" "$name"
 }

 prepare_build(){
@@ -192,7 +195,8 @@ prepare_build(){
        *) repo=default ;;
    esac

-    get_pacman_conf "${repo}"
+    pacman_conf="${DATADIR}/pacman.conf.d/${repo}.conf"
+    [[ -f "${USER_CONF_DIR}/pacman.conf.d/${repo}.conf" ]] && pacman_conf="${USER_CONF_DIR}/pacman.conf.d/${repo}.conf"

    iso_file=$(gen_iso_fn).iso

@@ -207,6 +211,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 +225,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 +258,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 +329,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 +372,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/artixpkg.in
+++ b/bin/pkg/artixpkg.in
@@ -0,0 +1,80 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-23 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.
+
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/pkg/api/gitea.sh
+
+set -e
+
+
+usage() {
+    local -r COMMAND=${BASH_SOURCE[0]##*/}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+    COMMANDS
+        repo      Pacman database modification for packge update, move etc
+        git       Manage Git packaging repositories and their configuration
+
+    OPTIONS
+        -h, --help     Show this help text
+_EOF_
+}
+
+if (( $# < 1 )); then
+    usage
+    exit 1
+fi
+
+export _ARTOOLS_COMMAND='artixpkg'
+
+source "${LIBDIR}"/base/util.sh
+source "${LIBDIR}"/pkg/util.sh
+
+load_makepkg_config
+
+cd "${TREE_DIR_ARTIX}"
+
+# command checking
+while (( $# )); do
+	case $1 in
+    -h|--help)
+        usage
+        exit 0
+    ;;
+    repo)
+        _ARTOOLS_COMMAND+=" $1"
+        shift
+        # shellcheck source=src/lib/pkg/repo.sh
+        source "${LIBDIR}"/pkg/repo.sh
+        artixpkg_repo "$@"
+        exit 0
+    ;;
+    git)
+        _ARTOOLS_COMMAND+=" $1"
+        shift
+        # shellcheck source=src/lib/pkg/git.sh
+        source "${LIBDIR}"/pkg/git.sh
+        artixpkg_git "$@"
+        exit 0
+    ;;
+    *)
+        die "invalid command: %s" "$1"
+    ;;
+    esac
+done
--- a/bin/pkg/batchpkg.in
+++ b/bin/pkg/batchpkg.in
@@ -1,115 +0,0 @@
-#!/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)
-
-#{{{ functions
-
-batch_move() {
-    local name="${1:-pkg_moves}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local src=${entry%:*}
-        src=${src#*:}
-        local dest=${entry%%:*}
-        if ${runlist}; then
-            "${dest}"pkg -s "${src}" -u -p "${pkg}"
-        else
-            msg "%s" "${dest}pkg -s ${src} -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_create() {
-    local name="${1:-pkg_create}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local group=${entry%:*}
-        group=${group#*:}
-        local team=${entry%%:*}
-        if ${runlist}; then
-            buildtree -n -p "${pkg}" -t "${team}" -g "${group}"
-            buildtree -i -p "${pkg}"
-            commitpkg -p "${pkg}"
-        else
-            msg "%s" "buildtree -n -p ${pkg} -t ${team} -g ${group}"
-            msg2 "%s" "buildtree -i -p ${pkg}"
-            msg2 "%s" "commitpkg -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_update() {
-    local name="${1:-pkg_upgrades}"
-    local pkglist=${TREE_DIR_ARTIX}/$name.list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry#*:}
-        local dest=${entry%:*}
-        if ${runlist}; then
-            buildtree -i -p "${pkg}"
-            "${dest}"pkg -u -p "${pkg}"
-        else
-            msg "buildtree -i -p ${pkg}"
-            msg2 "${dest}pkg -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-#}}}
-
-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 ''
-    exit "$1"
-}
-
-runlist=false
-create=false
-update=false
-
-opts='rcuh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) runlist=true ;;
-        c) create=true ;;
-        u) update=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-listname="$1"; shift
-
-if ${create}; then
-    batch_create "${listname}"
-elif ${update}; then
-    batch_update "${listname}"
-else
-    batch_move "${listname}"
-fi
--- a/bin/pkg/buildpkg.in
+++ b/bin/pkg/buildpkg.in
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018-23 artoo@artixlinux.org
 # Copyright (C) 2018 Artix Linux Developers
 #
 # This program is free software; you can redistribute it and/or modify
@@ -12,10 +12,13 @@
 # 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/base/message.sh)
-m4_include(lib/base/common.sh)
-m4_include(lib/base/chroot.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+source "${LIBDIR}"/base/util.sh
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/chroot.sh

 create_first=false
 rebuild=false
@@ -29,17 +32,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 +57,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

@@ -64,13 +66,36 @@ else
    case ${repo} in
        system|world|galaxy) repo='default' ;;
        lib32*) base_devel+=('multilib-devel') ;;
-        galaxy-gremlins|galaxy-goblins) repo=${repo#*-} ;;
+        *-gremlins|*-goblins) repo=${repo#*-} ;;
    esac
 fi

-get_pacman_conf "${repo}"
+pacman_conf="${DATADIR}/pacman.conf.d/${repo}.conf"
+[[ -f "${USER_CONF_DIR}/pacman.conf.d/${repo}.conf" ]] && pacman_conf="${USER_CONF_DIR}/pacman.conf.d/${repo}.conf"

-get_makepkg_conf
+makepkg_conf="${DATADIR}/makepkg.conf.d/${arch}.conf"
+[[ -f ${USER_CONF_DIR}/makepkg.conf.d/${arch}.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.conf.d/${arch}.conf"
+
+if [[ -f "${DATADIR}/setarch-aliases.d/${arch}" ]]; then
+    read -r set_arch < "${DATADIR}/setarch-aliases.d/${arch}"
+else
+    set_arch="${arch}"
+fi
+
+# Architecture-specific Mount
+# arch_mounts=()
+# if [[ -f "${DATADIR}/mount.d/${arch}" ]]; then
+#     mapfile -t arch_mounts < "${DATADIR}/mount.d/${arch}"
+# fi
+# for arch_mount in "${arch_mounts[@]}"; do
+#     if [[ $arch_mount = rw* ]]; then
+#         arch_mount=${arch_mount#rw }
+#         in_array "$arch_mount" "${mkchrootpkg_args[@]}" || mkchrootpkg_args+=("-d" "$arch_mount")
+#     elif [[ $arch_mount = ro* ]]; then
+#         arch_mount=${arch_mount#ro }
+#         in_array "$arch_mount" "${mkchrootpkg_args[@]}" || mkchrootpkg_args+=("-D" "$arch_mount")
+#     fi
+# done

 check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME

@@ -92,7 +117,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
@@ -1,351 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 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/git.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
-
-    local org
-    org=$(get_pkg_org "${PACKAGE}")
-
-    create_repo "${PACKAGE}" "$org"
-
-    add_repo_to_team "${PACKAGE}" "$org" "${TEAM}"
-
-    subrepo_clone "${PACKAGE}" "$org"
-
-    mkdir -p "${TREE_DIR_ARTIX}/${GROUP}/${PACKAGE}/trunk"
-
-    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
-}
-
-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"
-            )
-        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)"
-            )
-        else
-            clone_tree "${host_tree_artix}" "${tree}"
-            config_tree "${tree}"
-        fi
-    done
-}
-
-#}}}
-
-#{{{ patch
-
-patch_pkg(){
-    local pkgpath="$1"
-    local pkg=${pkgpath%/*}
-    pkg=${pkg##*/}
-    case $pkg in
-        glibc)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
-                -e '/nscd.service/d' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-        linux|linux-lts)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "$pkgpath"/PKGBUILD
-            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i "$pkgpath"/config
-        ;;
-        bash)
-            msg2 "Patching %s" "$pkg"
-            # shellcheck disable=2016
-            sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
-            -e "s|etc/bash.|etc/bash/|g" \
-            -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
-            -i "$pkgpath"/PKGBUILD
-            ( cd "$pkgpath" || return
-                patch -Np 1 -i "${DATADIR}"/patches/artix-bash.patch
-                updpkgsums
-            )
-        ;;
-        gstreamer|gst-plugins-*|licenses)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
-                -e 's|(Arch Linux)|(Artix Linux)|' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-    esac
-}
-
-#}}}
-
-#{{{ pkgbuild import
-
-sync_pkg(){
-    local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
-    local src="$1" dest="$2"
-    msg "Sync from Arch [%s] to Artix [%s]" "${src##*archlinux/}" "${dest##*artixlinux/}"
-    rsync "${rsync_args[@]}" "$src"/ "$dest"/
-}
-
-show_deps(){
-    local src="$1" archver
-
-    # shellcheck disable=1090
-    . "$src"/PKGBUILD 2>/dev/null
-
-    archver=$(get_full_version)
-
-    # shellcheck disable=2154
-    [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
-    # shellcheck disable=2154
-    msg2 "pkgname: %s" "${pkgname[*]}"
-    # shellcheck disable=2154
-    [[ -n "${pkgdesc}" ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
-    # shellcheck disable=2154
-    msg2 "Arch Version: %s" "$archver"
-    # shellcheck disable=2154
-    msg2 "arch: %s" "$arch"
-    # shellcheck disable=2154
-    [[ -n ${makedepends[*]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${checkdepends[*]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${depends[*]} ]] && msg2 "depends: %s" "${depends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${optdepends[*]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
-}
-
-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}"
-
-    repo=$(find_repo "$srcpath")
-    msg "repo: %s" "${repo#*/}"
-
-    archpath=$srcpath/$repo
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
-
-    show_deps "$archpath"
-
-    if [[ -f "$artixpath"/.gitrepo ]]; then
-        artixpath="$artixpath"/trunk
-
-        if [[ -d "$artixpath" ]];then
-            sync_pkg "$archpath" "$artixpath"
-            patch_pkg "$artixpath"
-        fi
-    else
-        die "Package '%s' does not exist!" "${PACKAGE}"
-    fi
-}
-
-#}}}
-
-view_build(){
-    local archpath repo
-    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#*/}"
-    show_deps "$archpath"
-}
-
-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}")
-    group=${artixpath%/*}
-    msg "group: %s" "${group##*/}"
-
-    [[ -z $artixpath ]] && msg2 "exists: %s" "no"
-    [[ -n $artixpath ]] && msg2 "exists: %s" "yes"
-}
-
-sync_repos(){
-    ${sync_arch} && pull_tree_arch
-    ${sync_artix} && pull_tree_artix
-}
-
-load_makepkg_config
-
-load_valid_names
-
-testing=true
-staging=true
-unstable=false
-
-sync=false
-sync_arch=true
-sync_artix=true
-import=false
-view=false
-createnew=false
-sync_group=false
-check=false
-
-PACKAGE=''
-
-TEAM='community'
-GROUP="${ARTIX_TREE[0]}"
-
-host_tree_artix="${GIT_SSH}:artixlinux"
-host_tree_arch='https://github.com/archlinux'
-
-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 ''
-    exit "$1"
-}
-
-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 ;;
-        s) sync=true ;;
-        a) sync_arch=false ;;
-        b) sync_artix=false ;;
-        i) import=true ;;
-        n) createnew=true ;;
-        c) check=true ;;
-        v) view=true ;;
-        x) testing=false ;;
-        y) staging=false ;;
-        z) unstable=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-set_arch_repos "$testing" "$staging" "$unstable"
-
-${sync} && sync_repos
-
-${view} && view_build
-
-${check} && check_tree
-
-${import} && from_arch
-
-${createnew} && subrepo_new
--- a/bin/pkg/checkpkg.in
+++ b/bin/pkg/checkpkg.in
@@ -12,78 +12,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}

-shopt -s extglob
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/pkg/diff.sh

 load_makepkg_config

-#{{{ functions
-
-pkgver_equal() {
-    if [[ $1 = *-* && $2 = *-* ]]; then
-        # if both versions have a pkgrel, then they must be an exact match
-        [[ $1 = "$2" ]]
-    else
-        # otherwise, trim any pkgrel and compare the bare version.
-        [[ ${1%%-*} = "${2%%-*}" ]]
-    fi
-}
-
-find_cached_package() {
-    local searchdirs=("$PKGDEST" "$PWD") results=()
-    local targetname=$1 targetver=$2 targetarch=$3
-    local dir pkg pkgbasename name ver rel arch r results
-
-    for dir in "${searchdirs[@]}"; do
-        [[ -d $dir ]] || continue
-
-        for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
-            [[ -f $pkg ]] || continue
-
-            # avoid adding duplicates of the same inode
-            for r in "${results[@]}"; do
-                [[ $r -ef $pkg ]] && continue 2
-            done
-
-            # split apart package filename into parts
-            pkgbasename=${pkg##*/}
-            pkgbasename=${pkgbasename%.pkg.tar*}
-
-            arch=${pkgbasename##*-}
-            pkgbasename=${pkgbasename%-"$arch"}
-
-            rel=${pkgbasename##*-}
-            pkgbasename=${pkgbasename%-"$rel"}
-
-            ver=${pkgbasename##*-}
-            name=${pkgbasename%-"$ver"}
-
-            if [[ $targetname = "$name" && $targetarch = "$arch" ]] &&
-                pkgver_equal "$targetver" "$ver-$rel"; then
-                results+=("$pkg")
-            fi
-        done
-    done
-
-    case ${#results[*]} in
-        0)
-            return 1
-        ;;
-        1)
-            printf '%s\n' "${results[0]}"
-            return 0
-        ;;
-        *)
-            error 'Multiple packages found:'
-            printf '\t%s\n' "${results[@]}" >&2
-            return 1
-        ;;
-    esac
-}
-
-#}}}
-
 usage() {
    cat <<- _EOF_
        Usage: ${BASH_SOURCE[0]##*/} [OPTIONS]
@@ -197,7 +132,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
@@ -12,171 +12,324 @@
 # 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)
-m4_include(lib/pkg/table.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}

-update_db_cache(){
-    msg "Updating database cache"
-    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"
+source "${LIBDIR}"/base/util.sh
+source "${LIBDIR}"/pkg/util.sh
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/pkg/table.sh
+
+#{{{ db libs
+
+# shopt -s extglob
+
+# load_valid_names(){
+#     local conf
+#     conf="${DATADIR}"/valid-names.conf
+#     [[ -f "$conf" ]] || return 1
+#     # shellcheck source=/usr/share/artools/valid-names.conf
+#     [[ -r "$conf" ]] && . "$conf"
+#     return 0
+# }
+
+# tree_loop(){
+#     local func="$1" pkgs
+#     for tree in "${ARTIX_TREE[@]}"; do
+#         mapfile -t pkgs < <(find "${TREE_DIR_ARTIX}/$tree" -name "$CARCH" | sort)
+#         for p in "${pkgs[@]}"; do
+#             "$func" "$p"
+#         done
+#     done
+# }
+#
+# show_db_table(){
+#     msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
+#     tree_loop check_db
+# }
+
+#{{{ check db
+
+# is_db_entry() {
+#     local pkgname="$1" repo="${REPOS[$2]}" entry
+#     entry=${db_cache_dir}/linksdb/$repo/$pkgname
+#
+#     if [[ -d "$entry" ]];then
+#         return 0
+#     fi
+#     return 1
+# }
+#
+# check_db(){
+#     local pkgpath="${1}"
+#
+#     for repo in "${!REPOS[@]}"; do
+#
+#         local pkgbuild artixver
+#         if [[ -f $pkgpath/$repo/PKGBUILD ]]; then
+#             pkgbuild=$pkgpath/$repo/PKGBUILD
+#
+#             # 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
+# }
+
+#}}}
+
+# {{{ 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
+#         fi
+#     done
+# }
+
+#}}}
+
+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_linksdb_cache(){
+    msg "Updating database cache ..."
+    local cachedir url
+    for repo in "${ARTIX_REPOS[@]}"; do
+        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}/
+    if ${sync}; then
+        update_linksdb_cache
+    fi
+    for repo in "${ARTIX_REPOS[@]}"; do
+        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
 }

 #}}}

-#{{{ check db
+update_db_cache() {
+    local arch_mirror='https://mirror.netcologne.de/archlinux'

-is_db_entry() {
-    local pkgname="$1" repo="${REPOS[$2]}"
+    for repo in ${searchrepos[@]}; do
+        local arch_repo
+        local artix_db
+        local arch_db
+        local artix_url
+        local arch_url
+        arch_repo=${REPOS[${repo}]}
+        artix_db=${db_cache_dir}/artixdb/${repo}
+        arch_db=${db_cache_dir}/archdb/${arch_repo}
+        artix_url=${REPOS_MIRROR}/${repo}/os/$CARCH/${repo}.${db_ext}
+        arch_url=${arch_mirror}/${arch_repo}/os/$CARCH/${arch_repo}.${db_ext}

-    if [[ -d ${db_cache_dir}/${linksdb_ext}/${CARCH}/$repo/$pkgname ]];then
-        return 0
-    fi
-    return 1
-}
-
-check_db(){
-    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
-
-        # 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 "${tableU}" "$repo" "$name" "$artixver" "false"
-            fi
-
-        done
-        unset artixver pkgbuild pkgver epoch pkgname pkgbase
+        msg "Updating database cache ..."
+        extract_db "${artix_url}" "${artix_db}"
+        extract_db "${arch_url}" "${arch_db}"
+        msg "Done"
    done
 }

-#}}}
+show_updates() {
+    if ${sync}; then
+        update_db_cache
+    fi
+
+    for repo in ${searchrepos[@]}; do
+        local arch_repo
+        local artix_db
+        local arch_db
+        arch_repo=${REPOS[${repo}]}
+        artix_db=${db_cache_dir}/artixdb/${repo}
+        arch_db=${db_cache_dir}/archdb/${arch_repo}
+
+        diff -ur $artix_db/ $arch_db/ | grep -A2 '%NAME%\|%VERSION%'
+    done
+}

 show_lib_table() {
    msg_table_header "${tableQ}" "Repo" "Package" "Library"
    query_db
 }

-show_db_table(){
-    msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
-    tree_loop check_db
-}
-
 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
+# check=false
 query=false
+updates=false

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

 #{{{ repo names arrays

-declare -A REPOS=(
-    [${valid_names[0]}]=system
-    [${valid_names[1]}]=world
-    [${valid_names[2]}]=galaxy
-    [${valid_names[3]}]=lib32
-    [${valid_names[4]}]=gremlins
-    [${valid_names[5]}]=galaxy-gremlins
-    [${valid_names[6]}]=lib32-gremlins
-    [${valid_names[7]}]=goblins
-    [${valid_names[8]}]=galaxy-goblins
-    [${valid_names[9]}]=lib32-goblins
-    [${valid_names[11]}]=kde-wobble
-    [${valid_names[12]}]=gnome-wobble
+searchrepos=(
+    system #0
+    world #1
+#     galaxy #2
+    lib32 #3
+    system-gremlins #4
+    world-gremlins #5
+#     galaxy-gremlins #6
+    lib32-gremlins #7
+    system-goblins #8
+    world-goblins #9
+#     galaxy-goblins #10
+    lib32-goblins #11
+#     system-rebuild #12
+#     world-rebuild #13
+#     gnome-wobble #14
+#     kde-wobble #15
 )

-searchrepos=(
-    "${REPOS[${valid_names[11]}]}"
-    "${REPOS[${valid_names[12]}]}"
-    "${REPOS[${valid_names[7]}]}"
-    "${REPOS[${valid_names[8]}]}"
-    "${REPOS[${valid_names[9]}]}"
-    "${REPOS[${valid_names[4]}]}"
-    "${REPOS[${valid_names[5]}]}"
-    "${REPOS[${valid_names[6]}]}"
-    "${REPOS[${valid_names[0]}]}"
-    "${REPOS[${valid_names[1]}]}"
-    "${REPOS[${valid_names[2]}]}"
-    "${REPOS[${valid_names[3]}]}"
+ARTIX_REPOS=(
+    system #0
+    world #1
+    galaxy #2
+    lib32 #3
+    system-gremlins #4
+    world-gremlins #5
+    galaxy-gremlins #6
+    lib32-gremlins #7
+    system-goblins #8
+    world-goblins #9
+    galaxy-goblins #10
+    lib32-goblins #11
+#     system-rebuild #12
+#     world-rebuild #13
+    gnome-wobble #14
+    kde-wobble #15
+)
+
+declare -A REPOS=(
+    [${searchrepos[0]}]=core
+    [${searchrepos[1]}]=extra
+#     [${searchrepos[2]}]=galaxy
+    [${searchrepos[2]}]=multilib
+    [${searchrepos[3]}]=core-testing
+    [${searchrepos[4]}]=extra-testing
+#     [${searchrepos[6]}]=galaxy-testing
+    [${searchrepos[5]}]=multilib-testing
+    [${searchrepos[6]}]=core-staging
+    [${searchrepos[7]}]=extra-staging
+#     [${searchrepos[10]}]=galaxy-staging
+    [${searchrepos[8]}]=multilib-staging
+#     [${searchrepos[14]}]=gnome-unstable
+#     [${searchrepos[15]}]=kde-unstable
 )

 #}}}

 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: ${0##*/} [options] [query library]\n"
+    printf "    -s            Sync repo databases\n"
+#     printf '    -c            Check repos\n'
+    printf "    -q            Query repo databases for so libs\n"
+    printf "    -u            Show updates\n"
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
    exit "$1"
 }
-
-opts='r:qcsh'
+#
+opts='squh'

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

-${sync} && update_db_cache
+# ${check} && show_db_table

-${check} && show_db_table
+if ${query}; then
+    show_lib_table
+fi

-${query} && show_lib_table
+if ${updates}; then
+    show_updates
+fi
--- a/bin/pkg/commitpkg.in
+++ b/bin/pkg/commitpkg.in
@@ -1,258 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 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/git.sh)
-m4_include(lib/pkg/repo.sh)
-
-#{{{ functions
-
-push_tree(){
-    local tree="$1"
-    msg "Update (%s)" "${tree}"
-    git push origin master
-}
-
-subrepo_push(){
-    local pkg="$1"
-    msg2 "Subrepo push (%s)" "$pkg"
-    git subrepo push "$pkg" || die "%s push failed" "$pkg"
-}
-
-subrepo_clean(){
-    local pkg="$1"
-    msg2 "Subrepo clean (%s)" "$pkg"
-    git subrepo clean "$pkg"
-}
-
-subrepo_pull(){
-    local pkg="$1"
-    msg2 "Subrepo pull (%s)" "$pkg"
-    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
-        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
-        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
-
-        local org
-        org=$(get_pkg_org "${PACKAGE}")
-        add_repo_to_team "${PACKAGE}" "$org" "${REPO_DEST}"
-        remove_repo_from_team "${PACKAGE}" "$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
-
-    # shellcheck disable=1090
-    . "$pkgbuild"
-}
-
-commit_pkg() {
-    local commit_msg pkg
-    if ${remove};then
-        action='remove'
-        if [[ "${REPO_SRC}" == 'trunk' ]];then
-            pkg=${PACKAGE}
-            git rm -r trunk
-        else
-            pkg="${PACKAGE}-$(get_full_version)"
-
-            prepare_commit
-
-            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}"
-        msg "Action: %s" "$commit_msg"
-        git add .
-    fi
-    git commit -m "$commit_msg"
-}
-
-repo_commit_pkg() {
-    local commit_msg
-    if [[ "${REPO_SRC}" == 'trunk' ]];then
-        action='add'
-
-        prepare_commit
-        check_rebuild
-
-        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}"
-    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}")
-    if [[ -n ${artixpath} ]];then
-        group=${artixpath%/*}
-        cd "${group}" || return
-        head=$(get_local_head)
-
-        cd "${artixpath}" || return
-
-        path_config
-
-        if [[ "${cmd}" == 'commitpkg' ]];then
-            commit_pkg
-        else
-            repo_commit_pkg
-        fi
-
-        cd "${group}" || return
-
-        ${push} && pull_tree "${group##*/}" "$head"
-#         subrepo_pull "${PACKAGE}"
-        subrepo_push "${PACKAGE}"
-        subrepo_clean "${PACKAGE}"
-
-        ${push} && push_tree "${group##*/}"
-
-        git prune
-
-        [[ "${cmd}" != 'commitpkg' ]] && check_team
-    else
-        die "Package '%s' does not exist!" "${PACKAGE}"
-    fi
-}
-
-is_valid_repo(){
-    local _valid=trunk
-    for repo in "${valid_names[@]}"; do
-        _valid=${repo:-}${repo:+|}$_valid
-    done
-    eval "case ${REPO_SRC} in
-        ${_valid}) return 0 ;;
-        *) return 1 ;;
-    esac"
-}
-
-#}}}
-
-load_makepkg_config
-
-load_valid_names
-
-REPO_SRC='trunk'
-PACKAGE=''
-remove=false
-push=false
-
-pkgbuild=trunk/PKGBUILD
-
-cmd=${0##*/}
-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 ''
-    exit "$1"
-}
-
-opts='p:s:urh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        s) REPO_SRC="$OPTARG" ;;
-        p) PACKAGE="$OPTARG" ;;
-        r) remove=true ;;
-        u) push=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-if is_valid_repo;then
-    run
-else
-    die "source repository '%s' is not valid!" "${REPO_SRC}"
-fi
--- a/bin/pkg/comparepkg.in
+++ b/bin/pkg/comparepkg.in
@@ -1,197 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 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)
-m4_include(lib/pkg/table.sh)
-
-
-#{{{ upgrades, downgrades, moves
-
-remove_list(){
-    local name="$1"
-    [[ -f "${TREE_DIR_ARTIX}"/$name.list ]] && rm "${TREE_DIR_ARTIX}"/"$name".list
-}
-
-write_list(){
-    local line="$1" name="$2"
-    printf "%s\n" "$line" >> "${TREE_DIR_ARTIX}"/"$name".list
-}
-
-compare_m(){
-    case ${artixrepo} in
-        *testing*|*staging*|*rebuild)
-            if [[ "${a}" == "${b}" ]] || [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
-                msg_row "${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
-            fi
-        ;;
-    esac
-}
-
-compare_u(){
-    if [ "$result" -eq -1 ];then
-        msg_row_upgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        write_list "${a}:$pkg" pkg_upgrades
-    fi
-}
-
-compare_d(){
-    if [ "$result" -eq 1 ];then
-        if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
-            msg_row_downgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        fi
-    fi
-}
-
-get_archpath(){
-    local pkg="$1" archpath
-
-    for tree in "${ARCH_TREE[@]}"; do
-        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && archpath=${TREE_DIR_ARCH}/$tree/$pkg
-    done
-    echo "$archpath"
-}
-
-pre_compare(){
-    local func="$1" pkgpath="$2" result group pkg
-    group="${pkgpath%/*}"
-    group=${group##*/}
-    pkg=${pkgpath##*/}
-
-    local artixrepo archrepo pkgbuild artixver archver archpath node a b
-    artixrepo=$(find_repo "$pkgpath")
-    pkgbuild=$pkgpath/$artixrepo/PKGBUILD
-
-    if [[ -f $pkgbuild ]]; then
-        # shellcheck disable=1090
-        . "$pkgbuild" 2>/dev/null
-        artixver=$(get_full_version)
-        archpath=$(get_archpath "$pkg")
-        archrepo=$(find_repo "${archpath}")
-        pkgbuild=$archpath/$archrepo/PKGBUILD
-        node=${artixrepo%/*}
-        a=${archrepo#*/} b=${artixrepo#*/}
-        a="${a%-*}"
-
-        [[ "$node" != "$CARCH" ]] && b=${b%-*}
-
-        if [[ -f "$pkgbuild" ]]; then
-            # shellcheck disable=1090
-            . "$pkgbuild" 2>/dev/null
-            archver=$(get_full_version)
-        fi
-
-        result=$(vercmp "$artixver" "$archver")
-
-        "$func"
-
-        unset epoch
-    fi
-}
-
-compare_upgrades(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_u "$pkgpath"
-}
-
-compare_downgrades(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_d "$pkgpath"
-}
-
-compare_move(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_m "$pkgpath"
-}
-
-#}}}
-
-show_compare_header(){
-    msg_table_header "${table}" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version" "Group"
-}
-
-show_upgrades_table(){
-    show_compare_header
-    remove_list pkg_upgrades
-    tree_loop compare_upgrades
-}
-
-show_downgrades_table(){
-    show_compare_header
-    tree_loop compare_downgrades
-}
-
-show_move_table(){
-    show_compare_header
-    remove_list pkg_moves
-    tree_loop compare_move
-}
-
-load_makepkg_config
-
-load_valid_names
-
-testing=true
-staging=true
-unstable=false
-
-upgrades=false
-downgrades=false
-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 ''
-    exit "$1"
-}
-
-opts='udmxyzh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        u) upgrades=true ;;
-        d) downgrades=true ;;
-        m) move=true ;;
-        x) testing=false ;;
-        y) staging=false ;;
-        z) unstable=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-set_arch_repos "$testing" "$staging" "$unstable"
-
-${move} && show_move_table
-
-${upgrades} && show_upgrades_table
-
-${downgrades} && show_downgrades_table
--- a/bin/pkg/deploypkg.in
+++ b/bin/pkg/deploypkg.in
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018-23 artoo@artixlinux.org
 # Copyright (C) 2018 Artix Linux Developers
 #
 # This program is free software; you can redistribute it and/or modify
@@ -12,12 +12,16 @@
 # 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/deploy.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}

-#{{{ functions
+source "${LIBDIR}"/base/util.sh
+source "${LIBDIR}"/pkg/util.sh
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/pkg/deploy.sh
+
+#{{{ deploy

 add(){
    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
@@ -29,9 +33,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(){
@@ -42,7 +46,9 @@ repo_action(){
    cd "$repo_path" || return
    if [[ -n "${action}" ]]; then
        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
-        ${linksdb} && links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
+        if ${linksdb}; then
+            links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
+        fi
    fi
 }

@@ -61,14 +67,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 +87,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 +97,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/diffpkg.in
+++ b/bin/pkg/diffpkg.in
@@ -0,0 +1,331 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/pkg/diff.sh
+
+usage() {
+    cat <<- _EOF_
+    Usage: ${BASH_SOURCE[0]##*/} [OPTIONS] [MODES] [FILE|PKGNAME...]
+
+    Searches for a locally built package corresponding to the PKGBUILD, and
+    downloads the last version of that package from the Pacman repositories.
+    It then compares the package archives using different modes while using
+    simple tar content list by default.
+
+    When given one package, use it to diff against the locally built one.
+    When given two packages, diff both packages against each other.
+
+    In either case, a package name will be converted to a filename from the
+    cache, and diffpkg will proceed as though this filename was initially
+    specified.
+
+    OPTIONS
+        -M, --makepkg-config Set an alternate makepkg configuration file
+        -v, --verbose        Provide more detailed/unfiltered output
+        -h, --help           Show this help text
+
+    MODES
+        -l, --list           Activate content list diff mode (default)
+        -d, --diffoscope     Activate diffoscope diff mode
+        -p, --pkginfo        Activate .PKGINFO diff mode
+        -b, --buildinfo      Activate .BUILDINFO diff mode
+_EOF_
+}
+
+MAKEPKG_CONF=/etc/makepkg.conf
+POOLDIR=/srv/pkgpool
+
+VERBOSE=0
+TARLIST=0
+DIFFOSCOPE=0
+PKGINFO=0
+BUILDINFO=0
+
+DIFFMODE=--side-by-side
+DIFFCOLOR=--color=auto
+DIFFWIDTH=--width=auto
+DIFFOPTIONS=(--expand-tabs)
+
+# option checking
+while (( $# )); do
+    case $1 in
+        -h|--help)
+            usage
+            exit 0
+        ;;
+        -M|--makepkg-config)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            MAKEPKG_CONF="$2"
+            shift 2
+        ;;
+        -l|--list)
+            TARLIST=1
+            shift
+        ;;
+        -d|--diffoscope)
+            DIFFOSCOPE=1
+            shift
+        ;;
+        -p|--pkginfo)
+            PKGINFO=1
+            shift
+        ;;
+        -b|--buildinfo)
+            BUILDINFO=1
+            shift
+        ;;
+        -v|--verbose)
+            VERBOSE=1
+            shift
+        ;;
+        -u|-U|--unified)
+            DIFFMODE=--unified
+            shift
+        ;;
+        -y|--side-by-side)
+            DIFFMODE=--side-by-side
+            shift
+        ;;
+        --color|--color=*)
+            if [[ $2 == never || $2 == always || $2 == auto ]]; then
+                DIFFCOLOR="--color=$2"
+                shift 2
+                continue
+            fi
+            if [[ $1 == --color ]]; then
+                DIFFCOLOR="--color=auto"
+            else
+                DIFFCOLOR="$1"
+            fi
+            shift
+        ;;
+        -W|--width)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            DIFFWIDTH="--width=$2"
+            shift 2
+        ;;
+        --width=*)
+            DIFFWIDTH="$1"
+            shift
+        ;;
+        -P|--pool)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            POOLDIR="$2"
+            shift 2
+        ;;
+        --pool=*)
+            POOLDIR="${1#*=}"
+            shift
+        ;;
+        --)
+            shift
+            break
+        ;;
+        -*|--*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            break
+        ;;
+    esac
+done
+
+# Set options based on flags or magic values
+if (( VERBOSE )); then
+    if [[ $DIFFMODE == --unified ]]; then
+        DIFFMODE="--unified=99999"
+    fi
+else
+    DIFFOPTIONS+=(--suppress-common-lines)
+fi
+if [[ $DIFFWIDTH == --width=columns ]]; then
+    DIFFWIDTH="--width=${COLUMNS:-130}"
+fi
+if [[ $DIFFWIDTH != --width=auto ]]; then
+    DIFFOPTIONS+=("${DIFFWIDTH}")
+fi
+DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
+
+if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
+    TARLIST=1
+fi
+
+# Source makepkg.conf; fail if it is not found
+if [[ -r "${MAKEPKG_CONF}" ]]; then
+    # shellcheck source=config/makepkg/x86_64.conf
+    source "${MAKEPKG_CONF}"
+else
+    die "${MAKEPKG_CONF} not found!"
+fi
+
+# Source user-specific makepkg.conf overrides
+if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
+    # shellcheck source=/dev/null
+    source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
+elif [[ -r "$HOME/.makepkg.conf" ]]; then
+    # shellcheck source=/dev/null
+    source "$HOME/.makepkg.conf"
+fi
+
+STARTDIR=$(pwd)
+trap 'rm -rf $TMPDIR' EXIT INT TERM QUIT
+TMPDIR=$(mktemp -d --tmpdir diffpkg-script.XXXXXXXX)
+export TMPDIR
+
+tar_list() {
+    bsdtar tf "$*" | if (( VERBOSE )); then
+        cat
+    else
+        sed -E 's|^usr/lib/modules/[0-9][^/]+|usr/lib/modules/[…]|g'
+    fi | sort
+}
+
+file_line_length() {
+    path="$1"
+    wc -L "${path}" | tail -n1 | sed -E 's/^ +//g' | cut -d' ' -f1
+}
+
+file_diff_columns() {
+    file1="$1"
+    file2="$2"
+    file1_length=$(file_line_length "$file1")
+    file2_length=$(file_line_length "$file2")
+    echo $(( file1_length + file2_length + 3 ))
+}
+
+diff_pkgs() {
+    local oldpkg newpkg
+    oldpkg=$(readlink -m "$1")
+    newpkg=$(readlink -m "$2")
+
+    [[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
+    [[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"
+
+    DIFFOPTIONS+=(--label "${oldpkg}" --label "${newpkg}")
+
+    if (( TARLIST )); then
+        tar_list "$oldpkg" > "$TMPDIR/old"
+        tar_list "$newpkg" > "$TMPDIR/new"
+    fi
+
+    if (( PKGINFO )); then
+        bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/old"
+        bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/new"
+    fi
+
+    if (( BUILDINFO )); then
+        bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/old"
+        bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
+    fi
+
+    if (( TARLIST || PKGINFO || BUILDINFO )); then
+    # Resolve dynamic auto width one we know the content to diff
+        if [[ $DIFFWIDTH == --width=auto ]]; then
+            AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
+            DIFFOPTIONS+=("--width=${AUTOLENGTH}")
+        fi
+
+        # Print a header for side-by-side view as it lacks labels
+        if [[ $DIFFMODE == --side-by-side ]]; then
+            printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
+        fi
+
+        diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"
+    fi
+
+    if (( DIFFOSCOPE )); then
+        diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
+    fi
+}
+
+shopt -s extglob
+
+fetch_pkg() {
+    local pkg pkgdest pkgurl
+    case $1 in
+        *://*)
+            pkgurl=$1 ;;
+        /*|*/*)
+            pkgurl=$(readlink -m "$1") ;;
+        *.pkg.tar*)
+            pkgurl=$1 ;;
+        '')
+        ;;
+        *)
+            pkg=$1 ;;
+    esac
+
+    if [[ -z ${pkgurl} ]]; then
+        # Try to find latest package in pool dir
+        if [[ -d ${POOLDIR} ]]; then
+            shopt -s extglob nullglob
+            pkgurl=$(printf "%s\n" "${POOLDIR}"/*/"${_pkgname}"-!(*-*)-!(*-*)-!(*-*).pkg.tar!(*.sig)|sort -Vr|head -1)
+            shopt -u extglob nullglob
+        fi
+        # Search via pacman database if no pool file exists
+        if [[ ! -f ${pkgurl} ]]; then
+            pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
+            die "Couldn't download previous package for %s." "$pkg"
+        fi
+    fi
+
+    pkg=${pkgurl##*/}
+    pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
+
+    if [[ $pkgurl = file://* || ( $pkgurl = /* && -f $pkgurl ) ]]; then
+        ln -sf "${pkgurl#file://}" "$pkgdest"
+    elif [[ -f "$PKGDEST/$pkg" ]]; then
+        ln -sf "$PKGDEST/$pkg" "$pkgdest"
+    elif [[ -f "$STARTDIR/$pkg" ]]; then
+        ln -sf "$STARTDIR/$pkg" "$pkgdest"
+    elif [[ $pkgurl = *://* ]]; then
+        curl -fsLC - --retry 3 --retry-delay 3 -o "$pkgdest" "$pkgurl" || \
+        die "Couldn't download %s" "$pkgurl"
+    else
+        die "File not found: %s" "$pkgurl"
+    fi
+
+    echo "$pkgdest"
+}
+
+shopt -u extglob
+
+if (( $# < 2 )); then
+    if [[ ! -f PKGBUILD ]]; then
+        die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."
+    fi
+
+    # shellcheck source=contrib/makepkg/PKGBUILD.proto
+    . ./PKGBUILD
+    if [[ ${arch[0]} == 'any' ]]; then
+        CARCH='any'
+    fi
+
+    for _pkgname in "${pkgname[@]}"; do
+        comparepkg=$_pkgname
+        pkgurl=
+        target_pkgver=$(get_full_version "$_pkgname")
+        if ! pkgfile=$(find_cached_package "$_pkgname" "$target_pkgver" "$CARCH"); then
+            die 'tarball not found for package: %s' "${_pkgname}-$target_pkgver"
+        fi
+
+        ln -s "$pkgfile" "$TMPDIR"
+
+        if (( $# )); then
+            comparepkg="$1"
+        fi
+
+        oldpkg=$(fetch_pkg "$comparepkg") || exit 1
+
+        diff_pkgs "$oldpkg" "$pkgfile"
+    done
+else
+    file1=$(fetch_pkg "$1") || exit 1
+    file2=$(fetch_pkg "$2") || exit 1
+
+    diff_pkgs "$file1" "$file2"
+fi
--- a/bin/pkg/export-pkgbuild-keys.in
+++ b/bin/pkg/export-pkgbuild-keys.in
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+
+usage() {
+    cat <<- _EOF_
+        Usage: ${BASH_SOURCE[0]##*/}
+
+        Export the PGP keys from a PKGBUILDs validpgpkeys array into the keys/pgp/
+        subdirectory. Useful for distributing packager validated source signing
+        keys alongside PKGBUILDs.
+
+        OPTIONS
+            -h, --help      Show this help text
+_EOF_
+}
+
+# option checking
+while (( $# )); do
+    case $1 in
+        -h|--help) usage; exit 0 ;;
+        *) die "invalid argument: %s" "$1" ;;
+    esac
+done
+
+if [[ ! -f PKGBUILD ]]; then
+    die "This must be run a directory containing a PKGBUILD."
+fi
+
+mapfile -t validpgpkeys < <(
+    # shellcheck source=PKGBUILD.proto
+    . ./PKGBUILD
+    if (( ${#validpgpkeys[@]} )); then
+        printf "%s\n" "${validpgpkeys[@]}"
+    fi
+)
+
+msg "Exporting ${#validpgpkeys[@]} PGP keys..."
+if (( ${#validpgpkeys[@]} == 0 )); then
+    exit 0
+fi
+
+trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
+
+mkdir -p keys/pgp
+error=0
+
+for key in "${validpgpkeys[@]}"; do
+    gpg --output "$TEMPDIR/$key.asc" --armor --export --export-options export-minimal "$key" 2>/dev/null
+
+    # gpg does not give a non-zero return value if it fails to export...
+    if [[ -f $TEMPDIR/$key.asc ]]; then
+        msg2 "Exported $key"
+        mv "$TEMPDIR/$key.asc" "keys/pgp/$key.asc"
+    else
+        if [[ -f keys/pgp/$key.asc ]]; then
+            warning "Failed to update key: $key"
+        else
+            error "Key unavailable: $key"
+            error=1
+        fi
+    fi
+done
+
+if (( error )); then
+    die "Failed to export all \'validpgpkeys\' entries."
+fi
--- a/bin/pkg/find-libdeps.in
+++ b/bin/pkg/find-libdeps.in
@@ -12,10 +12,11 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh

 set -e
-shopt -s extglob

 IGNORE_INTERNAL=0

@@ -32,9 +33,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

@@ -51,9 +52,13 @@ else
    pushd "$WORKDIR" >/dev/null
 fi

+shopt -s extglob
+
 process_sofile() {
    # extract the library name: libfoo.so
+    shopt -s extglob nullglob
    soname="${sofile%.so?(+(.+([0-9])))}".so
+    shopt -u extglob nullglob
    # extract the major version: 1
    soversion="${sofile##*\.so\.}"
    if [[ "$soversion" = "$sofile" ]] && ((IGNORE_INTERNAL)); then
@@ -61,11 +66,13 @@ 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
 }

+shopt -u extglob
+
 case $script_mode in
    deps) find_args=(-perm -u+x);;
    provides) find_args=(-name '*.so*');;
--- a/bin/pkg/finddeps.in
+++ b/bin/pkg/finddeps.in
@@ -12,16 +12,18 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/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/lddd.in
+++ b/bin/pkg/lddd.in
@@ -12,7 +12,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh

 ifs=$IFS
 IFS="${IFS}:"
@@ -40,7 +42,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
@@ -19,7 +19,9 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.

-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh

 shopt -s extglob

@@ -35,7 +37,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 +54,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 +89,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 +103,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 +121,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 +155,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 +193,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 +212,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 +240,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 +260,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 +377,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 +385,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 +401,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 +455,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 +472,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/makerepropkg.in
+++ b/bin/pkg/makerepropkg.in
@@ -0,0 +1,275 @@
+#!/bin/bash
+#
+# makerepropkg - rebuild a package to see if it is reproducible
+#
+# Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+source "${LIBDIR}"/base/util.sh
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/chroot.sh
+
+declare -A buildinfo
+declare -a buildenv buildopts installed installpkgs
+
+archiveurl='https://archive.artixlinux.org/packages'
+buildroot="${CHROOTS_DIR}"/reproducible
+diffoscope=0
+
+chroot=$USER
+[[ -n ${SUDO_USER:-} ]] && chroot=$SUDO_USER
+[[ -z "$chroot" || $chroot = root ]] && chroot=copy
+
+parse_buildinfo() {
+    local line var val
+
+    while read -r line; do
+        var="${line%% = *}"
+        val="${line#* = }"
+        case ${var} in
+            buildenv)
+                buildenv+=("${val}")
+                ;;
+            options)
+                buildopts+=("${val}")
+                ;;
+            installed)
+                installed+=("${val}")
+                ;;
+            *)
+                buildinfo["${var}"]="${val}"
+                ;;
+        esac
+    done
+}
+
+get_pkgfile() {
+    local cdir=${cache_dirs[0]}
+    local pkgfilebase=${1}
+    local mode=${2}
+    local pkgname=${pkgfilebase%-*-*-*}
+    local pkgfile ext
+
+    # try without downloading
+    if [[ ${mode} != localonly ]] && get_pkgfile "${pkgfilebase}" localonly; then
+        return 0
+    fi
+
+    for ext in .zst .xz ''; do
+        pkgfile=${pkgfilebase}.pkg.tar${ext}
+
+        for c in "${cache_dirs[@]}"; do
+            if [[ -f ${c}/${pkgfile} ]]; then
+                cdir=${c}
+                break
+            fi
+        done
+
+        for f in "${pkgfile}" "${pkgfile}.sig"; do
+            if [[ ! -f "${cdir}/${f}" ]]; then
+                if [[ ${mode} = localonly ]]; then
+                    continue 2
+                fi
+                msg2 "retrieving '%s'..." "${f}" >&2
+                curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2
+            fi
+        done
+        printf '%s\n' "file://${cdir}/${pkgfile}"
+        return 0
+    done
+
+    return 1
+}
+
+get_makepkg_conf() {
+    local fname=${1}
+    local arch="${2}"
+    local makepkg_conf="${3}"
+    if ! buildtool_file=$(get_pkgfile "${fname}"); then
+        error "failed to retrieve ${fname}"
+        return 1
+    fi
+    msg2 "using makepkg.conf from ${fname}"
+    bsdtar xOqf "${buildtool_file/file:\/\//}" usr/share/artools/makepkg.conf.d/${arch}.conf > "${makepkg_conf}"
+    return 0
+}
+
+usage() {
+    cat << __EOF__
+    usage: ${BASH_SOURCE[0]##*/} [options] <package_file>
+
+    Run this script in a PKGBUILD dir to build a package inside a
+    clean chroot while attempting to reproduce it. The package file
+    will be used to derive metadata needed for reproducing the
+    package, including the .PKGINFO as well as the buildinfo.
+
+    For more details see https://reproducible-builds.org/
+
+    OPTIONS
+        -d            Run diffoscope if the package is unreproducible
+        -c <dir>      Set pacman cache
+        -M <file>     Location of a makepkg config file
+        -l <chroot>   The directory name to use as the chroot namespace
+                    Useful for maintaining multiple copies
+                    Default: $chroot
+        -h            Show this usage message
+__EOF__
+}
+
+while getopts 'dM:c:l:h' arg; do
+    case "$arg" in
+        d) diffoscope=1 ;;
+        M) artixroot_args+=(-M "$OPTARG") ;;
+        c) cache_dirs+=("$OPTARG") ;;
+        l) chroot="$OPTARG" ;;
+        h) usage; exit 0 ;;
+        *|?) usage; exit 1 ;;
+    esac
+done
+shift $((OPTIND - 1))
+
+check_root
+
+[[ -f PKGBUILD ]] || { error "No PKGBUILD in current directory."; exit 1; }
+
+# without arguments, get list of packages from PKGBUILD
+if [[ -z $1 ]]; then
+    mapfile -t pkgnames < <(source PKGBUILD; pacman -Sddp --print-format '%r/%n' "${pkgname[@]}")
+    wait $! || {
+        error "No package file specified and failed to retrieve package names from './PKGBUILD'."
+        plain "Try '${BASH_SOURCE[0]##*/} -h' for more information." >&2
+        exit 1
+    }
+    msg "Reproducing all pkgnames listed in ./PKGBUILD"
+    set -- "${pkgnames[@]}"
+fi
+
+# check each package to see if it's a file, and if not, try to download it
+# using pacman -Sw, and get the filename from there
+splitpkgs=()
+for p in "$@"; do
+    if [[ -f ${p} ]]; then
+        splitpkgs+=("${p}")
+    else
+        pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null) || { error "package name '%s' not in repos" "${p}"; exit 1; }
+        pkgfile=${pkgfile_remote#file://}
+        if [[ ! -f ${pkgfile} ]]; then
+            msg "Downloading package '%s' into pacman's cache" "${pkgfile}"
+            sudo pacman -Swdd --noconfirm --logfile /dev/null "${p}" || exit 1
+            pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null)
+            pkgfile="${pkgfile_remote#file://}"
+        fi
+        splitpkgs+=("${pkgfile}")
+    fi
+done
+
+for f in "${splitpkgs[@]}"; do
+    if ! bsdtar -tqf "${f}" .BUILDINFO >/dev/null 2>&1; then
+        error "file is not a valid pacman package: '%s'" "${f}"
+        exit 1
+    fi
+done
+
+if (( ${#cache_dirs[@]} == 0 )); then
+	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+fi
+
+ORIG_HOME=${HOME}
+IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
+load_makepkg_config
+HOME=${ORIG_HOME}
+[[ -d ${SRCDEST} ]] || SRCDEST=${PWD}
+
+parse_buildinfo < <(bsdtar -xOqf "${splitpkgs[0]}" .BUILDINFO)
+export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
+PACKAGER="${buildinfo[packager]}"
+BUILDDIR="${buildinfo[builddir]}"
+BUILDTOOL="${buildinfo[buildtool]}"
+BUILDTOOLVER="${buildinfo[buildtoolver]}"
+PKGEXT=${splitpkgs[0]#${splitpkgs[0]%.pkg.tar*}}
+
+# nuke and restore reproducible testenv
+namespace="$buildroot/$chroot"
+lock 9 "${namespace}.lock" "Locking chroot namespace '%s'" "${namespace}"
+for copy in "${namespace}"/*/; do
+    [[ -d ${copy} ]] || continue
+    subvolume_delete_recursive "${copy}"
+done
+rm -rf --one-file-system "${namespace}"
+(umask 0022; mkdir -p "${namespace}")
+
+for fname in "${installed[@]}"; do
+    if ! allpkgfiles+=("$(get_pkgfile "${fname}")"); then
+        error "failed to retrieve ${fname}"
+        exit 1
+    fi
+done
+
+trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
+
+makepkg_conf="${TEMPDIR}/makepkg.conf"
+# anything before buildtool support is pinned to the last none buildtool aware release
+if [[ -z "${BUILDTOOL}" ]]; then
+    get_makepkg_conf "artools-pkg-0.28.2-1-any" "${CARCH}" "${makepkg_conf}" || exit 1
+# prefere to assume artools-pkg up until matching makepkg version so repository packages remain reproducible
+elif [[ "${BUILDTOOL}" = makepkg ]] && (( $(vercmp "${BUILDTOOLVER}" 6.0.1) <= 0 )); then
+    get_makepkg_conf "artools-pkg-0.28.2-1-any" "${CARCH}" "${makepkg_conf}" || exit 1
+# all artools-pkg builds
+elif [[ "${BUILDTOOL}" = artools-pkg ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
+    true
+# fallback to current makepkg.conf
+else
+    warning "Unknown buildtool (${BUILDTOOL}-${BUILDTOOLVER}), using fallback"
+    makepkg_conf="${DATADIR}"/makepkg.conf
+fi
+printf '%s\n' "${allpkgfiles[@]}" | mkchroot -M "${makepkg_conf}" -U "${artixroot_args[@]}" "${namespace}/root" - || exit 1
+
+# use makechrootpkg to prep the build directory
+mkchrootpkg -r "${namespace}" -l build -- --packagelist || exit 1
+
+# set detected makepkg.conf options
+{
+    for var in PACKAGER BUILDDIR BUILDTOOL BUILDTOOLVER PKGEXT; do
+        printf '%s=%s\n' "${var}" "${!var@Q}"
+    done
+    printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
+    printf 'BUILDENV=(%s)\n' "${buildenv[*]@Q}"
+} >> "${namespace}/build"/etc/makepkg.conf
+install -d -o "${SUDO_UID:-$UID}" -g "$(id -g "${SUDO_UID:-$UID}")" "${namespace}/build/${BUILDDIR}"
+
+bindmounts+=("-B:${PWD}:/startdir" "-B:${SRCDEST}:/srcdest")
+
+# kick off the build
+chroot-run \
+    -b "${bindmounts[*]}" \
+    "${namespace}/build" \
+    /chrootbuild -C --noconfirm --log --holdver --skipinteg
+ret=$?
+
+if (( ${ret} == 0 )); then
+    msg2 "built succeeded! built packages can be found in ${namespace}/build/pkgdest"
+    msg "comparing artifacts..."
+
+    for pkgfile in "${splitpkgs[@]}"; do
+        comparefiles=("${pkgfile}" "${namespace}/build/pkgdest/${pkgfile##*/}")
+        if cmp -s "${comparefiles[@]}"; then
+            msg2 "Package '%s' successfully reproduced!" "${pkgfile}"
+        else
+            ret=1
+            warning "Package '%s' is not reproducible. :(" "${pkgfile}"
+            sha256sum "${comparefiles[@]}"
+            if (( diffoscope )); then
+                diffoscope "${comparefiles[@]}"
+            fi
+        fi
+    done
+fi
+
+# return failure from chrootbuild, or the reproducibility status
+exit ${ret}
--- a/bin/pkg/mkchrootpkg.in
+++ b/bin/pkg/mkchrootpkg.in
@@ -12,8 +12,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/base/chroot.sh
+
+export BUILDTOOL=artools-pkg
+export BUILDTOOLVER=m4_artools_pkg_version

 shopt -s nullglob

@@ -32,7 +37,6 @@ clean_first=0
 run_namcap=0
 run_checkpkg=0
 temp_chroot=0
-run_nocheck=0

 bindmounts=()

@@ -42,43 +46,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 +184,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 +198,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 +225,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 +241,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 +251,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 +278,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 +303,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 +315,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")
@@ -318,13 +331,14 @@ fi
 # Pass all arguments after -- right to makepkg
 makepkg_args+=("${@:$OPTIND}")

-# See if -R or -e was passed to makepkg
+# See if -R, -e or -A was passed to makepkg
 for arg in "${@:$OPTIND}"; do
    case ${arg%%=*} in
-        --skip*|--holdver) verifysource_args+=("$arg") ;;
+        --skip*|--holdver|--ignorearch) verifysource_args+=("$arg") ;;
        --repackage|--noextract) keepbuilddir=1 ;;
        --*) ;;
-        -*R*|-*e*) keepbuilddir=1 ;;
+        -*A*) verifysource_args+=(-A) ;;&
+        -*R*|-*e*) keepbuilddir=1 ;;&
    esac
 done

@@ -380,6 +394,7 @@ then
    move_products
 else
    (( ret += 1 ))
+    move_logfiles
 fi

 (( temp_chroot )) && delete_chroot "$copydir" "$copy"
--- a/bin/pkg/mkdepgraph.in
+++ b/bin/pkg/mkdepgraph.in
@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 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.
+
+mk_tree_graph(){
+    printf "%s\n" "$(pactree "${tree_args[@]}" "${package}")" \
+        | dot -T "${ext}" > "${graph_dir}/${package}.${ext}"
+}
+
+mk_rebuild_graph(){
+    local tmpfile
+    tmpfile=/tmp/rebuild.dot
+    rebuild_args+=(-d "${tmpfile}")
+    artix-rebuild-order "${packages[@]}" "${rebuild_args[@]}"
+    dot -T "${ext}" "${tmpfile}" > "${graph_dir}/rebuild.${ext}"
+    rm -f "${tmpfile}"
+}
+
+usage() {
+    printf "Usage: %s [options] <package|packages>\n" "${0##*/}"
+    printf "    -m <tree|rebuild>    default mode: [%s]\n" "$mode"
+    printf "                         rebuild mode accepts packages input\n"
+    printf "    -r                   list packages that depend on the named package (tree)\n"
+    printf "    -u                   show dependencies with no duplicates  (tree)\n"
+    printf "    -d <#>               limit the depth of recursion  (tree)\n"
+    printf "                         default: [%s]\n" "$depth"
+    printf "    -o <#>               controls at which depth to stop printing optional deps\n"
+    printf "                         default: [%s]\n" "$optdepth"
+    printf "                         (-1 for no limit)  (tree)\n"
+    printf "    -i                   only use the pkgnames provided as input (rebuild)\n"
+    printf "    -h                   display this help message\n"
+    exit "$1"
+}
+
+graph_dir=${XDG_PICTURES_DIR:-$(xdg-user-dir PICTURES)/artix}
+ext="png"
+
+mode=tree
+
+tree_args=(-gs)
+rebuild_args=()
+
+depth=0
+optdepth=-1
+
+opts=':m:d:o:iruh'
+
+while getopts "$opts" arg; do
+    case "${arg}" in
+        m) mode="$OPTARG" ;;
+        r) tree_args+=(-r) ;;
+        u) tree_args+=(-ul) ;;
+        d) depth="$OPTARG"; tree_args+=(-d "$depth") ;;
+        o) optdepth="$OPTARG"; tree_args+=(-o"$optdepth") ;;
+        i) rebuild_args+=(--no-reverse-depends) ;;
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+[[ -d "${graph_dir}" ]] || mkdir -p "${graph_dir}"
+
+case "$mode" in
+    tree) package=("$@"); mk_tree_graph ;;
+    rebuild) packages=("$@"); mk_rebuild_graph ;;
+    *) usage 1 ;;
+esac
--- a/bin/pkg/pkg2yaml.in
+++ b/bin/pkg/pkg2yaml.in
@@ -12,11 +12,31 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
-m4_include(lib/base/yaml.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/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 +128,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 +148,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 +169,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 +177,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/signpkg.in
+++ b/bin/pkg/signpkg.in
@@ -12,8 +12,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/deploy.sh)
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+
+source "${LIBDIR}"/base/message.sh
+source "${LIBDIR}"/pkg/deploy.sh

 load_makepkg_config

--- 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
@@ -7,32 +7,15 @@

 # TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux

-# customize buildtree; uncomment to include
-# TREE_NAMES_ARTIX=(
-#         packages-kernel
-#         packages-openrc
-#         packages-runit
-#         packages-s6
-#         packages-python
-#         packages-perl
-#         packages-java
-#         packages-ruby
-#         packages-kf5
-#         packages-plasma
-#         packages-kde
-#         packages-gnome
-#         packages-cinnamon
-#         packages-lxqt
-#         packages-mate
-#         packages-xfce
-#         packages-wm
-#         packages-devel
-#         packages-lib32
-#         packages-qt6
+# customize buildtree
+# ARTIX_TREE=(
+#     main
+#     initsys
+#     desktop
+#     addons
+#     lib32
 # )

-# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
-
 # default repos root for deploypkg
 # REPOS_ROOT=${WORKSPACE_DIR}/repos

--- a/data/makepkg/x86_64.conf
+++ b/data/makepkg/x86_64.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,26 @@ 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"
+LTOFLAGS="-flto=auto"
+RUSTFLAGS=""
 #-- 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="$DEBUG_CFLAGS"
+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 +81,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 +92,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 +153,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
@@ -68,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.

-#[gremlins]
+#[system-gremlins]
 #Include = /etc/pacman.d/mirrorlist

 [system]
 Include = /etc/pacman.d/mirrorlist

+#[world-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist

@@ -83,15 +88,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-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
@@ -71,15 +73,21 @@ LocalFileSigLevel = Optional
 [gnome-wobble]
 Include = /etc/pacman.d/mirrorlist

-[goblins]
+[system-goblins]
 Include = /etc/pacman.d/mirrorlist

-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist

 [system]
 Include = /etc/pacman.d/mirrorlist

+[world-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist

@@ -92,18 +100,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
@@ -68,15 +70,21 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.

-[goblins]
+[system-goblins]
 Include = /etc/pacman.d/mirrorlist

-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist

 [system]
 Include = /etc/pacman.d/mirrorlist

+[world-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist

@@ -89,18 +97,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-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
@@ -68,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.

-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist

 [system]
 Include = /etc/pacman.d/mirrorlist

+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist

@@ -83,15 +88,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
@@ -71,15 +73,21 @@ LocalFileSigLevel = Optional
 [kde-wobble]
 Include = /etc/pacman.d/mirrorlist

-[goblins]
+[system-goblins]
 Include = /etc/pacman.d/mirrorlist

-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist

 [system]
 Include = /etc/pacman.d/mirrorlist

+[world-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist

@@ -92,18 +100,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/lib32-goblins.conf
+++ b/data/pacman/lib32-goblins.conf
@@ -0,0 +1,116 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+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.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# 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 artix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[system-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[system-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+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]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
--- 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
@@ -68,19 +70,16 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.

-[goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist

 [system]
 Include = /etc/pacman.d/mirrorlist

-[world]
+[world-gremlins]
 Include = /etc/pacman.d/mirrorlist

-[galaxy-goblins]
+[world]
 Include = /etc/pacman.d/mirrorlist

 [galaxy-gremlins]
@@ -92,9 +91,6 @@ 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

--- 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
@@ -68,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.

-#[gremlins]
+#[system-gremlins]
 #Include = /etc/pacman.d/mirrorlist

 [system]
 Include = /etc/pacman.d/mirrorlist

+#[world-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist

--- a/data/pacman/pacman-docker.conf
+++ b/data/pacman/pacman-docker.conf
@@ -1,111 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-NoExtract  = usr/share/help/* !usr/share/help/en*
-NoExtract  = usr/share/gtk-doc/html/* usr/share/doc/*
-NoExtract  = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
-NoExtract   = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
-NoExtract   = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
-NoExtract   = !usr/share/*locales/trans*
-NoExtract  = usr/share/man/* usr/share/info/*
-NoExtract  = usr/share/vim/vim*/lang/*
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-VerbosePkgLists
-
-
-# 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.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# 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`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-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]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[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-gremlins.conf
+++ b/data/pacman/pacman-gremlins.conf
@@ -1,99 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-VerbosePkgLists
-
-# 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.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# 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`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-gremlins]
-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]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
--- a/data/patches/artix-bash.patch
+++ b/data/patches/artix-bash.patch
@@ -1,87 +0,0 @@
--- /dev/null
-+++ b/artix.bashrc
-@@ -0,0 +1,46 @@
-+use_color=true
-+
-+# Set colorful PS1 only on colorful terminals.
-+# dircolors --print-database uses its own built-in database
-+# instead of using /etc/DIR_COLORS.  Try to use the external file
-+# first to take advantage of user additions.  Use internal bash
-+# globbing instead of external grep binary.
-+safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
-+match_lhs=""
-+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
-+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
-+[[ -z ${match_lhs}    ]] \
-+	&& type -P dircolors >/dev/null \
-+	&& match_lhs=$(dircolors --print-database)
-+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
-+
-+if ${use_color} ; then
-+	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
-+	if type -P dircolors >/dev/null ; then
-+		if [[ -f ~/.dir_colors ]] ; then
-+			eval $(dircolors -b ~/.dir_colors)
-+		elif [[ -f /etc/DIR_COLORS ]] ; then
-+			eval $(dircolors -b /etc/DIR_COLORS)
-+		fi
-+	fi
-+
-+	if [[ ${EUID} == 0 ]] ; then
-+		PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
-+	else
-+		PS1='\[\033[01;36m\][\u@\h\[\033[01;37m\] \W\[\033[01;36m\]]\$\[\033[00m\] '
-+	fi
-+
-+	alias ls='ls --color=auto'
-+	alias grep='grep --colour=auto'
-+	alias egrep='egrep --colour=auto'
-+	alias fgrep='fgrep --colour=auto'
-+else
-+	if [[ ${EUID} == 0 ]] ; then
-+		# show root@ when we don't have colors
-+		PS1='\u@\h \W \$ '
-+	else
-+		PS1='\u@\h \w \$ '
-+	fi
-+fi
-+
-+unset use_color safe_term match_lhs sh
--- a/dot.bashrc
-+++ b/dot.bashrc
-@@ -5,5 +5,5 @@
- # If not running interactively, don't do anything
- [[ $- != *i* ]] && return
-
-alias ls='ls --color=auto'
-PS1='[\u@\h \W]\$ '
-+# alias ls='ls --color=auto'
-+# PS1='[\u@\h \W]\$ '
-
--- a/system.bashrc
-+++ a/system.bashrc
-@@ -1,5 +1,5 @@
- #
-# /etc/bash.bashrc
-+# /etc/bash/bashrc
- #
-
- # If not running interactively, don't do anything
-@@ -19,4 +19,8 @@
-     ;;
- esac
-
-+for sh in /etc/bash/bashrc.d/*.bashrc ; do
-+	[[ -r ${sh} ]] && source "${sh}"
-+done
-+
- [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
-
--- a/system.bash_logout
-+++ a/system.bash_logout
-@@ -1,3 +1,3 @@
- #
-# /etc/bash.bash_logout
-+# /etc/bash/bash_logout
- #
-
--- a/data/valid-names.conf
+++ b/data/valid-names.conf
@@ -1,42 +0,0 @@
-#!/hint/bash
-
-valid_names=(
-    core
-    extra
-    community
-    multilib
-    testing
-    community-testing
-    multilib-testing
-    staging
-    community-staging
-    multilib-staging
-    rebuild
-    gnome-unstable
-    kde-unstable
-)
-
-stable=(
-    "${valid_names[0]}"
-    "${valid_names[1]}"
-    "${valid_names[2]}"
-    "${valid_names[3]}"
-)
-
-gremlins=(
-    "${valid_names[4]}"
-    "${valid_names[5]}"
-    "${valid_names[6]}"
-)
-
-goblins=(
-    "${valid_names[7]}"
-    "${valid_names[8]}"
-    "${valid_names[9]}"
-    "${valid_names[10]}"
-)
-
-wobble=(
-    "${valid_names[11]}"
-    "${valid_names[12]}"
-)
--- 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.11
--- 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/common.sh
+++ b/lib/base/common.sh
@@ -1,16 +0,0 @@
-#!/hint/bash
-
-#{{{ common
-
-get_makepkg_conf() {
-    makepkg_conf="${DATADIR}/makepkg.conf"
-    [[ -f ${USER_CONF_DIR}/makepkg.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.conf"
-}
-
-get_pacman_conf() {
-    local repo="$1"
-    pacman_conf="${DATADIR}/pacman-${repo}.conf"
-    [[ -f "${USER_CONF_DIR}/pacman-${repo}.conf" ]] && pacman_conf="${USER_CONF_DIR}/pacman-${repo}.conf"
-}
-
-#}}}
--- a/lib/base/message.sh
+++ b/lib/base/message.sh
@@ -9,20 +9,13 @@

 export LANG=C

-shopt -s extglob
-
-if [[ -t 2 && "$TERM" != dumb ]]; then
+if [[ -t 2 && "$TERM" != dumb ]] || [[ ${ARTOOLS_COLOR} == always ]]; 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
@@ -99,4 +92,28 @@ die() {
    cleanup 255
 }

+msg_success() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${GREEN}✓${ALL_OFF}" "${msg}" >&2
+}
+
+msg_error() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${RED}x${ALL_OFF}" "${msg}" >&2
+}
+
+msg_warn() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${YELLOW}!${ALL_OFF}" "${msg}" >&2
+}
+
 #}}}
--- 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/util.sh
+++ b/lib/base/util.sh
@@ -2,9 +2,6 @@

 #{{{ base conf

-DATADIR=${DATADIR:-'@datadir@/artools'}
-SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
-
 if [[ -n $SUDO_USER ]]; then
    eval "USER_HOME=~$SUDO_USER"
 else
@@ -15,6 +12,7 @@ USER_CONF_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/artools"

 prepare_dir(){
    [[ ! -d $1 ]] && mkdir -p "$1"
+    return 0
 }

 load_base_config(){
--- 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/iso/util.sh
+++ b/lib/iso/util.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/pkg/api/gitea.sh
+++ b/lib/pkg/api/gitea.sh
@@ -0,0 +1,163 @@
+#!/hint/bash
+
+#{{{ gitea api
+
+get_compliant_name(){
+    local gitname="$1"
+    case "$gitname" in
+        *+) gitname=${gitname//+/plus} ;;
+        *+*) gitname=${gitname//+/-} ;;
+    esac
+    printf "%s\n" "$gitname"
+}
+
+api_put() {
+    curl -s -X PUT "$@"
+}
+
+api_delete() {
+    curl -s -X DELETE "$@"
+}
+
+api_post() {
+    curl -s -X POST "$@"
+}
+
+api_patch() {
+    curl -s -X PATCH "$@"
+}
+
+api_get() {
+    curl -s -X GET "$@"
+}
+
+add_team_to_repo() {
+    local pkgbase="$1"
+    local team="$2"
+    local url
+    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/teams/$team"
+
+    stat_busy "Adding team ($team) to package repo [$pkgbase]"
+    api_put "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+remove_team_from_repo() {
+    local pkgbase="$1"
+    local team="$2"
+    local url
+    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/teams/$team"
+
+    stat_busy "Removing team ($team) from package repo [$pkgbase]"
+    api_delete "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+create_repo() {
+    local pkgbase="$1"
+    local url json
+    url="${GIT_URL}/api/v1/org/packages/repos"
+    json="{ \"auto_init\": true, \"name\": \"$pkgbase\", \"gitignores\": \"ArchLinuxPackages\", \"readme\": \"Default\" }"
+
+    stat_busy "Create package repo [$pkgbase] in org (packages)"
+    api_post "$url" \
+        -H "accept: application/json" \
+        -H "content-type: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}" \
+        -d "$json"
+    stat_done
+}
+
+transfer_repo() {
+    local pkgbase="$1"
+    local new_owner="$2"
+    local json url
+    json="{ \"new_owner\": \"$new_owner\",  \"team_ids\": [] }"
+    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/transfer"
+
+    stat_busy "Transfer package repo [$pkgbase] in org ($new_owner)"
+    api_post "$url" \
+        -H "accept: application/json" \
+        -H "Content-Type: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}" \
+        -d "$json"
+    stat_done
+}
+
+list_all_repos() {
+    local url
+    url="${GIT_URL}/api/v1/orgs/packages/repos"
+
+    api_get "$url" \
+        -H "accept: application/json"
+}
+
+replace_topic() {
+    local url
+    local repo="$1"
+    local maintainer="$2"
+    url="${GIT_URL}/api/v1/repos/packages/$repo/topics"
+
+    api_put "$url" \
+        -H "accept: application/json" \
+        -H "Content-Type: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}" \
+        -d "{
+                \"topics\": [
+                    \"${maintainer}\"
+                ]
+            }"
+}
+
+list_topics() {
+    local url
+    local pkgbase="$1"
+    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/topics"
+
+    api_get "$url" \
+        -H "accept: application/json"
+}
+
+add_topic() {
+    local url
+    local pkgbase="$1"
+    local topic="$2"
+    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/topics/$topic"
+
+    stat_busy "Add topic ($topic) to [$pkgbase]"
+    api_put "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+remove_topic() {
+    local url
+    local pkgbase="$1"
+    local topic="$2"
+    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/topics/$topic"
+
+    stat_busy "Remove topic ($topic) from [$pkgbase]"
+    api_delete "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+search_topic() {
+    local search="$1"
+    local url
+    url="${GIT_URL}/api/v1/repos/search?q=${search}&topic=true&includeDesc=false&private=false&is_private=false&template=false&archived=false&order=asc"
+
+    stat_busy "Query for topic (${search})"
+    api_get "$url" \
+        -H 'accept: application/json'
+
+    stat_done
+}
+
+#}}}
--- a/lib/pkg/ci/jenkins.sh
+++ b/lib/pkg/ci/jenkins.sh
@@ -0,0 +1,39 @@
+#!/hint/bash
+
+#{{{ jenkins
+
+write_jenkinsfile(){
+    local jenkins=Jenkinsfile
+
+    printf "@Library('artix-ci') import org.artixlinux.RepoPackage\n" > "$jenkins"
+    {
+    printf '\n'
+    printf 'PackagePipeline(new RepoPackage(this))\n'
+    printf '\n'
+    } >> "$jenkins"
+
+    git add "$jenkins"
+}
+
+write_agentyaml(){
+    local agent=.artixlinux/agent.yaml label='master'
+    [[ -d .artixlinux ]] || mkdir .artixlinux
+
+    printf '%s\n' '---' > "$agent"
+    {
+    printf '\n'
+    printf "label: %s\n" "$label"
+    printf '\n'
+    } >> "$agent"
+
+    git add "$agent"
+}
+
+commit_ci(){
+    write_jenkinsfile
+    write_agentyaml
+
+    git commit -m "initial ci commit"
+}
+
+#}}}
--- a/lib/pkg/deploy.sh
+++ b/lib/pkg/deploy.sh
@@ -1,6 +1,8 @@
 #!/hint/bash

-#{{{ deploy
+#{{{ functions
+
+shopt -s extglob

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

+shopt -u extglob
+
+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/diff.sh
+++ b/lib/pkg/diff.sh
@@ -0,0 +1,75 @@
+#!/hint/bash
+
+#{{{ functions
+
+pkgver_equal() {
+    if [[ $1 = *-* && $2 = *-* ]]; then
+        # if both versions have a pkgrel, then they must be an exact match
+        [[ $1 = "$2" ]]
+    else
+        # otherwise, trim any pkgrel and compare the bare version.
+        [[ ${1%%-*} = "${2%%-*}" ]]
+    fi
+}
+
+shopt -s extglob
+
+find_cached_package() {
+    local searchdirs=("$PWD" "$PKGDEST") results=()
+    local targetname=$1 targetver=$2 targetarch=$3
+    local dir pkg packages pkgbasename name ver rel arch r results
+
+    for dir in "${searchdirs[@]}"; do
+        [[ -d $dir ]] || continue
+
+        shopt -s extglob nullglob
+        mapfile -t packages < <(printf "%s\n" "$dir"/"${targetname}"-"${targetver}"-*"${targetarch}".pkg.tar?(.!(sig|*.*)))
+        shopt -u extglob nullglob
+
+        for pkg in "${packages[@]}"; do
+            [[ -f $pkg ]] || continue
+
+            # avoid adding duplicates of the same inode
+            for r in "${results[@]}"; do
+                [[ $r -ef $pkg ]] && continue 2
+            done
+
+            # split apart package filename into parts
+            pkgbasename=${pkg##*/}
+            pkgbasename=${pkgbasename%.pkg.tar*}
+
+            arch=${pkgbasename##*-}
+            pkgbasename=${pkgbasename%-"$arch"}
+
+            rel=${pkgbasename##*-}
+            pkgbasename=${pkgbasename%-"$rel"}
+
+            ver=${pkgbasename##*-}
+            name=${pkgbasename%-"$ver"}
+
+            if [[ $targetname = "$name" && $targetarch = "$arch" ]] &&
+                pkgver_equal "$targetver" "$ver-$rel"; then
+                results+=("$pkg")
+            fi
+        done
+    done
+
+    case ${#results[*]} in
+        0)
+            return 1
+        ;;
+        1)
+            printf '%s\n' "${results[0]}"
+            return 0
+        ;;
+        *)
+            error 'Multiple packages found:'
+            printf '\t%s\n' "${results[@]}" >&2
+            return 1
+        ;;
+    esac
+}
+
+shopt -u extglob
+
+#}}}
--- a/lib/pkg/git.sh
+++ b/lib/pkg/git.sh
@@ -1,80 +1,76 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later

-#{{{ git
+[[ -z ${ARTOOLS_INCLUDE_GIT_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_GIT_SH=1

-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"
+set -e
+
+artixpkg_git_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+    COMMANDS
+        clone          Clone a package repository
+        config         Configure a clone according to artix specs
+        create         Create a new Gitea package repository
+
+    OPTIONS
+        -h, --help     Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} clone libfoo linux libbar
+        $ ${COMMAND} clone --maintainer mynickname
+        $ ${COMMAND} config *
+        $ ${COMMAND} create libfoo
+_EOF_
 }

-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
-}
-
-get_remote_head(){
-    git ls-remote origin -h refs/heads/master | cut -f1
-}
-
-has_changeset(){
-    local head_l="$1" head_r="$2"
-    if [[ "$head_l" == "$head_r" ]]; then
-        msg2 "remote changes: no"
-        return 1
-    else
-        msg2 "remote changes: yes"
-        return 0
+artixpkg_git() {
+    if (( $# < 1 )); then
+        artixpkg_git_usage
+        exit 0
    fi
+
+    # option checking
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_git_usage
+            exit 0
+        ;;
+        clone)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=lib/git/clone.sh
+            source "${LIBDIR}"/pkg/git/clone.sh
+            artixpkg_git_clone "$@"
+            exit 0
+        ;;
+        config)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=lib/git/config.sh
+            source "${LIBDIR}"/pkg/git/config.sh
+            artixpkg_git_config "$@"
+            exit 0
+        ;;
+        create)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=lib/git/create.sh
+            source "${LIBDIR}"/pkg/git/create.sh
+            artixpkg_git_create "$@"
+            exit 0
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            die "invalid command: %s" "$1"
+        ;;
+        esac
+    done
 }
-
-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
-        git pull origin master
-    fi
-}
-
-#}}}
--- a/lib/pkg/git/clone.sh
+++ b/lib/pkg/git/clone.sh
@@ -0,0 +1,154 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_GIT_CLONE_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_GIT_CLONE_SH=1
+
+source "${LIBDIR}"/pkg/git/config.sh
+
+set -e
+
+
+artixpkg_git_clone_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -m, --maintainer=NAME  Clone all packages of the named maintainer
+        -t, --topic=NAME       Clone all packages of the named topic
+        -j, --jobs N           Run up to N jobs in parallel (default: $(nproc))
+        --universe             Clone all existing packages, useful for cache warming
+        -h, --help             Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} libfoo linux libbar
+        $ ${COMMAND} --maintainer maintainer-mynickname
+        $ ${COMMAND} --topic myopic
+        $ ${COMMAND} -j 8 --topic myopic
+_EOF_
+}
+
+
+
+artixpkg_git_clone() {
+    if (( $# < 1 )); then
+        artixpkg_git_clone_usage
+        exit 0
+    fi
+
+    # options
+    local GIT_REPO_BASE_URL="${GIT_SSH}:"
+    local CLONE_ALL=0
+    local MAINTAINER=
+    local TOPIC=
+    local CONFIGURE_OPTIONS=()
+    local jobs=
+    jobs=$(nproc)
+
+    local command=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_git_clone_usage
+                exit 0
+            ;;
+            -u|--unprivileged)
+                GIT_REPO_BASE_URL="${GIT_URL}/"
+                CONFIGURE_OPTIONS+=("$1")
+                shift
+            ;;
+            -m|--maintainer)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                MAINTAINER="$2"
+                shift 2
+            ;;
+            --maintainer=*)
+                MAINTAINER="${1#*=}"
+                shift
+            ;;
+            -t|--topic)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                TOPIC="$2"
+                shift 2
+            ;;
+            --topic=*)
+                TOPIC="${1#*=}"
+                shift
+            ;;
+            --universe)
+                CLONE_ALL=1
+                shift
+            ;;
+            -j|--jobs)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                jobs=$2
+                shift 2
+            ;;
+            --)
+                shift
+                break
+            ;;
+            -*)
+                die "invalid argument: %s" "$1"
+            ;;
+            *)
+                pkgbases=("$@")
+                break
+            ;;
+        esac
+    done
+
+    # Query packages of a maintainer
+    if [[ -n ${MAINTAINER} ]]; then
+        stat_busy "Query mantainer packages"
+            local maint
+            maint="maintainer-${MAINTAINER}"
+            mapfile -t pkgbases < <(search_topic "${maint}" | jq -r '.data | .[].name' | sort)
+        stat_done
+    fi
+
+    if [[ -n ${TOPIC} ]]; then
+        stat_busy "Query topic packages"
+            mapfile -t pkgbases < <(search_topic "${TOPIC}" | jq -r '.data | .[].name' | sort)
+        stat_done
+    fi
+
+    # Query all released packages
+    if (( CLONE_ALL )); then
+        stat_busy "Query all packages"
+            mapfile -t pkgbases < <(list_all_repos | jq -r '.[] | .name' | sort)
+        stat_done
+    fi
+
+    # parallelization
+    if [[ ${jobs} != 1 ]] && (( ${#pkgbases[@]} > 1 )); then
+        # force colors in parallel if parent process is colorized
+        if [[ -n ${BOLD} ]]; then
+            export ARTOOLS_COLOR=always
+        fi
+        if ! parallel --bar --jobs "${jobs}" "${command}" ::: "${pkgbases[@]}"; then
+            die 'Failed to clone some packages, please check the output'
+            exit 1
+        fi
+        exit 0
+    fi
+
+    for pkgbase in "${pkgbases[@]}"; do
+        if [[ ! -d ${pkgbase} ]]; then
+            msg "Cloning ${pkgbase} ..."
+            local gitname url
+            gitname=$(get_compliant_name "${pkgbase}")
+            url="${GIT_REPO_BASE_URL}packages/${gitname}.git"
+            if ! git clone "${url}" "${pkgbase}"; then
+                die 'failed to clone %s' "${pkgbase}"
+            fi
+        else
+            warning "Skip cloning ${pkgbase}: Directory exists"
+        fi
+
+        artixpkg_git_config "${CONFIGURE_OPTIONS[@]}" "${pkgbase}"
+    done
+}
--- a/lib/pkg/git/config.sh
+++ b/lib/pkg/git/config.sh
@@ -0,0 +1,234 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_GIT_CONFIG_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_GIT_CONFIG_SH=1
+
+
+set -e
+
+
+artixpkg_git_config_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -t, --topic        Set the maintainer topic via gitea api
+        -u, --upstream     add upstream arch remote
+        -j, --jobs N       Run up to N jobs in parallel (default: $(nproc))
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} config -t libfoo
+        $ ${COMMAND} config -u libfoo
+        $ ${COMMAND} config *
+_EOF_
+}
+
+get_packager_name() {
+    local packager=$1
+    local packager_pattern="(.+) <(.+@.+)>"
+    local name
+
+    if [[ ! $packager =~ $packager_pattern ]]; then
+        return 1
+    fi
+
+    name=$(echo "${packager}"|sed -E "s/${packager_pattern}/\1/")
+    printf "%s" "${name}"
+}
+
+get_packager_email() {
+    local packager=$1
+    local packager_pattern="(.+) <(.+@.+)>"
+    local email
+
+    if [[ ! $packager =~ $packager_pattern ]]; then
+        return 1
+    fi
+
+    email=$(echo "${packager}"|sed -E "s/${packager_pattern}/\2/")
+    printf "%s" "${email}"
+}
+
+is_packager_name_valid() {
+    local packager_name=$1
+    if [[ -z ${packager_name} ]]; then
+        return 1
+    elif [[ ${packager_name} == "John Tux" ]]; then
+        return 1
+    elif [[ ${packager_name} == "Unknown Packager" ]]; then
+        return 1
+    fi
+    return 0
+}
+
+is_packager_email_official() {
+    local packager_email=$1
+    if [[ -z ${packager_email} ]]; then
+        return 1
+    elif [[ $packager_email =~ .+@artixlinux.org ]]; then
+        return 0
+    fi
+    return 1
+}
+
+artixpkg_git_config() {
+    # options
+    local GIT_REPO_BASE_URL=${GIT_URL}
+    local official=0
+    local proto=https
+    local jobs=
+    jobs=$(nproc)
+    local paths=()
+
+    local SET_TOPIC=0
+    local UPSTREAM=0
+
+    # variables
+    local -r command=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    local path realpath pkgbase
+    local PACKAGER GPGKEY packager_name packager_email
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_git_config_usage
+            exit 0
+        ;;
+        -t|--topic)
+            SET_TOPIC=1
+            shift
+        ;;
+        -u|--upstream)
+            UPSTREAM=1
+            shift
+        ;;
+        -j|--jobs)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            jobs=$2
+            shift 2
+        ;;
+        --)
+            shift
+            break
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            paths=("$@")
+            break
+        ;;
+        esac
+    done
+
+    # check if invoked without any path from within a packaging repo
+    if (( ${#paths[@]} == 0 )); then
+        if [[ -f PKGBUILD ]]; then
+            paths=(".")
+        else
+            artixpkg_git_config_usage
+            exit 1
+        fi
+    fi
+
+    # Load makepkg.conf variables to be available for packager identity
+    msg "Collecting packager identity from makepkg.conf"
+    # shellcheck disable=2119
+    load_makepkg_config
+    if [[ -n ${PACKAGER} ]]; then
+        if ! packager_name=$(get_packager_name "${PACKAGER}") || \
+            ! packager_email=$(get_packager_email "${PACKAGER}"); then
+            die "invalid PACKAGER format '${PACKAGER}' in makepkg.conf"
+        fi
+        if ! is_packager_name_valid "${packager_name}"; then
+            die "invalid PACKAGER '${PACKAGER}' in makepkg.conf"
+        fi
+        if is_packager_email_official "${packager_email}"; then
+            official=1
+            proto=ssh
+            GIT_REPO_BASE_URL=${GIT_SSH}
+        fi
+    fi
+
+    msg2 "name    : ${packager_name:-${YELLOW}undefined${ALL_OFF}}"
+    msg2 "email   : ${packager_email:-${YELLOW}undefined${ALL_OFF}}"
+    msg2 "gpg-key : ${GPGKEY:-${YELLOW}undefined${ALL_OFF}}"
+    if [[ ${proto} == ssh ]]; then
+        msg2 "protocol: ${GREEN}${proto}${ALL_OFF}"
+    else
+        msg2 "protocol: ${YELLOW}${proto}${ALL_OFF}"
+    fi
+
+    # parallelization
+    if [[ ${jobs} != 1 ]] && (( ${#paths[@]} > 1 )); then
+        if [[ -n ${BOLD} ]]; then
+            export ARTOOLS_COLOR=always
+        fi
+        if ! parallel --bar --jobs "${jobs}" "${command}" ::: "${paths[@]}"; then
+            die 'Failed to configure some packages, please check the output'
+            exit 1
+        fi
+        exit 0
+    fi
+
+    for path in "${paths[@]}"; do
+        if ! realpath=$(realpath -e "${path}"); then
+            error "No such directory: ${path}"
+#             continue
+        fi
+
+        pkgbase=$(basename "${realpath}")
+        pkgbase=${pkgbase%.git}
+        msg "Configuring ${pkgbase}"
+
+        if [[ ! -d "${path}/.git" ]]; then
+            error "Not a Git repository: ${path}"
+#             continue
+        fi
+        ( cd "${path}" || return
+            git config pull.rebase true
+            git config branch.autoSetupRebase always
+
+
+            # setup author identity
+            if [[ -n ${packager_name} ]]; then
+                git config user.name "${packager_name}"
+                git config user.email "${packager_email}"
+            fi
+
+            # force gpg for official packagers
+            if (( official )); then
+                git config commit.gpgsign true
+            fi
+
+            # set custom pgp key from makepkg.conf
+            if [[ -n $GPGKEY ]]; then
+                git config commit.gpgsign true
+                git config user.signingKey "${GPGKEY}"
+            fi
+
+            # topics meta
+            if (( SET_TOPIC )); then
+                if [[ -n ${GIT_TOKEN} ]]; then
+                    local topic gitname
+                    topic="maintainer-${packager_name}"
+                    gitname=$(get_compliant_name "${pkgbase}")
+                    if ! add_topic "${gitname}" "${topic}" >/dev/null; then
+                        warning "failed to set the maintainer topic: ${topic}"
+                    fi
+                fi
+            fi
+            if (( UPSTREAM )); then
+                local remote_url
+                remote_url="${GIT_UPSTREAM_URL}/$pkgbase".git
+                if ! git remote add upstream "${remote_url}"  >/dev/null; then
+                    warning "failed to set the upstream: ${remote_url}"
+                fi
+            fi
+        )
+    done
+}
--- a/lib/pkg/git/create.sh
+++ b/lib/pkg/git/create.sh
@@ -0,0 +1,116 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_GIT_CREATE_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_GIT_CREATE_SH=1
+
+source "${LIBDIR}"/pkg/git/clone.sh
+source "${LIBDIR}"/pkg/git/config.sh
+source "${LIBDIR}"/pkg/git/ci/jenkins.sh
+
+set -e
+
+
+artixpkg_git_create_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -c, --clone       Clone the Git repository after creation
+        -t, --team=NAME   Clone the Git repository after creation
+        -h, --help        Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} libfoo
+_EOF_
+}
+
+artixpkg_git_create() {
+    # options
+    local pkgbases=()
+    local pkgbase
+    local clone=0
+    local config=0
+    local TEAM='extra'
+
+    # variables
+    local path
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_git_create_usage
+            exit 0
+        ;;
+        -c|--clone)
+            clone=1
+            shift
+        ;;
+        -t|--team)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            TEAM="$2"
+            shift 2
+        ;;
+        --team=*)
+            TEAM="${1#*=}"
+            shift
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            pkgbases=("$@")
+            break
+        ;;
+        esac
+    done
+
+    # check if invoked without any path from within a packaging repo
+    if (( ${#pkgbases[@]} == 0 )); then
+        if [[ -f PKGBUILD ]]; then
+            if ! path=$(realpath -e .); then
+                die "failed to read path from current directory"
+            fi
+        pkgbases=("$(basename "${path}")")
+        clone=0
+        config=1
+    else
+        artixpkg_git_create_usage
+        exit 1
+        fi
+    fi
+
+    # create
+    for pkgbase in "${pkgbases[@]}"; do
+        local gitname=$(get_compliant_name "${pkgbase}")
+        if ! create_repo "${gitname}" >/dev/null; then
+            die "failed to create project: ${pkgbase}"
+        fi
+        if ! add_team_to_repo "${gitname}" "${TEAM}" >/dev/null; then
+            warning "failed to assign team: ${TEAM}"
+        fi
+        msg_success "Successfully created ${pkgbase}"
+        if (( clone )); then
+            artixpkg_git_clone "${pkgbase}"
+            ( cd "${pkgbase}"
+                commit_ci
+            )
+        elif (( config )); then
+            artixpkg_git_config
+        fi
+
+    done
+
+    # some convenience hints if not in auto clone/config mode
+    if (( ! clone )) && (( ! config )); then
+        cat <<- _EOF_
+
+        For new clones:
+        $(msg2 "artixpkg git clone ${pkgbases[*]}")
+        For existing clones:
+        $(msg2 "artixpkg git config ${pkgbases[*]}")
+_EOF_
+    fi
+}
--- a/lib/pkg/jenkins.sh
+++ b/lib/pkg/jenkins.sh
@@ -1,43 +0,0 @@
-#!/hint/bash
-
-#{{{ jenkins
-
-write_jenkinsfile(){
-    local pkg="$1"
-    local jenkins=$pkg/Jenkinsfile
-
-    echo "@Library('artix-ci') import org.artixlinux.RepoPackage" > "$jenkins"
-    {
-    echo ''
-    echo 'PackagePipeline(new RepoPackage(this))'
-    echo ''
-    } >> "$jenkins"
-
-    git add "$jenkins"
-}
-
-write_agentyaml(){
-    local pkg="$1"
-    local agent="$pkg"/.artixlinux/agent.yaml label='master'
-    [[ -d $pkg/.artixlinux ]] || mkdir "$pkg"/.artixlinux
-
-    echo '---' > "$agent"
-    {
-    echo ''
-    echo "label: $label"
-    echo ''
-    } >> "$agent"
-
-    git add "$agent"
-}
-
-commit_jenkins_files(){
-    local pkg="$1"
-
-    write_jenkinsfile "$pkg"
-    write_agentyaml "$pkg"
-
-    git commit -m "initial commit"
-}
-
-#}}}
--- a/lib/pkg/repo.sh
+++ b/lib/pkg/repo.sh
@@ -1,51 +1,92 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later

-##{{{ repo
+[[ -z ${ARTOOLS_INCLUDE_REPO_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_SH=1

-shopt -s extglob
+set -e

-load_valid_names(){
-    local conf
-    conf="${DATADIR}"/valid-names.conf
-    [[ -f "$conf" ]] || return 1
-    # shellcheck source=/usr/share/artools/valid-names.conf
-    [[ -r "$conf" ]] && . "$conf"
-    return 0
+artixpkg_repo_usage() {
+    local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+    COMMANDS
+        add          add and commit pkg to repo
+        move         move and commit pkg between repos
+        remove       remove and commit pkg from repo
+
+    OPTIONS
+        -h, --help     Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} add libfoo extra
+        $ ${COMMAND} remove libfoo extra
+        $ ${COMMAND} move libfoo extra-testing extra
+_EOF_
 }

-set_arch_repos(){
-    local _testing="$1" _staging="$2" _unstable="$3"
-    [[ -z ${valid_names[*]} ]] && load_valid_names
-    ARCH_REPOS=("${stable[@]}")
-    $_testing && ARCH_REPOS+=("${gremlins[@]}")
-    $_staging && ARCH_REPOS+=("${goblins[@]}")
-    $_unstable && ARCH_REPOS+=("${wobble[@]}")
-}
+ARTIX_DB=(
+    core
+    extra
+    community
+    multilib
+    core-testing
+    extra-testing
+    community-testing
+    multilib-testing
+    core-staging
+    extra-staging
+    community-staging
+    multilib-staging
+    kde-unstable
+    gnome-unstable
+)

-find_repo(){
-    local pkg="$1" pkgarch="${2:-${CARCH}}" repo
-    for r in "${ARCH_REPOS[@]}"; do
-        [[ -f $pkg/repos/$r-$pkgarch/PKGBUILD ]] && repo=repos/"$r-$pkgarch"
-        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=repos/"$r"-any
-        [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$pkgarch/$r"
-    done
-    echo "$repo"
-}
+artixpkg_repo() {
+    if (( $# < 1 )); then
+        artixpkg_repo_usage
+        exit 0
+    fi

-find_pkg(){
-    local searchdir="$1" pkg="$2" result
-    result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    echo "$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"
-        done
+    # option checking
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+                artixpkg_repo_usage
+                exit 0
+        ;;
+        add)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # shellcheck source=lib/repo/add.sh
+                source "${LIBDIR}"/pkg/repo/add.sh
+                artixpkg_repo_add "$@"
+                exit 0
+        ;;
+        move)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # shellcheck source=lib/repo/move.sh
+                source "${LIBDIR}"/pkg/repo/move.sh
+                artixpkg_repo_move "$@"
+                exit 0
+        ;;
+        remove)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # shellcheck source=lib/repo/remove.sh
+                source "${LIBDIR}"/pkg/repo/remove.sh
+                artixpkg_repo_remove "$@"
+                exit 0
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            die "invalid command: %s" "$1"
+        ;;
+        esac
    done
 }
-
-#}}}
--- a/lib/pkg/repo/add.sh
+++ b/lib/pkg/repo/add.sh
@@ -0,0 +1,134 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_ADD_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_ADD_SH=1
+
+set -e
+
+get_commit_msg() {
+    printf "[%s] -> [%s] '%s' %s\n" "trunk" "${DEST}" "${pkgbase}-$(get_full_version)" "add"
+}
+
+artixpkg_repo_add_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [DEST_REPO] [PKGBASE]...
+
+    OPTIONS
+        -p, --push         Push pkgbase
+        -t, --topic        Set the [DEST_REPO] topic via gitea api
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} extra-testing libfoo
+        $ ${COMMAND} -p extra-testing libfoo
+        $ ${COMMAND} -tp extra-testing libfoo
+_EOF_
+}
+
+artixpkg_repo_add() {
+    if (( $# < 1 )); then
+        artixpkg_repo_add_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+
+    local PUSH=0
+    local SET_TOPIC=0
+    local DEST='trunk'
+
+    # variables
+    local path
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_repo_add_usage
+            exit 0
+        ;;
+        -p|--push)
+            PUSH=1
+            shift
+        ;;
+        -t|--topic)
+            SET_TOPIC=1
+            shift
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            break
+        ;;
+        esac
+    done
+
+    DEST="$1"
+    pkgbases+=("$@")
+
+    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
+        die "${DEST} does not exist!"
+    fi
+
+    for pkgbase in "${pkgbases[@]}"; do
+
+        if [[ -d "${pkgbase}" ]];then
+
+            if [[ ! -d "${pkgbase}/.git" ]]; then
+                error "Not a Git repository: ${pkgbase}"
+                continue
+            fi
+            ( cd "${pkgbase}" || return
+
+                local pkgbuild
+
+                pkgbuild=trunk/PKGBUILD
+                if [[ ! -f "$pkgbuild" ]]; then
+                    die "No PKGBUILD found in (%s)" "trunk"
+                fi
+
+                [[ -d "$CARCH/${DEST}" ]] && git rm -r "$CARCH/${DEST}"
+                [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
+                [[ ! -d "$CARCH/${DEST}" ]] && mkdir "$CARCH/${DEST}"
+
+                cp -r trunk/* "$CARCH/${DEST}"/
+
+                if [[ "${DEST}" != 'trunk' ]]; then
+                    pkgbuild="$CARCH/${DEST}"/PKGBUILD
+                fi
+
+                # shellcheck disable=1090
+                source "$pkgbuild"
+
+                local commit_msg
+                commit_msg=$(get_commit_msg)
+                msg "Action: %s" "$commit_msg"
+
+                git add .
+                git commit -m "$commit_msg"
+
+                if (( PUSH )); then
+                    msg "Push (${pkgbase})"
+                    git push origin master
+                fi
+
+                if (( SET_TOPIC )); then
+                    # topics meta
+                    if [[ -n ${GIT_TOKEN} ]]; then
+                        local topic="${DEST}"
+                        local gitname=$(get_compliant_name "${pkgbase}")
+                        if ! add_topic "${gitname}" "${topic}" >/dev/null; then
+                            warning "failed to add pacman repo topic: ${topic}"
+                        fi
+                    fi
+                fi
+            )
+        fi
+
+    done
+}
--- a/lib/pkg/repo/move.sh
+++ b/lib/pkg/repo/move.sh
@@ -0,0 +1,146 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_MOVE_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_MOVE_SH=1
+
+set -e
+
+
+artixpkg_repo_move_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [SOURCE_REPO] [DEST_REPO] [PKGBASE]...
+
+    OPTIONS
+        -p, --push         Push pkgbase
+        -t, --topic        Set the [DEST_REPO] topic via gitea api
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} extra-testing extra libfoo
+        $ ${COMMAND} -p extra-testing extra libfoo
+        $ ${COMMAND} -tp extra-testing extra libfoo
+_EOF_
+}
+
+get_commit_msg() {
+    printf "[%s] -> [%s] '%s' %s\n" "${SRC}" "${DEST}" "${pkgbase}-$(get_full_version)" "move"
+}
+
+artixpkg_repo_move() {
+    if (( $# < 1 )); then
+        artixpkg_repo_move_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+
+    local PUSH=0
+    local SET_TOPIC=0
+
+    local DEST
+    local SRC
+
+    # variables
+    local path
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_repo_move_usage
+            exit 0
+        ;;
+        -p|--push)
+            PUSH=1
+            shift
+        ;;
+        -t|--topic)
+            SET_TOPIC=1
+            shift
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            break
+        ;;
+        esac
+    done
+
+   	SRC="$1"
+    DEST="$2"
+    shift 2
+
+    if ! in_array "${SRC}" "${ARTIX_DB[@]}"; then
+        die "${SRC} does not exist!"
+    fi
+    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
+        die "${DEST} does not exist!"
+    fi
+
+    pkgbases+=("$@")
+
+    for pkgbase in "${pkgbases[@]}"; do
+
+        if [[ -d "${pkgbase}" ]];then
+
+            if [[ ! -d "${pkgbase}/.git" ]]; then
+                error "Not a Git repository: ${pkgbase}"
+                continue
+            fi
+            ( cd "${pkgbase}" || return
+
+                pkgbuild=trunk/PKGBUILD
+                if [[ ! -f "$pkgbuild" ]]; then
+                    die "No PKGBUILD found in (%s)" "trunk"
+                fi
+
+                [[ -d "$CARCH/${DEST}" ]] && git rm -r "$CARCH/${DEST}"
+                [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
+                [[ ! -d "$CARCH/${DEST}" ]] && mkdir "$CARCH/${DEST}"
+
+                cp -r "$CARCH/${SRC}"/* "$CARCH/${DEST}"/
+                git rm -r "$CARCH/${SRC}"
+
+                if [[ "${SRC}" != 'trunk' ]]; then
+                    pkgbuild="$CARCH/${DEST}"/PKGBUILD
+                fi
+                # shellcheck disable=1090
+                source "$pkgbuild"
+
+                local commit_msg
+
+                commit_msg=$(get_commit_msg)
+                msg "Action: %s" "$commit_msg"
+
+                git add .
+                git commit -m "$commit_msg"
+
+                if (( PUSH )); then
+                    msg "Push (${pkgbase})"
+                    git push origin master
+                fi
+
+                if (( SET_TOPIC )); then
+                    # topics meta
+                    if [[ -n ${GIT_TOKEN} ]]; then
+                        local topic="${DEST}"
+                        local gitname=$(get_compliant_name "${pkgbase}")
+                        if ! add_topic "${gitname}" "${topic}" >/dev/null; then
+                            warning "failed to add pacman repo topic: ${topic}"
+                        fi
+                        topic="${SRC}"
+                        if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
+                            warning "failed to remove pacman repo topic: ${topic}"
+                        fi
+                    fi
+                fi
+            )
+        fi
+
+    done
+}
--- a/lib/pkg/repo/remove.sh
+++ b/lib/pkg/repo/remove.sh
@@ -0,0 +1,128 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_REMOVE_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_REMOVE_SH=1
+
+set -e
+
+
+artixpkg_repo_remove_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [DEST_REPO] [PKGBASE]...
+
+    OPTIONS
+        -p, --push         Push pkgbase
+        -t, --topic        Set the [DEST_REPO] topic via gitea api
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} extra-testing libfoo
+        $ ${COMMAND} -p extra-testing libfoo
+        $ ${COMMAND} -tp extra-testing libfoo
+_EOF_
+}
+
+get_commit_msg() {
+    printf "[%s] '%s' %s\n" "${DEST}" "${pkgbase}-$(get_full_version)" "remove"
+}
+
+artixpkg_repo_remove() {
+    if (( $# < 1 )); then
+        artixpkg_repo_remove_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+
+    local PUSH=0
+    local SET_TOPIC=0
+    local DEST='trunk'
+
+    # variables
+    local path
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_repo_remove_usage
+            exit 0
+        ;;
+        -p|--push)
+            PUSH=1
+            shift
+        ;;
+        -t|--topic)
+            SET_TOPIC=1
+            shift
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            pkgbases=("$@")
+            break
+        ;;
+        esac
+    done
+
+    DEST="$1"
+
+    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
+        die "${DEST} does not exist!"
+    fi
+
+    for pkgbase in "${pkgbases[@]}"; do
+
+        if [[ -d "${pkgbase}" ]];then
+
+            if [[ ! -d "${pkgbase}/.git" ]]; then
+                error "Not a Git repository: ${pkgbase}"
+                continue
+            fi
+            ( cd "${pkgbase}" || return
+
+                pkgbuild=trunk/PKGBUILD
+                if [[ ! -f "$pkgbuild" ]]; then
+                    die "No PKGBUILD found in (%s)" "trunk"
+                fi
+
+                if [[ "${DEST}" != 'trunk' ]]; then
+                    pkgbuild="$CARCH/${DEST}"/PKGBUILD
+                fi
+                # shellcheck disable=1090
+                source "$pkgbuild"
+
+                local commit_msg
+
+                commit_msg=$(get_commit_msg)
+                msg "Action: %s" "$commit_msg"
+                if [[ "${DEST}" == 'trunk' ]];then
+                    git rm -r "trunk"
+                else
+                    git rm -r "$CARCH/${DEST}"
+                fi
+
+                if (( PUSH )); then
+                    msg "Push (${pkgbase})"
+                    git push origin master
+                fi
+
+                if (( SET_TOPIC )); then
+                    # topics meta
+                    if [[ -n ${GIT_TOKEN} ]]; then
+                        local topic="${SRC}"
+                        if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
+                            warning "failed to remove pacman repo topic: ${topic}"
+                        fi
+                    fi
+                fi
+            )
+        fi
+
+    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/pkg/util.sh
+++ b/lib/pkg/util.sh
@@ -0,0 +1,43 @@
+#!/hint/bash
+
+#{{{ pkg conf
+
+load_pkg_config(){
+
+    local conf="$1/artools-pkg.conf"
+
+    [[ -f "$conf" ]] || return 1
+
+    # shellcheck source=/etc/artools/artools-pkg.conf
+    [[ -r "$conf" ]] && . "$conf"
+
+    local git_domain="gitea.artixlinux.org"
+
+    GIT_URL=${GIT_URL:-"https://${git_domain}"}
+
+    GIT_SSH=${GIT_SSH:-"gitea@${git_domain}"}
+
+    GIT_TOKEN=${GIT_TOKEN:-''}
+
+    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
+
+    [[ -z ${ARTIX_TREE[*]} ]] && \
+    ARTIX_TREE=(main initsys desktop addons lib32)
+
+    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
+
+    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
+
+    GIT_UPSTREAM_URL=${GIT_UPSTREAM_URL:-"https://gitlab.archlinux.org/archlinux/packaging/packages"}
+
+    DBEXT=${DBEXT:-'gz'}
+
+    return 0
+}
+
+#}}}
+
+load_pkg_config "${USER_CONF_DIR}" || load_pkg_config "${SYSCONFDIR}"
+
+prepare_dir "${REPOS_ROOT}"
+prepare_dir "${TREE_DIR_ARTIX}"
--- a/lib/util-pkg.sh
+++ b/lib/util-pkg.sh
@@ -1,69 +0,0 @@
-#!/hint/bash
-
-#{{{ pkg conf
-
-load_pkg_config(){
-
-    local conf="$1/artools-pkg.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    # shellcheck source=/etc/artools/artools-pkg.conf
-    [[ -r "$conf" ]] && . "$conf"
-
-    local git_domain="gitea.artixlinux.org"
-
-    GIT_URL="https://${git_domain}"
-
-    GIT_SSH="gitea@${git_domain}"
-
-    GIT_TOKEN=${GIT_TOKEN:-''}
-
-    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
-
-    ARTIX_TREE=(
-        packages community
-        packages-{gfx,gtk,media,net,qt5,xorg}
-    )
-
-    local dev_tree=(packages-{python,perl,java,ruby})
-
-    local init_tree=(packages-{openrc,runit,s6})
-
-    local desktop_tree=(
-        packages-{kf5,plasma,kde,qt6}
-        packages-{lxqt,gnome,cinnamon,mate,xfce,wm}
-    )
-
-    [[ -z ${TREE_NAMES_ARTIX[*]} ]] && \
-    TREE_NAMES_ARTIX=(
-        packages-kernel
-        "${init_tree[@]}"
-        "${dev_tree[@]}"
-        "${desktop_tree[@]}"
-        packages-devel
-        packages-lib32
-    )
-
-    ARTIX_TREE+=("${TREE_NAMES_ARTIX[@]}")
-
-    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
-
-    ARCH_TREE=(svntogit-{packages,community})
-
-    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
-
-    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
-
-    DBEXT=${DBEXT:-'xz'}
-
-    return 0
-}
-
-#}}}
-
-load_pkg_config "${USER_CONF_DIR}" || load_pkg_config "${SYSCONFDIR}"
-
-prepare_dir "${REPOS_ROOT}"
-prepare_dir "${TREE_DIR_ARTIX}"
-prepare_dir "${TREE_DIR_ARCH}"
Author	SHA1	Message	Date
artoo	8dbe5a1c19	merge branch 'artools/0.30'	2023-05-22 01:24:01 +02:00
artoo	689e0d5e62	merge branch 'arch-git'	2023-05-21 20:16:55 +02:00
artoo	d1b620945a	remove pacman-docker.conf	2023-05-13 16:22:30 +02:00
artoo	2ba8cb4fa5	deploypkg: fix exit code	2023-05-03 23:45:58 +02:00
artoo	278a6d17a7	buildtree: fix exit codes	2023-05-03 17:50:19 +02:00
artoo	d068fa6b75	Merge pull request 'buildtree: don't strip arch maintainer' (#69 ) from Dudemanguy/artools:keep-original-maintainer into master Reviewed-on: artix/artools#69	2023-05-03 17:47:01 +02:00
Dudemanguy	70e93c3843	buildtree: don't strip arch maintainer Instead of completely overwriting the first maintainer line when doing an import, copy it to the second line and then find/replace maintainer with contributor.	2023-05-01 20:27:43 -05:00
artoo	8a0168cbe5	arch patches	2023-04-30 19:03:11 +02:00
artoo	c2082be241	upd makepkg.conf	2023-01-20 00:12:22 +01:00
artoo	d5d89cf7a4	commitpkg: small msg change	2022-11-04 18:36:55 +01:00
artoo	cc8c2fe38e	commitpkg: clean up	2022-11-04 15:10:12 +01:00
artoo	9bf2bd2671	commitpkg: drop rebuild check, pipeline now supports skipping add/rm stages if rebuild <--> staging moves, both goblins	2022-11-04 12:01:50 +01:00
artoo	eb638abdfe	patches (#67 ) Reviewed-on: artix/artools#67	2022-11-03 23:10:30 +01:00
artoo	332cc9751b	Merge pull request 'buildtree: use git -C when importing packages' (#65 ) from Dudemanguy/artools:buildtree-use-path into master Reviewed-on: artix/artools#65	2022-11-02 18:02:41 +01:00
Dudemanguy	f86e36c361	buildtree: use git -C when importing packages This way, the git config credentials that are retrieved correctly match the actual directory of the package	2022-10-27 13:29:19 -05:00
artoo	2edcd2fd54	commitpkg: cp -r on move	2022-07-31 18:23:22 +02:00
artoo	80887fba39	commitpkg: cp -r to support keys sub dirs	2022-07-26 18:25:52 +02:00
artoo	bd07105192	patches (#64 ) Reviewed-on: artix/artools#64	2022-07-21 18:35:47 +02:00
artoo	02edf46d6a	buildtree: set maintainer	2022-06-10 00:41:08 +02:00
artoo	860d2272ba	buildtree: don't braid push ci	2022-06-09 01:26:01 +02:00
artoo	0d9e54c4e3	buildtree: braid push the ci fiiles	2022-06-09 00:09:37 +02:00
artoo	26bd425d55	buildtree: add func to set maintainer	2022-06-08 10:04:23 +02:00
artoo	c08f82044c	commitpkg: only run braid update if push is success	2022-06-06 18:05:10 +02:00
artoo	74af21ca25	batchpkg: drop -u arg on move	2022-06-06 12:44:21 +02:00
artoo	e3b8439b04	commitpkg: fix update msg	2022-06-06 01:35:24 +02:00
artoo	e00096d503	braid (#63 ) * use braid instead of git-subrepo Reviewed-on: artix/artools#63	2022-06-06 01:28:53 +02:00
artoo	f7ebc6bd11	mkdepgraph: include mode to graph artix-rebuild-order output	2022-05-28 09:30:37 +02:00
artoo	b5fa7084b2	mkdepgraph: remove printf vars	2022-05-27 19:58:03 +02:00
artoo	7eabdb0e46	add mkdepgraph	2022-05-27 19:54:00 +02:00
artoo	10c013bf33	data: update makepkg.conf	2022-05-27 19:54:00 +02:00
artoo	74618d77a5	comparepkg: don't check for result when moving	2022-05-12 13:06:56 +02:00
artoo	196761740b	repo: rename var	2022-05-09 15:24:05 +02:00
artoo	a814655956	repo: simplify find_repo() return	2022-05-08 23:37:02 +02:00
artoo	7b03050ab9	comparepkg: rename var	2022-05-08 20:59:38 +02:00
artoo	0b1ff8d060	comparepkg: fix var	2022-05-08 19:12:09 +02:00
artoo	f66761aa57	comparepkg: use get_group()	2022-05-08 19:10:30 +02:00
artoo	f33d9bdac1	artix-chroot: remove obsolete help	2022-05-03 22:54:52 +02:00
artoo	f50c66cdd7	artix-chroot: remove -a arg	2022-05-03 22:45:58 +02:00
artoo	fd1bc87ef0	makefile: remove compat symlink, remove deploypkg symlinks	2022-05-03 22:45:27 +02:00
artoo	9da1ae8e31	jenkins: fix printf arg	2022-05-03 17:20:10 +02:00
artoo	52ecf8d463	update default trees used	2022-05-01 12:01:23 +02:00
artoo	38fa79e10b	update conf	2022-04-28 13:18:53 +02:00
artoo	a53fb9e839	artools/0.27 (#62 ) * refactoring * drop echo Reviewed-on: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#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: artix/artools#46 Co-Authored-By: artoo <artoo@artixlinux.org> Co-Committed-By: artoo <artoo@artixlinux.org>	2020-12-26 00:12:19 +01:00