dpcker: upd pacman.conf

.gitignore

@@ -6,5 +6,3 @@ data/schemas/*.conf
 .project
 iso-profiles
 live-services
-artixpkg_cmds
-PKGBUILD

Makefile

@@ -1,14 +1,14 @@
-V=0.30
-CV=0.11
-BUILDTOOLVER ?= $(V)
-CHROOTVER ?= $(CV)
+VERSION=0.19
+
+CHROOT_VERSION=0.10
 
 TOOLS = artools
 PREFIX ?= /usr
 SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
-LIBDIR = $(PREFIX)/share
+LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
+CPIODIR = $(SYSCONFDIR)/initcpio
 
 BASE_CONF = \
 	data/conf/artools-base.conf
@@ -17,82 +17,111 @@ BASE_BIN = \
 	bin/base/chroot-run \
 	bin/base/mkchroot \
 	bin/base/basestrap \
-	bin/base/artix-chroot \
+	bin/base/artools-chroot \
 	bin/base/fstabgen
 
-BASE_LIB =\
+BASE_LIBS = \
 	$(wildcard lib/base/*.sh)
 
-PACMAN_CONF = \
-	$(wildcard data/pacman/*.conf)
+BASE_UTIL = lib/util-base.sh
+
+BASE_DATA = \
+	$(wildcard data/pacman/pacman*.conf)
 
 PKG_CONF = \
 	data/conf/artools-pkg.conf
 
-SETARCH_ALIASES = \
-
 PKG_BIN = \
 	bin/pkg/buildpkg \
 	bin/pkg/deploypkg \
-	bin/pkg/links-add \
+	bin/pkg/commitpkg \
+	bin/pkg/comparepkg \
 	bin/pkg/mkchrootpkg \
 	bin/pkg/pkg2yaml \
-	bin/pkg/makerepropkg \
+	bin/pkg/buildtree \
 	bin/pkg/lddd \
+	bin/pkg/links-add \
 	bin/pkg/checkpkg \
 	bin/pkg/finddeps \
 	bin/pkg/find-libdeps \
-	bin/pkg/signpkg \
-	bin/pkg/checkrepo \
-	bin/pkg/artixpkg \
-	bin/pkg/mkdepgraph \
-	bin/pkg/diffpkg \
-	bin/pkg/export-pkgbuild-keys
+	bin/pkg/batchpkg \
+	bin/pkg/signpkg
+
+LN_COMMITPKG = \
+	extrapkg \
+	corepkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
+	multilibpkg \
+	multilib-testingpkg \
+	multilib-stagingpkg \
+	kde-unstablepkg \
+	gnome-unstablepkg
 
 LN_BUILDPKG = \
 	buildpkg-system \
-	buildpkg-system-gremlins \
-	buildpkg-system-goblins \
 	buildpkg-world \
-	buildpkg-world-gremlins \
-	buildpkg-world-goblins \
+	buildpkg-gremlins \
+	buildpkg-goblins \
+	buildpkg-galaxy \
+	buildpkg-galaxy-gremlins \
+	buildpkg-galaxy-goblins \
 	buildpkg-lib32 \
 	buildpkg-lib32-gremlins \
 	buildpkg-lib32-goblins \
 	buildpkg-kde-wobble \
 	buildpkg-gnome-wobble
 
-PKG_LIB =\
+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_LIBS = \
 	$(wildcard lib/pkg/*.sh)
 
-PKG_LIB_API =\
-	$(wildcard lib/pkg/api/*.sh)
+PKG_UTIL = lib/util-pkg.sh
 
-PKG_LIB_CI =\
-	$(wildcard lib/pkg/ci/*.sh) \
+PKG_DATA = \
+	data/pacman/makepkg.conf
 
-PKG_LIB_GIT =\
-	$(wildcard lib/pkg/git/*.sh) \
-
-PKG_LIB_REPO =\
-	$(wildcard lib/pkg/repo/*.sh)
-
-MAKEPKG_CONF = \
-	data/makepkg/x86_64.conf \
+PATCHES = \
+	$(wildcard data/patches/*.patch)
 
 ISO_CONF = \
 	data/conf/artools-iso.conf
 
 ISO_BIN = \
-	bin/iso/buildiso
-
-ISO_LIB =\
-	$(wildcard lib/iso/*.sh)
+	bin/iso/buildiso \
+	bin/iso/deployiso
 
 LN_BUILDISO = \
 	buildiso-gremlins \
 	buildiso-goblins
 
+ISO_LIBS = \
+	$(wildcard lib/iso/*.sh)
+
+ISO_UTIL = lib/util-iso.sh
+
+DOCKER_DATA = \
+	data/docker/pacman-docker.conf
+
+DOCKER_ALPM = \
+	data/docker/package-cleanup.hook
+
 DIRMODE = -dm0755
 FILEMODE = -m0644
 MODE =  -m0755
@@ -103,28 +132,39 @@ CHMODAW = chmod a-w
 CHMODX = chmod +x
 
 BIN = $(BASE_BIN) $(PKG_BIN) $(ISO_BIN)
+UTIL = $(BASE_UTIL) $(PKG_UTIL) $(ISO_UTIL)
 
+all: $(BIN) $(UTIL)
 
-all: bin
-bin: $(BIN)
-
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
-	-e "s|@libdir[@]|$(LIBDIR)|g" \
+EDIT_UTIL = sed -e "s|@datadir[@]|$(DATADIR)|g" \
 	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
-	-e "s|@buildtool[@]|$(TOOLS)|g" \
-	-e "s|@buildtoolver[@]|$(BUILDTOOLVER)|g" \
-	-e "s|@chrootver[@]|$(CHROOTVER)|g"
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
+	-e "s|@chroot_version@|$(CHROOT_VERSION)|"
 
-%: %.in Makefile
+EDIT_BIN = sed -e "s|@libdir[@]|$(LIBDIR)|g"
+
+$(UTIL): %: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@$(M4) $@.in | $(EDIT) >$@
+	@$(M4) $@.in | $(EDIT_UTIL) >$@
+	@$(CHMODAW) "$@"
+
+$(BIN): %: %.in Makefile
+	@echo "GEN $@"
+	@$(RM) "$@"
+	@$(M4) $@.in | $(EDIT_BIN) >$@
 	@$(CHMODAW) "$@"
 	@$(CHMODX) "$@"
-	@bash -O extglob -n "$@"
 
 clean:
-	$(RM) $(BIN)
+	$(RM) $(BIN) $(UTIL)
+
+install_docker:
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(DOCKER_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
+
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/libalpm/hooks
+	install $(FILEMODE) $(DOCKER_ALPM) $(DESTDIR)$(DATADIR)/libalpm/hooks
 
 install_base:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
@@ -134,13 +174,11 @@ install_base:
 	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)
 
 	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
-	install $(FILEMODE) $(BASE_LIB) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
+	install $(FILEMODE) $(BASE_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(BASE_LIBS) $(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 $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
@@ -149,42 +187,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
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/makepkg.conf.d
-	install $(FILEMODE) $(MAKEPKG_CONF) $(DESTDIR)$(DATADIR)/$(TOOLS)/makepkg.conf.d
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
+	install $(FILEMODE) $(PKG_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(PKG_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
 
-install_iso:
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
+
+	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 $(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)
 
 	for l in $(LN_BUILDISO); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
 
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+	install $(FILEMODE) $(ISO_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(ISO_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+
 install: install_base install_pkg install_iso
 
 .PHONY: all clean install install_base install_pkg install_iso

README.md

@@ -18,18 +18,23 @@ artools
 ##### Runtime:
 
 - base:
+  * openssh
+  * rsync
+  * haveged
   * os-prober
+  * gnupg
   * pacman
 
 - pkg:
   * namcap
+  * git-subrepo
   * jq
-  * parallel
 
 - iso:
   * dosfstools
   * libisoburn
   * squashfs-tools
+  * mkinitcpio
   * grub
 
 #### Configuration
@@ -59,25 +64,11 @@ 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.conf.d/makepkg.conf
-```
-
-```bash
-usr/share/artools/pacmanconf.d/${repo}.conf
+usr/share/artools/{makepkg,pacman-*}.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/
 ```

bin/base/artix-chroot.in

@@ -1,54 +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.
-
-shopt -s extglob
-
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/base/chroot.sh
-source "${LIBDIR}"/base/mount.sh
-
-usage() {
-    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"
-}
-
-orig_args=("$@")
-
-opts=':h'
-
-while getopts ${opts} arg; do
-    case "${arg}" in
-        h|?) usage 0 ;;
-    esac
-done
-shift $(( OPTIND - 1 ))
-
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
-
-chrootdir=$1
-shift
-
-[[ -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}"
-
-SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "$@"

bin/base/artools-chroot.in

@@ -0,0 +1,96 @@
+#!/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.
+
+shopt -s extglob
+
+. @libdir@/artools/util-base.sh
+
+select_os(){
+    local os_list=( $(detect) ) count=${#os_list[@]}
+    if [[ ${count} > 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 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
+
+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 ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts=':ha'
+
+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
+
+    select_os "${chrootdir}"
+else
+    chrootdir=$1
+    shift
+    run_args="$@"
+
+    [[ -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}"
+fi
+
+SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}

bin/base/basestrap.in

@@ -22,13 +22,7 @@
 
 shopt -s extglob
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/base/mount.sh
-source "${LIBDIR}"/base/chroot.sh
-
-#{{{ functions
+. @libdir@/artools/util-base.sh
 
 copy_mirrorlist(){
     cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
@@ -42,13 +36,11 @@ copy_keyring(){
 
 create_min_fs(){
     msg "Creating install root at %s" "$1"
-    mkdir -m 0755 -p "$1"/var/{cache/pacman/pkg,lib/pacman,log} "$1"/{dev,run,etc/pacman.d}
-    mkdir -m 1777 -p "$1"/tmp
-    mkdir -m 0555 -p "$1"/{sys,proc}
+    mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,run,etc/pacman.d}
+    mkdir -m 1777 -p $1/tmp
+    mkdir -m 0555 -p $1/{sys,proc}
 }
 
-#}}}
-
 newroot=/mnt
 
 hostcache=0
@@ -57,23 +49,23 @@ copymirrorlist=1
 pacmode=-Sy
 
 usage() {
-    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"
+    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 ''
+    exit $1
 }
 
-orig_args=("$@")
+orig_argv=("$0" "$@")
 
 opts=':C:cGiMU'
 
@@ -85,12 +77,13 @@ while getopts ${opts} arg; do
         G) copykeyring=0 ;;
         M) copymirrorlist=0 ;;
         U) pacmode=-U ;;
-        h|?) usage 0 ;;
+        :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
+        ?) usage 0 ;;
     esac
 done
 shift $(( OPTIND - 1 ))
 
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
 (( $# )) || die "No root directory specified"
 newroot=$1; shift

bin/base/chroot-run.in

@@ -12,31 +12,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+chroot_version=0.9
 
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/base/mount.sh
-source "${LIBDIR}"/base/chroot.sh
-
-CHROOTVERSION=@chrootver@
-
-# $1: chroot
-kill_chroot_process(){
-    local prefix="$1" flink pid name
-    for root_dir in /proc/*/root; do
-        flink=$(readlink "$root_dir")
-        if [ "x$flink" != "x" ]; then
-            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
-                # this process is in the chroot...
-                pid=$(basename "$(dirname "$root_dir")")
-                name=$(ps -p "$pid" -o comm=)
-                msg2 "Killing chroot process: %s (%s)" "$name" "$pid"
-                kill -9 "$pid"
-            fi
-        fi
-    done
-    sleep 1
-}
+. @libdir@/artools/util-base.sh
 
 # umask might have been changed in /etc/profile
 # ensure that sane default is set again
@@ -45,25 +23,25 @@ umask 0022
 working_dir=''
 files=()
 
-mount_args=("-B:/etc/hosts:/etc/hosts")
+mount_args=()
 
 usage() {
-    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'
+    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'
     exit 1
 }
 
-orig_args=("$@")
+orig_argv=("$0" "$@")
 
 opts='hC:M:c:b:f:s'
 
@@ -74,47 +52,48 @@ while getopts ${opts} arg; do
         c) cache_dirs+=("$OPTARG") ;;
         f) files+=("$OPTARG") ;;
         s) nosetarch=1 ;;
-        b) bindmounts+=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
+        b) bindmounts=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
         h|?) usage ;;
+        *) error "invalid argument '$arg'"; usage ;;
     esac
 done
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
 (( $# < 1 )) && die 'You must specify a directory.'
 
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
 working_dir=$(readlink -f "$1")
 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 < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+    mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
 
-# shellcheck disable=2016
-host_mirrors=($(pacman-conf --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
+host_mirrors=($($pacconf_cmd --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=$(printf "%s\n" "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+        host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+        info "host mirror: %s" "$host_mirror"
         in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
     fi
 done
 
 while read -r line; do
-    # shellcheck disable=2016
-    mapfile -t lines < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
-        --repo "$line" Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
+    mapfile -t lines < <($pacconf_cmd --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
             line=${line#file://}
             in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
         fi
     done
-done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
+done < <($pacconf_cmd --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
@@ -122,9 +101,9 @@ copy_hostconf () {
 
     printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
 
-    [[ -n $pacman_conf ]] && cp "$pacman_conf" "${working_dir}/etc/pacman.conf"
+    [[ -n $pacman_conf ]] && cp $pacman_conf "${working_dir}/etc/pacman.conf"
 
-    [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "${working_dir}/etc/makepkg.conf"
+    [[ -n $makepkg_conf ]] && cp $makepkg_conf "${working_dir}/etc/makepkg.conf"
 
     local file
     for file in "${files[@]}"; do
@@ -135,7 +114,7 @@ copy_hostconf () {
     sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "${working_dir}/etc/pacman.conf"
 }
 
-mount_args+=("-B:${cache_dirs[0]//:/\\:}:${cache_dirs[0]//:/\\:}")
+mount_args+=("-B:${cache_dirs[0]//:/\\:}:${cache_dirs[0]//:/\\:}" "-B:/etc/hosts:/etc/hosts")
 
 for cache_dir in "${cache_dirs[@]:1}"; do
     mount_args+=("-Br:${cache_dir//:/\\:}:${cache_dir//:/\\:}")
@@ -144,39 +123,43 @@ done
 chroot_extra_mount() {
     chroot_add_resolv_conf "${working_dir}"
 
-    for arg in "${mount_args[@]}"; do
-        local flag=${arg%%:*} dest=${arg##*:} src=${arg%:*}
+    for arg in ${mount_args[@]}; do
+        local flag=${arg%%:*}
+        local dest=${arg##*:}
+        local src=${arg%:*}
         src=${src#*:}
         chroot_mount "${src}" "${working_dir}${dest}" "${flag}"
     done
 }
 
+sync_host_localtime(){
+    if [[ -e /etc/localtime ]]; then
+        cp -L /etc/localtime "${working_dir}"/etc/localtime
+    fi
+}
+
 umask 0022
 
 # Sanity check
 if [[ ! -f "$working_dir/.artools" ]]; then
     die "'%s' does not appear to be an artix chroot." "$working_dir"
-elif [[ $(cat "$working_dir/.artools") != "${CHROOTVERSION}" ]]; then
+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
 
 copy_hostconf
 
-eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"
+eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
 
 [[ -z $nosetarch ]] || unset CARCH
 
-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}" "$@"
+${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
 
 ret=$?
 

bin/base/fstabgen.in

@@ -14,216 +14,10 @@
 
 shopt -s extglob
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-
-#{{{ filesystems
-
-declare -A pseudofs_types=([anon_inodefs]=1
-                        [autofs]=1
-                        [bdev]=1
-                        [bpf]=1
-                        [binfmt_misc]=1
-                        [cgroup]=1
-                        [cgroup2]=1
-                        [configfs]=1
-                        [cpuset]=1
-                        [debugfs]=1
-                        [devfs]=1
-                        [devpts]=1
-                        [devtmpfs]=1
-                        [dlmfs]=1
-                        [efivarfs]=1
-                        [fuse.gvfs-fuse-daemon]=1
-                        [fusectl]=1
-                        [hugetlbfs]=1
-                        [mqueue]=1
-                        [nfsd]=1
-                        [none]=1
-                        [pipefs]=1
-                        [proc]=1
-                        [pstore]=1
-                        [ramfs]=1
-                        [rootfs]=1
-                        [rpc_pipefs]=1
-                        [securityfs]=1
-                        [sockfs]=1
-                        [spufs]=1
-                        [sysfs]=1
-                        [tmpfs]=1)
-
-declare -A fsck_types=([cramfs]=1
-                    [exfat]=1
-                    [ext2]=1
-                    [ext3]=1
-                    [ext4]=1
-                    [ext4dev]=1
-                    [jfs]=1
-                    [minix]=1
-                    [msdos]=1
-                    [reiserfs]=1
-                    [vfat]=1
-                    [xfs]=1)
-
-#}}}
-
-#{{{ functions
-
-fstype_is_pseudofs() {
-    (( pseudofs_types["$1"] ))
-}
-
-fstype_has_fsck() {
-    (( fsck_types["$1"] ))
-}
-
-valid_number_of_base() {
-    local base=$1 len=${#2} i
-
-    for (( i = 0; i < len; i++ )); do
-        { _=$(( $base#${2:i:1} )) || return 1; } 2>/dev/null
-    done
-
-    return 0
-}
-
-mangle() {
-    local i chr out
-
-    local {a..f}= {A..F}=
-
-    for (( i = 0; i < ${#1}; i++ )); do
-        chr=${1:i:1}
-        case $chr in
-            [[:space:]\\])
-                printf -v chr '%03o' "'$chr"
-                out+=\\
-            ;;
-        esac
-        out+=$chr
-    done
-
-    printf '%s' "$out"
-}
-
-unmangle() {
-    local i chr out len=$(( ${#1} - 4 ))
-
-    local {a..f}= {A..F}=
-
-    for (( i = 0; i < len; i++ )); do
-        chr=${1:i:1}
-        case $chr in
-            \\)
-                if valid_number_of_base 8 "${1:i+1:3}" ||
-                    valid_number_of_base 16 "${1:i+1:3}"; then
-                    printf -v chr '%b' "${1:i:4}"
-                    (( i += 3 ))
-                fi
-            ;;
-        esac
-        out+=$chr
-    done
-
-    printf '%s' "$out${1:i}"
-}
-
-dm_name_for_devnode() {
-    read -r dm_name <"/sys/class/block/${1#/dev/}/dm/name"
-    if [[ $dm_name ]]; then
-        printf '/dev/mapper/%s' "$dm_name"
-    else
-        # don't leave the caller hanging, just print the original name
-        # along with the failure.
-        print '%s' "$1"
-        error 'Failed to resolve device mapper name for: %s' "$1"
-    fi
-}
-
-optstring_match_option() {
-    local candidate pat patterns
-
-    IFS=, read -ra patterns <<<"$1"
-    for pat in "${patterns[@]}"; do
-        if [[ $pat = *=* ]]; then
-            # "key=val" will only ever match "key=val"
-            candidate=$2
-        else
-            # "key" will match "key", but also "key=anyval"
-            candidate=${2%%=*}
-        fi
-
-        [[ $pat = "$candidate" ]] && return 0
-    done
-
-    return 1
-}
-
-optstring_remove_option() {
-    local o options_ remove=$2 IFS=,
-
-    read -ra options_ <<<"${!1}"
-
-    for o in "${!options_[@]}"; do
-        optstring_match_option "$remove" "${options_[o]}" && unset 'options_[o]'
-    done
-
-    declare -g "$1=${options_[*]}"
-}
-
-optstring_normalize() {
-    local o options_ norm IFS=,
-
-    read -ra options_ <<<"${!1}"
-
-    # remove empty fields
-    for o in "${options_[@]}"; do
-        [[ $o ]] && norm+=("$o")
-    done
-
-    # avoid empty strings, reset to "defaults"
-    declare -g "$1=${norm[*]:-defaults}"
-}
-
-optstring_append_option() {
-    if ! optstring_has_option "$1" "$2"; then
-        declare -g "$1=${!1},$2"
-    fi
-
-    optstring_normalize "$1"
-}
-
-optstring_prepend_option() {
-    if ! optstring_has_option "$1" "$2"; then
-        declare -g "$1=$2,${!1}"
-    fi
-
-    optstring_normalize "$1"
-}
-
-optstring_get_option() {
-    local opts o
-
-    IFS=, read -ra opts <<<"${!1}"
-    for o in "${opts[@]}"; do
-        if optstring_match_option "$2" "$o"; then
-            declare -g "$o"
-            return 0
-        fi
-    done
-
-    return 1
-}
-
-optstring_has_option() {
-    local "${2%%=*}"
-
-    optstring_get_option "$1" "$2"
-}
+. @libdir@/artools/util-base.sh
 
 write_source() {
-    local src=$1 spec label uuid comment=()
+    local src=$1 spec= label= uuid= comment=()
 
     label=$(lsblk -rno LABEL "$1" 2>/dev/null)
     uuid=$(lsblk -rno UUID "$1" 2>/dev/null)
@@ -251,7 +45,7 @@ write_source() {
         ;;
     esac
 
-    [[ -n "${comment[*]}" ]] && printf '# %s\n' "${comment[*]}"
+    [[ $comment ]] && printf '# %s\n' "${comment[*]}"
 
     if [[ $spec ]]; then
         printf '%-20s' "$bytag=$(mangle "$spec")"
@@ -261,7 +55,7 @@ write_source() {
 }
 
 optstring_apply_quirks() {
-    local varname="$1" fstype="$2"
+    local varname=$1 fstype=$2
 
     # SELinux displays a 'seclabel' option in /proc/self/mountinfo. We can't know
     # if the system we're generating the fstab for has any support for SELinux (as
@@ -284,7 +78,7 @@ optstring_apply_quirks() {
         ;;
         vfat)
             # Before Linux v3.8, "cp" is prepended to the value of the codepage.
-            if optstring_get_option "$varname" codepage && [[ "$codepage" = cp* ]]; then
+            if optstring_get_option "$varname" codepage && [[ $codepage = cp* ]]; then
                 optstring_remove_option "$varname" codepage
                 optstring_append_option "$varname" "codepage=${codepage#cp}"
             fi
@@ -292,8 +86,6 @@ optstring_apply_quirks() {
     esac
 }
 
-#}}}
-
 usage() {
   cat <<EOF
 usage: ${0##*/} [options] root
@@ -366,19 +158,23 @@ while read -r src target fstype opts fsroot; do
         pass=0
     fi
 
-    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
+    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
         fi
-        fstype=none
-        opts+=,bind
-        pass=0
     fi
 
     # filesystem quirks
@@ -407,7 +203,7 @@ done
 # handle swaps devices
 {
     # ignore header
-    read -r
+    read
 
     while read -r device type _ _ prio; do
         options=defaults

bin/base/mkchroot.in

@@ -12,12 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/base/chroot.sh
-
-CHROOTVERSION=@chrootver@
+. @libdir@/artools/util-base.sh
 
 working_dir=''
 umode=''
@@ -26,19 +21,19 @@ files=()
 chroot_args=()
 
 usage() {
-    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'
+    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'
     exit 1
 }
 
-orig_args=("$@")
+orig_argv=("$0" "$@")
 
 opts='hUC:M:c:f:s'
 
@@ -51,32 +46,35 @@ 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")
         [[ -v OPTARG ]] && chroot_args+=("$OPTARG")
     fi
 done
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
 (( $# < 2 )) && die 'You must specify a directory and one or more packages.'
 
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
-working_dir="$(readlink -f "$1")"
+working_dir="$(readlink -f $1)"
 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 < <(pacman-conf CacheDir)
+	mapfile -t cache_dirs < <($pacconf_cmd CacheDir)
 fi
 
 umask 0022
 
-[[ -e $working_dir ]] && die "Working directory '%s' already exists" "$working_dir"
+#[[ -e $working_dir ]] && die "Working directory '%s' already exists" "$working_dir"
 
-mkdir -p "$working_dir"
+#mkdir -p "$working_dir"
 
 [[ ! -d $working_dir ]] && mkdir -p "$working_dir"
 
@@ -95,13 +93,12 @@ for f in "${files[@]}"; do
     cp "$f" "$working_dir$f"
 done
 
-unshare --mount basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
-    "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
+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"
-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"
+echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
+echo "${CHROOTVERSION}" > "$working_dir/.artools"
 
 dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 

bin/iso/buildiso.in

@@ -12,231 +12,78 @@
 # 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'}
+. @libdir@/artools/util-iso.sh
 
-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"
-    msg2 "Cleaning [%s]" "${mnt##*/}"
-
-    path=$mnt/boot
-    if [[ -d "$path" ]]; then
-        find "$path" -name 'initramfs*.img' -delete &> /dev/null
-    fi
-    path=$mnt/var/lib/pacman/sync
-    if [[ -d $path ]];then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/cache/pacman/pkg
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/log
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-    path=$mnt/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-    # shellcheck disable=2035
-    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
-    if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
-        rm "$mnt"/boot/grub/grub.cfg
-    fi
-    if [[ -f "$mnt/etc/machine-id" ]]; then
-        rm "$mnt"/etc/machine-id
-    fi
-}
-
-copy_overlay(){
-    local src="$1" dest="$2"
-    if [[ -e "$src" ]];then
-        msg2 "Copying [%s] ..." "${src##*/}"
-        cp -LR "$src"/* "$dest"
-    fi
-}
-
-make_rootfs() {
-    if [[ ! -e "${work_dir}"/rootfs.lock ]]; then
-        msg "Prepare [Base installation] (rootfs)"
-        local rootfs="${work_dir}/rootfs"
-
-        prepare_dir "${rootfs}"
-
-        basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"
-
-        copy_overlay "${root_overlay}" "${rootfs}"
-
-        [[ -z ${live_list} ]] && configure_chroot "${rootfs}"
-
-        clean_up_chroot "${rootfs}"
-
-        : > "${work_dir}"/rootfs.lock
-
-        msg "Done [Base installation] (rootfs)"
-    fi
-}
-
-make_livefs() {
-    if [[ ! -e ${work_dir}/livefs.lock ]]; then
-        msg "Prepare [Live installation] (livefs)"
-        local livefs="${work_dir}/livefs"
-
-        prepare_dir "${livefs}"
-
-        mount_overlayfs "${livefs}" "${work_dir}"
-
-        basestrap "${basestrap_args[@]}" "${livefs}" "${packages[@]}"
-
-        copy_overlay "${live_overlay}" "${livefs}"
-
-        configure_chroot "${livefs}"
-
-        umount_overlayfs
-
-        clean_up_chroot "${livefs}"
-
-        : > "${work_dir}"/livefs.lock
-
-        msg "Done [Live installation] (livefs)"
-    fi
-}
-
-make_bootfs() {
-    if [[ ! -e ${work_dir}/bootfs.lock ]]; then
-        msg "Prepare [/iso/boot]"
-
-        prepare_dir "${iso_root}/boot"
-
-        cp "${work_dir}"/rootfs/boot/vmlinuz* "${iso_root}"/boot/vmlinuz-"${arch}"
-
-        local bootfs="${work_dir}/bootfs"
-
-        mount_overlayfs "${bootfs}" "${work_dir}"
-
-        if "${use_dracut}"; then
-            prepare_initramfs_dracut "${bootfs}"
-        else
-            prepare_initramfs_mkinitcpio "${bootfs}"
-        fi
-
-        umount_overlayfs
-
-        rm -R "${bootfs}"
-        : > "${work_dir}"/bootfs.lock
-        msg "Done [/iso/boot]"
-    fi
-}
-
-make_grub(){
-    if [[ ! -e ${work_dir}/grub.lock ]]; then
-        msg "Prepare [/iso/boot/grub]"
-
-        local layer=${work_dir}/rootfs
-        [[ -n ${live_list} ]] && layer=${work_dir}/livefs
-
-        prepare_grub "${work_dir}/rootfs" "$layer"
-
-        if ${use_dracut}; then
-            configure_grub_dracut
-        else
-            configure_grub_mkinitcpio
-        fi
-
-        : > "${work_dir}"/grub.lock
-        msg "Done [/iso/boot/grub]"
-    fi
-}
+prepare_artools
 
 gen_iso_fn(){
     local vars=("artix") name
-    vars+=("${profile}")
+    vars+=("${PROFILE}")
     vars+=("${INITSYS}")
-    case "${repo}" in
-        'gremlins'|'goblins') vars+=("${repo}") ;;
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') vars+=("${REPOSITORY}") ;;
     esac
     vars+=("${ISO_VERSION}")
-    vars+=("${arch}")
-    for n in "${vars[@]}"; do
+    vars+=("${ARCH}")
+    for n in ${vars[@]};do
         name=${name:-}${name:+-}${n}
     done
-    printf "%s\n" "$name"
+    echo $name
 }
 
 prepare_build(){
+    timer_start=$(get_timer)
+
     load_profile
 
-    case "${repo}" in
-        'gremlins'|'goblins') repo="${repo}" ;;
-        *) repo=default ;;
+    local pacman_conf pac_file="pacman-default.conf"
+
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') pac_file="pacman-${REPOSITORY}.conf" ;;
     esac
 
-    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"
+    pacman_conf="${DATADIR}/$pac_file"
+    [[ -f ${USER_CONF_DIR}/$pac_file ]] && pacman_conf="${USER_CONF_DIR}/$pac_file"
 
     iso_file=$(gen_iso_fn).iso
 
     iso_label="ARTIX_$(date +%Y%m)"
 
-    basestrap_args+=(-C "${pacman_conf}")
-    work_dir=${chroots_iso}/${profile}/artix
+    basestrap_args+=(-C ${pacman_conf})
+    work_dir=${CHROOTS_ISO}/${PROFILE}/artix
 
-    iso_dir="${ISO_POOL}/${profile}"
+    prepare_dir "${ISO_POOL}"
 
-    iso_root=${chroots_iso}/${profile}/iso
+    iso_dir="${ISO_POOL}/${PROFILE}"
+
+    iso_root=${CHROOTS_ISO}/${PROFILE}/iso
     live_dir=/LiveOS
 
-    mnt_dir=${chroots_iso}/${profile}/mnt
+    mnt_dir=${CHROOTS_ISO}/${PROFILE}/mnt
 
-    if [[ -n "${GPG_KEY}" ]]; then
-        ${use_dracut} || export_gpg_publickey
-    fi
+    prepare_dir "${mnt_dir}"
+    prepare_dir "${iso_dir}"
+    prepare_dir "${iso_root}"
 }
 
 display_settings(){
     msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
+    msg2 "PROFILE: %s" "${PROFILE}"
     msg2 "INITSYS: %s" "${INITSYS}"
     [[ -n ${GPG_KEY} ]] && msg2 "GPG_KEY: %s" "${GPG_KEY}"
 
     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
 }
 
 mk_squash(){
+    local timer=$(get_timer)
     make_sfs "${work_dir}/rootfs"
-    if [[ -d "${work_dir}/livefs" ]]; then
-        make_sfs "${work_dir}/livefs"
-    fi
+    [[ -d "${work_dir}/livefs" ]] && make_sfs "${work_dir}/livefs"
+    show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
 mk_iso(){
@@ -249,25 +96,29 @@ mk_iso(){
         rm -rf "${iso_dir}/${iso_file}"
     fi
     assemble_iso
-    chown -R "${owner}:$(id --group "${owner}")" "${iso_dir}"
+    chown -R "${OWNER}:$(id --group ${OWNER})" "${iso_dir}"
 }
 
 mk_boot(){
+    local timer=$(get_timer)
     run_safe "make_bootfs"
     run_safe "make_grub"
+    show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
 mk_chroots(){
-    load_pkgs "${root_list}"
+    local timer=$(get_timer)
+    load_pkgs "${ROOT_LIST}" "${INITSYS}"
     run_safe "make_rootfs"
-    if [[ -n ${live_list} ]]; then
-        load_pkgs "${live_list}"
+    if [[ -n ${LIVE_LIST} ]]; then
+        load_pkgs "${LIVE_LIST}" "${INITSYS}"
         run_safe "make_livefs"
     fi
+    show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
 build(){
-    msg "Start building [%s]" "${profile}"
+    msg "Start building [%s]" "${PROFILE}"
     if ${clean_first};then
         for copy in "${work_dir}"/*; do
             [[ -d $copy ]] || continue
@@ -286,28 +137,35 @@ build(){
         rm -rf --one-file-system "${iso_root}"
     fi
 
-    if ${chroot_only}; then
-        mk_chroots
-        warning "Continue squash: %s -p %s -sc ..." "${cmd}" "${profile}"
-        exit 1
-    elif ${boot_only}; then
-        mk_boot
-        warning "Continue iso: %s -p %s -zc ..." "${cmd}" "${profile}"
-        exit 1
-    elif ${squash_only}; then
-        mk_squash
-        warning "Continue boot: %s -p %s -bc ..." "${cmd}" "${profile}"
-        exit 1
-    elif ${iso_only}; then
-        [[ ! -d ${work_dir} ]] && die "Create chroot: %s -p %s -x" "${cmd}" "${profile}"
-        mk_iso
-    else
-        mk_chroots
-        mk_boot
-        mk_squash
-        mk_iso
-    fi
-    msg "Finished building [%s]" "${profile}"
+    case true in
+        ${chroot_only})
+            mk_chroots
+            warning "Continue squash: %s -p %s -sc ..." "${cmd}" "${PROFILE}"
+            exit 1
+        ;;
+        ${boot_only})
+            mk_boot
+            warning "Continue iso: %s -p %s -zc ..." "${cmd}" "${PROFILE}"
+            exit 1
+        ;;
+        ${squash_only})
+            mk_squash
+            warning "Continue boot: %s -p %s -bc ..." "${cmd}" "${PROFILE}"
+            exit 1
+        ;;
+        ${iso_only})
+            [[ ! -d ${work_dir} ]] && die "Create chroot: %s -p %s -x" "${cmd}" "${PROFILE}"
+            mk_iso
+        ;;
+        *)
+            mk_chroots
+            mk_boot
+            mk_squash
+            mk_iso
+        ;;
+    esac
+    msg "Finished building [%s]" "${PROFILE}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
 clean_first=true
@@ -322,46 +180,42 @@ boot_only=false
 basestrap_args=(-GMc)
 cmd=${0##*/}
 
-repo=${cmd##*-}
-owner=${SUDO_USER:-$USER}
-profile='base'
-chroots_iso="${CHROOTS_DIR}/buildiso"
-arch=$(uname -m)
+REPOSITORY=${cmd##*-}
 
 usage() {
-    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"
+    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 ''
+    exit $1
 }
 
-orig_args=("$@")
+orig_argv=("$0" "$@")
 
 opts='p:r:t:i:g:czsbxmdqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) profile="$OPTARG" ;;
-        r) chroots_iso="$OPTARG" ;;
+        p) PROFILE="$OPTARG" ;;
+        r) CHROOTS_ISO="$OPTARG" ;;
         t) ISO_POOL="$OPTARG" ;;
         i) INITSYS="$OPTARG" ;;
         g) GPG_KEY="$OPTARG" ;;
@@ -374,21 +228,18 @@ while getopts "${opts}" arg; do
         d) use_dracut=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
+
+check_root
+
+prepare_traps
 
 prepare_build
 
 ${pretend} && display_settings && exit 1
 
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
-
-prepare_dir "${mnt_dir}"
-prepare_dir "${iso_dir}"
-prepare_dir "${iso_root}"
-
-prepare_traps
-
 build

bin/iso/deployiso.in

@@ -0,0 +1,73 @@
+#!/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.
+
+. @libdir@/artools/util-iso.sh
+
+prepare_artools
+
+connect(){
+    echo "${ACCOUNT}@${FILE_HOST}:${FILE_HOME}"
+}
+
+prepare_transfer(){
+    DEST_DIR="/iso/${PROFILE}/"
+    SRC_DIR="${ISO_POOL}/${PROFILE}/"
+}
+
+sync_dir(){
+    msg "Start upload [%s] ..." "${PROFILE}"
+    rsync "${rsync_args[@]}" ${SRC_DIR} $(connect)${DEST_DIR}
+    msg "Done upload [%s]" "${PROFILE}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}
+
+update=false
+verbose=false
+
+rsync_args=(-aP --progress -e "ssh -p ${FILE_PORT}")
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -p                 Source folder to upload [default: ${PROFILE}]"
+    echo "    -l                 Limit bandwidth in kB/s [default:${UPLIMIT}]"
+    echo '    -u                 Update remote directory'
+    echo '    -v                 Verbose output'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+opts='p:l:uvh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        p) PROFILE="$OPTARG" ;;
+        l) UPLIMIT="$OPTARG" ;;
+        u) update=true; rsync_args+=(-u) ;;
+        v) verbose=true; rsync_args+=(-v --stats) ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+timer_start=$(get_timer)
+
+rsync_args+=(--bwlimit=${UPLIMIT})
+
+prepare_transfer
+
+sync_dir

bin/pkg/artixpkg.in

@@ -1,80 +0,0 @@
-#!/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

bin/pkg/batchpkg.in

@@ -0,0 +1,73 @@
+#!/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.
+
+. /usr/lib/artools/util-pkg.sh
+
+prepare_artools
+
+batch_move() {
+    local name="${1:-pkg_moves}"
+    local pkglist=${TREE_DIR_ARTIX}/$name.list
+    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
+    while read 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_upgrade() {
+#     local pkglist=${TREE_DIR_ARTIX}/pkg_upgrades.list
+#     [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
+#     while read entry;do
+#         local pkg=${entry#*:}
+#         local dest=${entry%:*}
+#         echo "buildtree -i -p ${pkg}"
+#         echo "${dest}pkg -u -p ${pkg}"
+#     done < $pkglist
+# }
+
+usage() {
+    echo "Usage: ${0##*/} [optional listname]"
+    echo '    -r                 Run generated commands'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+movelistname=pkg_moves
+runlist=false
+
+opts='rh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) runlist=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+movelistname="$1"; shift
+
+batch_move "$movelistname"

bin/pkg/buildpkg.in

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-23 artoo@artixlinux.org
+# 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
@@ -12,51 +12,50 @@
 # 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'}
+. @libdir@/artools/util-pkg.sh
 
-source "${LIBDIR}"/base/util.sh
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/base/chroot.sh
+prepare_artools
 
 create_first=false
 rebuild=false
+no_check=false
+is_checkpkg=false
 
 mkchrootpkg_args=(-c -n)
 
 cmd=${0##*/}
 repo=${cmd#*-}
 base_devel=('base-devel')
-chroots_pkg="${CHROOTS_DIR}/buildpkg"
-arch=$(uname -m)
 
 usage() {
-    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"
+    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 ''
+    exit $1
 }
 
+orig_argv=("$0" "$@")
+
 opts='hcCNmr:d:'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        r) chroots_pkg="$OPTARG" ;;
+        r) CHROOTS_PKG="$OPTARG" ;;
         d) repo="$OPTARG" ;;
         c) create_first=true ;;
         m) rebuild=true ;;
-        C) mkchrootpkg_args+=(-C) ;;
-        N) mkchrootpkg_args+=(-N) ;;
+        C) is_checkpkg=true; mkchrootpkg_args+=(-C) ;;
+        N) no_check=true; mkchrootpkg_args+=(-N) ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
     esac
 done
 
@@ -66,45 +65,24 @@ else
     case ${repo} in
         system|world|galaxy) repo='default' ;;
         lib32*) base_devel+=('multilib-devel') ;;
-        *-gremlins|*-goblins) repo=${repo#*-} ;;
+        galaxy-gremlins|galaxy-goblins) repo=${repo#*-} ;;
     esac
 fi
 
-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"
+pacman_conf="${DATADIR}/pacman-${repo}.conf"
+[[ -f ${USER_CONF_DIR}/pacman-${repo}.conf ]] && pacman_conf="${USER_CONF_DIR}/pacman-${repo}.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"
+makepkg_conf="${DATADIR}/makepkg.conf"
+[[ -f ${USER_CONF_DIR}/makepkg.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.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 "${BASH_SOURCE[0]}" "$@"
+check_root SOURCE_DATE_EPOCH
 
 mkchrootpkg_args+=("${@:$OPTIND}")
 
-if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then
-    msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}"
+if ${create_first} || [[ ! -d "${CHROOTS_PKG}/${repo}-${ARCH}" ]];then
+    msg "Creating chroot for [%s] (%s)..." "${repo}" "${ARCH}"
 
-    for copy in "${chroots_pkg}/${repo}-${arch}"/*; do
+    for copy in "${CHROOTS_PKG}/${repo}-${ARCH}"/*; do
         [[ -d $copy ]] || continue
         msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
 
@@ -115,19 +93,19 @@ if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then
     done
     lock_close 9
 
-    rm -rf --one-file-system "${chroots_pkg}/${repo}-${arch}"
-    (umask 0022; mkdir -p "${chroots_pkg}/${repo}-${arch}")
-    setarch "${set_arch}" mkchroot \
+    rm -rf --one-file-system "${CHROOTS_PKG}/${repo}-${ARCH}"
+    (umask 0022; mkdir -p "${CHROOTS_PKG}/${repo}-${ARCH}")
+    setarch "${ARCH}" mkchroot \
         -C "${pacman_conf}" \
         -M "${makepkg_conf}" \
-        "${chroots_pkg}/${repo}-${arch}/root" \
+        "${CHROOTS_PKG}/${repo}-${ARCH}/root" \
         "${base_devel[@]}" || abort
 else
-    lock 9 "${chroots_pkg}/${repo}-${arch}/root.lock" "Locking clean chroot"
+    lock 9 "${CHROOTS_PKG}/${repo}-${ARCH}/root.lock" "Locking clean chroot"
     chroot-run \
         -C "${pacman_conf}" \
         -M "${makepkg_conf}" \
-        "${chroots_pkg}/${repo}-${arch}/root" \
+        "${CHROOTS_PKG}/${repo}-${ARCH}/root" \
         pacman -Syuu --noconfirm || abort
 fi
 
@@ -136,5 +114,9 @@ if [[ ! -v SOURCE_DATE_EPOCH ]]; then
     export SOURCE_DATE_EPOCH=$(date +%s)
 fi
 
-msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
-exec mkchrootpkg -r "${chroots_pkg}/${repo}-${arch}" "${mkchrootpkg_args[@]}"
+timer_start=$(get_timer)
+
+msg "Building in chroot for [%s] (%s)..." "${repo}" "${ARCH}"
+exec mkchrootpkg -r "${CHROOTS_PKG}/${repo}-${ARCH}" "${mkchrootpkg_args[@]}"
+
+show_elapsed_time "${FUNCNAME}" "${timer_start}"

bin/pkg/buildtree.in

@@ -0,0 +1,269 @@
+#!/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.
+
+. @libdir@/artools/util-pkg.sh
+
+prepare_artools
+
+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"
+            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
+                patch -Np 1 -i ${DATADIR}/patches/artix-bash.patch
+                updpkgsums
+            cd ../..
+        ;;
+        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
+}
+
+pull_tree_arch(){
+    cd ${TREE_DIR_ARCH}
+    for tree in ${TREE_NAMES_ARCH[@]};do
+        if [[ -d ${tree} ]];then
+            cd ${tree}
+            pull_tree "${tree}" "$(get_local_head)" "Arch"
+            cd ..
+        else
+            clone_tree "${HOST_TREE_ARCH}" "${tree}" "Arch"
+        fi
+    done
+}
+
+pull_tree_artix(){
+    local repos=("$1")
+    cd ${TREE_DIR_ARTIX}
+    for tree in ${repos[@]};do
+        if [[ -d ${tree} ]];then
+            config_tree "${tree}"
+            cd ${tree}
+            pull_tree "${tree}" "$(get_local_head)"
+            cd ..
+        else
+            clone_tree "${HOST_TREE_ARTIX}" "${tree}"
+            config_tree "${tree}"
+        fi
+    done
+}
+
+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"
+
+    . $src/PKGBUILD 2>/dev/null
+
+    [[ $arch == 'any' ]] && CARCH=any
+
+    local archver=$(get_full_version)
+
+    [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
+    msg2 "pkgname: %s" "${pkgname[*]}"
+    [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
+    msg2 "Arch Version: %s" "$archver"
+    msg2 "arch: %s" "$CARCH"
+
+    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
+    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
+}
+
+subrepo_new(){
+    cd ${TREE_DIR_ARTIX}/${GROUP}
+
+    local org=$(get_pkg_org "${PACKAGE}")
+
+    create_repo "${PACKAGE}" "$org"
+
+    add_repo_to_team "${PACKAGE}" "$org" "${TEAM}"
+
+    subrepo_clone "${PACKAGE}" "$org"
+
+    prepare_dir "${TREE_DIR_ARTIX}/${GROUP}/${PACKAGE}/trunk"
+
+    commit_jenkins_files "${PACKAGE}"
+}
+
+from_arch(){
+    cd ${TREE_DIR_ARTIX}
+
+    local srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
+    [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+
+    local repo=$(find_repo "$srcpath")
+    msg "repo: %s" "$repo"
+
+    local archpath=$srcpath/repos/$repo
+    local 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=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
+    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+    local repo=$(find_repo "${archpath}")
+    archpath=$archpath/repos/$repo
+    msg2 "repo: %s" "$repo"
+    show_deps "$archpath"
+}
+
+check_tree(){
+    local archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
+    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    local 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
+    if ${sync_artix};then
+        if ${sync_group}; then
+            pull_tree_artix "${GROUP}"
+        else
+            pull_tree_artix "${TREE_NAMES_ARTIX[*]}"
+        fi
+    fi
+}
+
+load_makepkg_config
+
+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=${TREE_NAMES_ARTIX[0]}
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo '    -p <pkg>      Package name'
+    echo '    -t <team>     Team name (only with -n)'
+    echo '                  Possible values: core,extra,community,multilib'
+    echo "                  [default: ${TEAM}]"
+    echo '    -g <group>    Group name, the superrepo (only with -n or -s)'
+    echo "                  [default: ${GROUP}]"
+    echo "    -s            Clone or pull repos"
+    echo "    -a            Don't clone or pull arch repos"
+    echo "    -b            Don't clone or pull artix repos"
+    echo '    -i            Import a package from arch repos'
+    echo '    -n            New remote subrepo and clone it'
+    echo '    -v            Check if a package is in the artix tree(s)'
+    echo '    -c            View package depends'
+    echo '    -x            Exclude testing (only with -i)'
+    echo '    -y            Exclude staging (only with -i)'
+    echo '    -z            Include kde & gnome unstable (only with -i)'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+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))
+
+prepare_dir "${TREE_DIR_ARTIX}"
+prepare_dir "${TREE_DIR_ARCH}"
+
+set_arch_repos "$testing" "$staging" "$unstable"
+
+${sync} && sync_repos
+
+${view} && view_build
+
+${check} && check_tree
+
+${import} && from_arch
+
+${createnew} && subrepo_new

bin/pkg/checkpkg.in

@@ -12,13 +12,74 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+. @libdir@/artools/util-pkg.sh
 
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/pkg/diff.sh
+shopt -s extglob
 
 load_makepkg_config
 
+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]
@@ -132,7 +193,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"
-        printf "%s\n" "$diff_output"
+        echo "$diff_output"
     else
         msg "No soname differences for %s." "$_pkgname"
     fi

bin/pkg/checkrepo.in

@@ -1,335 +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.
-
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-DATADIR=${DATADIR:-'@datadir@/artools'}
-SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
-
-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() {
-    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
-        fi
-    done
-}
-
-#}}}
-
-update_db_cache() {
-    local arch_mirror='https://mirror.netcologne.de/archlinux'
-
-    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}
-
-        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
-}
-
-db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
-
-linksdb_ext="links.tar.${DBEXT}"
-db_ext="db.tar.${DBEXT}"
-
-load_makepkg_config
-
-sync=false
-# check=false
-query=false
-updates=false
-
-# readonly tableU="%-20s %-35s %-30s %-10s"
-readonly tableQ="%-20s %-55s %s"
-
-#{{{ repo names arrays
-
-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
-)
-
-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() {
-    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='squh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        s) sync=true ;;
-#         c) check=true ;;
-        q) query=true ;;
-        u) updates=true ;;
-        h|?) usage 0 ;;
-    esac
-done
-#
-shift $(( OPTIND - 1 ))
-#
-library="$1"; shift
-
-# ${check} && show_db_table
-
-if ${query}; then
-    show_lib_table
-fi
-
-if ${updates}; then
-    show_updates
-fi

bin/pkg/commitpkg.in

@@ -0,0 +1,236 @@
+#!/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.
+
+. @libdir@/artools/util-pkg.sh
+
+prepare_artools
+
+get_path(){
+    local repo="$1" pkg=trunk/PKGBUILD
+    if [[ $repo != trunk ]]; then
+        [[ -f repos/$repo-${ARCH}/PKGBUILD ]] && pkg=repos/$repo-${ARCH}/PKGBUILD
+        [[ -f repos/$repo-any/PKGBUILD ]] && pkg=repos/$repo-any/PKGBUILD
+    fi
+    echo $pkg
+}
+
+prepare_commit(){
+    local dest="$1" to_rm="${2:-none}"
+    if [[ -d repos/$to_rm ]]; then
+        git rm -r repos/$to_rm
+        git commit -m "change of package arch"
+    fi
+    [[ -d repos/$dest ]] && git rm -r repos/$dest
+    [[ ! -d repos ]] && mkdir repos
+    [[ ! -d repos/$dest ]] && mkdir repos/$dest
+}
+
+check_team(){
+    if [[ ${REPO_SRC} == "core" && ${REPO_DEST} == "extra" ]] || \
+        [[ ${REPO_SRC} == "extra" && ${REPO_DEST} == "core" ]] || \
+        [[ ${REPO_SRC} == "extra" && ${REPO_DEST} == "community" ]] || \
+        [[ ${REPO_SRC} == "community" && ${REPO_DEST} == "extra" ]] ;then
+
+        local org=$(get_pkg_org "${PACKAGE}")
+        add_repo_to_team "${PACKAGE}" "$org" "${REPO_DEST}"
+        remove_repo_from_team "${PACKAGE}" "$org" "${REPO_SRC}"
+    fi
+}
+
+commit_pkg(){
+    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+
+    if [[ -n ${artixpath} ]];then
+
+        local group=${artixpath%/*}
+
+        cd ${group}
+
+        local head=$(get_local_head)
+
+        cd ${artixpath}
+
+        local pkgbuild=$(get_path "${REPO_SRC}")
+
+        . $pkgbuild
+        [[ $arch == 'any' ]] && CARCH=any
+
+        local version=$(get_full_version)
+
+        local commit_msg=""
+
+        if ${remove};then
+            local action='remove'
+            if [[ "${REPO_SRC}" == 'trunk' ]];then
+                local pkg=${PACKAGE}
+                git rm -r trunk
+            else
+                local pkg="${PACKAGE}-$version"
+                git rm -r repos/"${REPO_SRC}-$CARCH"
+            fi
+            commit_msg="[${REPO_SRC}] '$pkg' ${action}"
+            msg "Action: %s" "$commit_msg"
+        else
+            local action='modify'
+            commit_msg="[${REPO_SRC}] '${PACKAGE}-$version' ${action}"
+            msg "Action: %s" "$commit_msg"
+            git add .
+        fi
+        git commit -m "$commit_msg"
+
+        cd ${group}
+
+        ${push} && pull_tree "${group##*/}" "$head"
+
+#         subrepo_pull "${PACKAGE}"
+        subrepo_push "${PACKAGE}"
+        subrepo_clean "${PACKAGE}"
+
+        ${push} && push_tree "${group##*/}"
+
+        git prune
+    else
+        error "Package '%s' does not exist!" "${PACKAGE}"
+    fi
+}
+
+get_rm_arch(){
+    local rm_arch='none'
+    case "$CARCH" in
+        'any') rm_arch="${REPO_DEST}-x86_64" ;;
+        'x86_64') rm_arch="${REPO_DEST}-any" ;;
+    esac
+    echo $rm_arch
+}
+
+repo_commit_pkg(){
+    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    if [[ -n ${artixpath} ]];then
+
+        local group=${artixpath%/*}
+
+        cd ${group}
+
+        local head=$(get_local_head)
+
+        cd ${artixpath}
+
+        local pkgbuild=$(get_path "${REPO_SRC}")
+
+        . $pkgbuild
+        [[ $arch == 'any' ]] && CARCH=any
+
+        local version=$(get_full_version)
+
+        if [[ ${REPO_SRC} == 'trunk' ]];then
+            local action='add'
+            local dest="${REPO_DEST}-$CARCH"
+
+            prepare_commit "$dest" "$(get_rm_arch)"
+
+            cp trunk/* repos/$dest/
+        else
+            local action='move'
+            local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"
+
+            [[ ! -f repos/$src/PKGBUILD ]] && die "%s does not exist!" "repos/$src/PKGBUILD"
+            prepare_commit "$dest" "$(get_rm_arch)"
+
+            cp repos/$src/* repos/$dest/
+            git rm -r repos/$src
+        fi
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$version' ${action}"
+        msg "Action: %s" "$commit_msg"
+
+        git add .
+        git commit -m "$commit_msg"
+
+        cd ${group}
+
+        ${push} && pull_tree "${group##*/}" "$head"
+
+#         subrepo_pull "${PACKAGE}"
+        subrepo_push "${PACKAGE}"
+        subrepo_clean "${PACKAGE}"
+
+        ${push} && push_tree "${group##*/}"
+
+        git prune
+
+        check_team
+    else
+        error "Package '%s' does not exist!" "${PACKAGE}"
+    fi
+}
+
+is_valid_repo(){
+    local src="$1" cases=
+    set_arch_repos true true true
+    for r in ${ARCH_REPOS[@]};do
+        cases=${cases:-}${cases:+|}${r}
+    done
+    eval "case $src in
+        ${cases}|trunk) return 0 ;;
+        *) return 1 ;;
+    esac"
+}
+
+load_makepkg_config
+
+REPO_SRC='trunk'
+PACKAGE=''
+remove=false
+push=false
+
+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
+}
+
+orig_argv=("$0" "$@")
+
+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 "${REPO_SRC}");then
+    if [[ "${cmd}" == 'commitpkg' ]];then
+        commit_pkg
+    else
+        repo_commit_pkg
+    fi
+else
+    error "source repository '%s' is not valid!" "${REPO_SRC}"
+fi

bin/pkg/comparepkg.in

@@ -0,0 +1,324 @@
+#!/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.
+
+. @libdir@/artools/util-pkg.sh
+
+prepare_artools
+
+get_import_path(){
+    local pkg="$1" import_path=
+
+    for tree in ${TREE_NAMES_ARCH[@]};do
+        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && import_path=${TREE_DIR_ARCH}/$tree/$pkg
+    done
+    echo $import_path
+}
+
+compare_m(){
+    local artixver="$1" artixrepo="$2" archver="$3" archrepo="$4"
+
+    local result=$(vercmp "$artixver" "$archver")
+    if [[ $artixrepo == *testing* ]] || [[ $artixrepo == *staging* ]]; then
+        if [[ "$archrepo" == "$artixrepo"  ]]; then
+            msg_row "${table}" "${archrepo%-*}" "${artixrepo%-*}" "$pkg" "$archver" "$artixver" "${group#*-}"
+        else
+            msg_row_notify "${table}" "${archrepo%-*}" "${artixrepo%-*}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            if [[ -n "$archrepo" ]]; then
+                printf "%s\n" "${archrepo%-*}:${artixrepo%-*}:$pkg" >> ${TREE_DIR_ARTIX}/pkg_moves.list
+            fi
+        fi
+
+    fi
+}
+
+compare_u(){
+    local artixver="$1" artixrepo="$2" archver="$3" archrepo="$4"
+
+    local result=$(vercmp "$artixver" "$archver")
+    if [ $result -eq -1 ];then
+        msg_row_upgrade "${table}" "${archrepo%-*}" "${artixrepo%-*}" "$pkg" "$archver" "$artixver" "${group#*-}"
+        printf "%s\n" "${archrepo%-*}:$pkg" >> ${TREE_DIR_ARTIX}/pkg_upgrades.list
+    fi
+}
+
+compare_d(){
+    local artixver="$1" artixrepo="$2" archver="$3" archrepo="$4"
+
+    local result=$(vercmp "$artixver" "$archver")
+    if [ $result -eq 1 ];then
+        if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
+            msg_row_downgrade "${table}" "${archrepo%-*}" "${artixrepo%-*}" "$pkg" "$archver" "$artixver" "${group#*-}"
+        fi
+    fi
+}
+
+pre_compare(){
+    local func="$1" pkgpath="$2"
+    local group="${pkgpath%/*}"
+    group=${group##*/}
+    local pkg=${pkgpath##*/}
+    local artixrepo=$(find_repo "$pkgpath")
+    local pkgbuild=$pkgpath/repos/$artixrepo/PKGBUILD
+
+    if [[ -f $pkgbuild ]];then
+        . $pkgbuild 2>/dev/null
+        local artixver=$(get_full_version)
+
+        local archpath=$(get_import_path $pkg)
+        local archrepo=$(find_repo "${archpath}")
+        pkgbuild=$archpath/repos/$archrepo/PKGBUILD
+
+        if [[ -f "$pkgbuild" ]];then
+            . $pkgbuild 2>/dev/null
+            local archver=$(get_full_version)
+        fi
+
+        "$func" "$artixver" "$artixrepo" "$archver" "$archrepo"
+
+        unset pkgver epoch pkgrel artixver archver pkgbuild archpath
+    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"
+}
+
+tree_loop(){
+    local func="$1"
+    for tree in ${TREE_NAMES_ARTIX[@]};do
+        local pkgs=$(find ${TREE_DIR_ARTIX}/$tree -name trunk)
+        for package in ${pkgs[@]}; do
+            "$func" "$package"
+        done
+    done
+}
+
+show_compare_header(){
+    msg_table_header "${table}" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version" "Group"
+}
+
+show_upgrades_table(){
+    show_compare_header
+    [[ -f ${TREE_DIR_ARTIX}/pkg_upgrades.list ]] && rm ${TREE_DIR_ARTIX}/pkg_upgrades.list
+    tree_loop compare_upgrades
+}
+
+show_downgrades_table(){
+    show_compare_header
+    tree_loop compare_downgrades
+}
+
+show_move_table(){
+    show_compare_header
+    [[ -f ${TREE_DIR_ARTIX}/pkg_moves.list ]] && rm ${TREE_DIR_ARTIX}/pkg_moves.list
+    tree_loop compare_move
+}
+
+update_db_cache(){
+    msg "Updating database cache"
+    for repo in "${searchrepos[@]}"; do
+        local cachedir=${db_cache_dir}/${LINKSDBEXT}/${ARCH}/${repo}
+        rm -rf "$cachedir"
+        mkdir -p "$cachedir"
+        msg2 "%s" "$repo"
+        curl -L -s "${REPOS_MIRROR}/${repo}/os/${ARCH}/${repo}.${LINKSDBEXT}" \
+            | bsdtar -xf - -C "$cachedir"
+    done
+    msg "Done"
+}
+
+query_db() {
+    for repo in "${searchrepos[@]}"; do
+        local prefix=
+        local db=${db_cache_dir}/${LINKSDBEXT}/${ARCH}/${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
+        fi
+    done
+}
+
+show_lib_table() {
+    ${sync} && update_db_cache
+    msg_table_header "${tableQ}" "Repo" "Package" "Library"
+    query_db
+}
+
+is_db_entry() {
+    local pkgname="$1" repo="${REPOS[$2]}"
+
+    if [[ -d ${db_cache_dir}/${LINKSDBEXT}/${ARCH}/$repo/$pkgname ]];then
+        return 0
+    fi
+    return 1
+}
+
+check_db(){
+    local pkgpath="${1%/*}"
+    local pkg=${pkgpath##*/}
+    local sarch=(any ${ARCH})
+
+    for repo in ${ARCH_REPOS[@]};do
+        for a in ${sarch[@]};do
+
+            local pkgbuild=$pkgpath/repos/$repo-$a/PKGBUILD
+
+            if [[ -f $pkgbuild ]];then
+
+                . $pkgbuild 2>/dev/null
+                local artixver=$(get_full_version)
+
+                local is_entry=false
+
+                for name in ${pkgname[@]};do
+
+                    if is_db_entry "$name-$artixver" "$repo";then
+                        is_entry=true
+                    fi
+                    if ! $is_entry;then
+                        msg_row "${tableU}" "$repo" "$name" "$artixver" "$is_entry"
+                    fi
+                done
+                unset artixver is_entry pkgbuild pkgver epoch pkgname pkgbase
+            fi
+        done
+    done
+}
+
+show_db_table(){
+    ${sync} && update_db_cache
+    msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
+    tree_loop check_db
+}
+
+db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
+
+load_makepkg_config
+
+testing=true
+staging=true
+unstable=false
+
+upgrades=false
+downgrades=false
+move=false
+
+sync=false
+check=false
+query=false
+
+readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"
+readonly tableU="%-20s %-35s %-30s %-10s"
+readonly tableQ="%-20s %-45s %s"
+
+declare -A REPOS=(
+    [core]=system
+    [extra]=world
+    [community]=galaxy
+    [multilib]=lib32
+    [testing]=gremlins
+    [staging]=goblins
+    [community-testing]=galaxy-gremlins
+    [community-staging]=galaxy-goblins
+    [multilib-testing]=lib32-gremlins
+    [multilib-staging]=lib32-goblins
+    [kde-unstable]=kde-wobble
+    [gnome-unstable]=gnome-wobble
+)
+
+searchrepos=(
+    ${REPOS[kde-unstable]}
+    ${REPOS[gnome-unstable]}
+    ${REPOS[staging]}
+    ${REPOS[testing]}
+    ${REPOS[core]}
+    ${REPOS[extra]}
+    ${REPOS[community-staging]}
+    ${REPOS[community-testing]}
+    ${REPOS[community]}
+    ${REPOS[multilib-staging]}
+    ${REPOS[multilib-testing]}
+    ${REPOS[multilib]}
+)
+
+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 "    -s            Sync repo databases"
+    echo '    -c            Check repos'
+    echo "    -q            Query repo databases for so libs"
+    echo '    -r <repo>     Repo name to query'
+    echo '                  [default: all]'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='r:qcsudmxyzh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        u) upgrades=true ;;
+        d) downgrades=true ;;
+        m) move=true ;;
+        s) sync=true ;;
+        c) check=true ;;
+        q) query=true ;;
+        r) searchrepos=("$OPTARG") ;;
+        x) testing=false ;;
+        y) staging=false ;;
+        z) unstable=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+library="$1"; shift
+
+set_arch_repos "$testing" "$staging" "$unstable"
+
+${move} && show_move_table
+
+${upgrades} && show_upgrades_table
+
+${downgrades} && show_downgrades_table
+
+${check} && show_db_table
+
+${query} && show_lib_table

bin/pkg/deploypkg.in

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-23 artoo@artixlinux.org
+# 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
@@ -12,53 +12,60 @@
 # 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'}
+. @libdir@/artools/util-pkg.sh
 
-source "${LIBDIR}"/base/util.sh
-source "${LIBDIR}"/pkg/util.sh
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/pkg/deploy.sh
+prepare_artools
 
-#{{{ deploy
+get_pkgbasename(){
+    local pkg="$1"
+    local pkgbasename name ver rel arch
+
+    pkgbasename=${pkg%.pkg.tar*}
+    arch=${pkgbasename##*-}
+    pkgbasename=${pkgbasename%-"$arch"}
+
+    rel=${pkgbasename##*-}
+    pkgbasename=${pkgbasename%-"$rel"}
+
+    ver=${pkgbasename##*-}
+
+    name=${pkgbasename%-"$ver"}
+    echo $name
+}
 
 add(){
-    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
-        msg "Found: %s" "${pkgfile}"
-        packages+=("${pkgname}")
-        action='add'
-        ln -sfv "${pkgfile}"{,.sig} "$repo_path"/
-    fi
+    packages+=("$pkg.$ext")
+    action='add'
+    ln -sf "${pkgfile}"{,.sig} "$repo_path"/
 }
 
 remove(){
-    packages+=("$(get_pkgbasename "${pkgname}")")
+    local to_remove=$(get_pkgbasename "$pkg.$ext")
+    packages+=("$to_remove")
     action='remove'
-    rm -v "$repo_path"/"${pkgname}"{,.sig}
+    rm "$repo_path"/"$to_remove"*pkg.tar*
 }
 
 repo_action(){
-    local packages=() action func="$1"
-    for pkgname in "${passfiles[@]}"; do
-        "$func"
+    local packages=() action= func="$1"
+    for pkgname in ${passfiles[@]}; do
+        pkg=${pkgname%.*}
+        for ext in zst xz;do
+            if pkgfile=$(find_cached_pkgfile "$pkg.$ext");then
+                msg "Found: %s" "${pkgfile}"
+                "$func"
+            fi
+        done
     done
-    cd "$repo_path" || return
-    if [[ -n "${action}" ]]; then
-        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
-        if ${linksdb}; then
-            links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
-        fi
+    cd $repo_path
+    if [[ -n "$action" ]]; then
+        repo-"$action" -R "${dest_repo}"."${PKGDBEXT}" "${packages[@]}"
+        ${linksdb} && links-"$action" "${dest_repo}"."${LINKSDBEXT}" "${packages[@]}"
     fi
 }
 
-#}}}
-
 load_makepkg_config
 
-pkgdb_ext="db.tar.${DBEXT}"
-linksdb_ext="links.tar.${DBEXT}"
-
 add_pkg=false
 rm_pkg=false
 linksdb=false
@@ -67,15 +74,15 @@ cmd=${0##*/}
 dest_repo=${cmd#*-}
 
 usage() {
-    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"
+    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 ''
+    exit $1
 }
 
 opts='arlhd:'
@@ -87,16 +94,19 @@ 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
 
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
-passfiles=("$@")
+passfiles="$@"
 
-repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
+prepare_dir "${REPOS_ROOT}"
 
-if [[ -n "${passfiles[*]}" ]]; then
+repo_path=${REPOS_ROOT}/${dest_repo}/os/${ARCH}
+
+if [[ -n ${passfiles[@]} ]]; then
     if ${add_pkg}; then
         repo_action add
     fi

bin/pkg/diffpkg.in

@@ -1,332 +0,0 @@
-#!/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}"
-
-    local -a diffoptions
-    diffoptions=("${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

bin/pkg/export-pkgbuild-keys.in

@@ -1,72 +0,0 @@
-#!/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

bin/pkg/find-libdeps.in

@@ -12,11 +12,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
+. @libdir@/artools/util-pkg.sh
 
 set -e
+shopt -s extglob
 
 IGNORE_INTERNAL=0
 
@@ -33,9 +32,9 @@ case $script_mode in
 esac
 
 if [[ -z $1 ]]; then
-    printf "%s [options] <package file|extracted package dir>\n" "${0##*/}"
-    printf "Options:\n"
-    printf "    --ignore-internal      ignore internal libraries\n"
+    echo "${0##*/} [options] <package file|extracted package dir>"
+    echo "Options:"
+    echo "    --ignore-internal      ignore internal libraries"
     exit 1
 fi
 
@@ -52,13 +51,9 @@ 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
@@ -66,13 +61,11 @@ process_sofile() {
     fi
     if ! in_array "${soname}=${soversion}-${soarch}" "${soobjects[@]}"; then
         # libfoo.so=1-64
-        printf "%s\n" "${soname}=${soversion}-${soarch}"
+        echo "${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*');;

bin/pkg/finddeps.in

@@ -12,18 +12,16 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
+. @libdir@/artools/util-base.sh
 
 match=$1
 
 if [[ -z $match ]]; then
-    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'
+    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 ''
     exit 1
 fi
 

bin/pkg/lddd.in

@@ -12,9 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
+. @libdir@/artools/util-base.sh
 
 ifs=$IFS
 IFS="${IFS}:"
@@ -42,7 +40,7 @@ for tree in $PATH $libdirs $extras; do
             #  Is an ELF binary.
             if (( $(ldd "$i" 2>/dev/null | grep -c 'not found') != 0 )); then
                 #  Missing lib.
-                printf "%s\n" "$i:" >> "$TEMPDIR/raw.txt"
+                echo "$i:" >> "$TEMPDIR/raw.txt"
                 ldd "$i" 2>/dev/null | grep 'not found' >> "$TEMPDIR/raw.txt"
             fi
         fi

bin/pkg/links-add.in

@@ -19,10 +19,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-
 shopt -s extglob
 
 declare -r REPO_DB_NAME="links"
@@ -37,6 +33,9 @@ REPO_DB_PREFIX=
 REPO_DB_SUFFIX=
 LOCKFILE=
 CLEAN_LOCK=0
+# PREVENT_DOWNGRADE=0
+
+. @libdir@/artools/util-base.sh
 
 # ensure we have a sane umask set
 umask 0022
@@ -54,6 +53,7 @@ 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"
@@ -73,12 +73,12 @@ packages to remove can be specified on the command line.\n"
     printf -- "  -k, --key <key>   use the specified key to sign the database\n"
     printf -- "  -v, --verify      verify database's signature before update\n"
     printf -- "\n\
-See %s(8) for more details and descriptions of the available options.\n" "$cmd"
+See %s(8) for more details and descriptions of the available options.\n" $cmd
     printf "\n"
     if [[ $cmd == "links-add" ]] ; then
-        printf -- "Example:  links-add /path/to/repo.links.tar.xz pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
+        printf -- "Example:  links-add /path/to/repo.${LINKSDBEXT} pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
     elif [[ $cmd == "links-remove" ]] ; then
-        printf -- "Example:  links-remove /path/to/repo.links.tar.xz kernel26\n"
+        printf -- "Example:  links-remove /path/to/repo.${LINKSDBEXT} kernel26\n"
     fi
 }
 
@@ -88,8 +88,8 @@ find_pkgentry() {
 
     for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
         name=${pkgentry##*/}
-        if [[ ${name%-*-*} = "$pkgname" ]]; then
-            printf "%s\n" "$pkgentry"
+        if [[ ${name%-*-*} = $pkgname ]]; then
+            echo $pkgentry
             return 0
         fi
     done
@@ -103,8 +103,8 @@ check_gpg() {
     fi
 
     if (( ! VERIFY )); then
-        if ! gpg --list-secret-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then
-            if [[ -n "$GPGKEY" ]]; then
+        if ! gpg --list-key ${GPGKEY} &>/dev/null; then
+            if [[ ! -z $GPGKEY ]]; then
                 error "The key ${GPGKEY} does not exist in your keyring."
             elif (( ! KEY )); then
                 error "There is no key in your keyring."
@@ -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,13 +155,21 @@ verify_signature() {
 }
 
 verify_repo_extension() {
-    local junk=()
-    if [[ $1 = *.links.tar* ]] && get_compression_command "$1" junk; then
-        return 0
-    fi
+    local repofile=$1
 
-    error "'%s' does not have a valid database archive extension." "$1"
-    exit 1
+    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"
 }
 
 # write an entry to the pacman database
@@ -193,6 +201,18 @@ 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
@@ -202,7 +222,7 @@ db_write_entry() {
 
     mkdir "$tmppkg"
 
-    bsdtar -xof "$pkgfile" -C "$tmppkg" --include={opt,{,usr/}{lib{,32},{s,}bin}}'/*' 2>/dev/null
+    bsdtar -xof $pkgfile -C $tmppkg --include={opt,{,usr/}{lib{,32},{s,}bin}}'/*' 2>/dev/null
 
     pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
     mkdir "$pkgname-$pkgver"
@@ -212,11 +232,10 @@ 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 ${files}; do
+    for f in $(find $tmppkg -type f); do
         readelf -d "$f" 2> /dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'
-    done | sort -u > "$linksentry"
+    done | sort -u > $linksentry
 
     popd >/dev/null
     popd >/dev/null
@@ -229,8 +248,7 @@ db_write_entry() {
 db_remove_entry() {
     local pkgname=$1
     local notfound=1
-    local pkgentry
-    pkgentry=$(find_pkgentry "$pkgname")
+    local pkgentry=$(find_pkgentry "$pkgname")
     while [[ -n $pkgentry ]]; do
         notfound=0
 
@@ -239,8 +257,7 @@ db_remove_entry() {
         rm -rf "$pkgentry"
 
         # remove entries in "links" database
-        local linksentry
-        linksentry=$(printf "%s\n" "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
+        local linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
         rm -rf "$linksentry"
 
         pkgentry=$(find_pkgentry "$pkgname")
@@ -260,7 +277,7 @@ prepare_repo_db() {
     fi
 
     # check lock file
-    if ( set -o noclobber; printf "%s\n" "$$" > "$LOCKFILE") 2> /dev/null; then
+    if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then
         CLEAN_LOCK=1
     else
         error "Failed to acquire lockfile: %s." "$LOCKFILE"
@@ -377,6 +394,7 @@ 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%/*}
 
@@ -385,13 +403,13 @@ create_db() {
     tempname=$dirname/.tmp.$filename
 
     pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
-    local files=(*)
-    if [[ ${files[*]} = '*' ]]; then
+    if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then
+        bsdtar -c${TAR_OPT}f "$tempname" *
+    else
         # we have no packages remaining? zip up some emptyness
         warning "No packages remain, creating empty database."
-        files=(-T /dev/null)
+        bsdtar -c${TAR_OPT}f "$tempname" -T /dev/null
     fi
-    bsdtar -cf - "${files[@]}" | compress_as "$filename" > "$tempname"
     popd >/dev/null
 
     create_signature "$tempname"
@@ -401,7 +419,7 @@ trap_exit() {
     # unhook all traps to avoid race conditions
     trap '' EXIT TERM HUP QUIT INT ERR
 
-    printf '\n'
+    echo
     error "$@"
     clean_up 1
 }
@@ -415,7 +433,7 @@ clean_up() {
     [[ -d $tmpdir ]] && rm -rf "$tmpdir"
     (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE"
 
-    exit "$exit_code"
+    exit $exit_code
 }
 
 # PROGRAM START
@@ -455,6 +473,7 @@ 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
@@ -472,7 +491,7 @@ else
     LOCKFILE=$PWD/$REPO_DB_FILE.lck
 fi
 
-verify_repo_extension "$REPO_DB_FILE"
+verify_repo_extension "$REPO_DB_FILE" >/dev/null
 
 REPO_DB_PREFIX=${REPO_DB_FILE##*/}
 REPO_DB_PREFIX=${REPO_DB_PREFIX%.links.*}

bin/pkg/makerepropkg.in

@@ -1,277 +0,0 @@
-#!/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__
-}
-
-orig_args=("$@")
-
-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 "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
-
-[[ -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}

bin/pkg/mkchrootpkg.in

@@ -12,13 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/base/chroot.sh
-
-export BUILDTOOL=@buildtool@
-export BUILDTOOLVER=@buildtoolver@
+. @libdir@/artools/util-base.sh
 
 shopt -s nullglob
 
@@ -37,6 +31,7 @@ clean_first=0
 run_namcap=0
 run_checkpkg=0
 temp_chroot=0
+run_nocheck=0
 
 bindmounts=()
 
@@ -46,43 +41,43 @@ copy=$USER
 src_owner=${SUDO_USER:-$USER}
 
 usage() {
-    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'
+    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'
     exit 1
 }
 
@@ -184,7 +179,7 @@ prepare_chroot() {
         "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
     do
         grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
-        printf "%s\n" "$x" >>"$copydir/etc/makepkg.conf"
+        echo "$x" >>"$copydir/etc/makepkg.conf"
     done
 
     cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
@@ -198,8 +193,6 @@ 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
@@ -225,10 +218,7 @@ _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 \
-        --preserve-env=BUILDTOOL \
-        --preserve-env=BUILDTOOLVER \
-        -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
     ret=$?
     case $ret in
         0|14)
@@ -241,7 +231,7 @@ _chrootbuild() {
 _chrootnamcap() {
     pacman -S --needed --noconfirm namcap
     for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
-        printf "Checking %s\n" "${pkgfile##*/}"
+        echo "Checking ${pkgfile##*/}"
         sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
     done
 }
@@ -251,21 +241,12 @@ download_sources() {
     chown "$makepkg_user:" "$WORKDIR"
 
     # Ensure sources are downloaded
-    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
+    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
         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
@@ -278,7 +259,12 @@ move_products() {
         fi
     done
 
-    move_logfiles
+    local l
+    for l in "$copydir"/logdest/*; do
+        [[ $l == */logpipe.* ]] && continue
+        chown "$src_owner" "$l"
+        mv "$l" "$LOGDEST"
+    done
 
     for s in "$copydir"/srcpkgdest/*; do
         chown "$src_owner" "$s"
@@ -292,6 +278,8 @@ move_products() {
 }
 # }}}
 
+orig_argv=("$0" "$@")
+
 opts='hcur:I:l:nNCTb:U:'
 
 while getopts "${opts}" arg; do
@@ -303,7 +291,7 @@ while getopts "${opts}" arg; do
         I) install_pkgs+=("$OPTARG") ;;
         l) copy="$OPTARG" ;;
         n) run_namcap=1; makepkg_args+=(--install) ;;
-        N) makepkg_args+=(--nocheck) ;;
+        N) run_nocheck=1; makepkg_args+=(--nocheck) ;;
         C) run_checkpkg=1 ;;
         T) temp_chroot=1; copy+="-$$" ;;
         U) makepkg_user="$OPTARG" ;;
@@ -315,7 +303,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,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER "${BASH_SOURCE[0]}" "$@"
+check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
 
 # Canonicalize chrootdir, getting rid of trailing /
 chrootdir=$(readlink -e "$passeddir")
@@ -331,14 +319,13 @@ fi
 # Pass all arguments after -- right to makepkg
 makepkg_args+=("${@:$OPTIND}")
 
-# See if -R, -e or -A was passed to makepkg
+# See if -R or -e was passed to makepkg
 for arg in "${@:$OPTIND}"; do
     case ${arg%%=*} in
-        --skip*|--holdver|--ignorearch) verifysource_args+=("$arg") ;;
+        --skip*|--holdver) verifysource_args+=("$arg") ;;
         --repackage|--noextract) keepbuilddir=1 ;;
         --*) ;;
-        -*A*) verifysource_args+=(-A) ;;&
-        -*R*|-*e*) keepbuilddir=1 ;;&
+        -*R*|-*e*) keepbuilddir=1 ;;
     esac
 done
 
@@ -394,7 +381,6 @@ then
     move_products
 else
     (( ret += 1 ))
-    move_logfiles
 fi
 
 (( temp_chroot )) && delete_chroot "$copydir" "$copy"

bin/pkg/mkdepgraph.in

@@ -1,77 +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.
-
-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

bin/pkg/pkg2yaml.in

@@ -12,32 +12,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+. @libdir@/artools/util-base.sh
 
-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(){
+write_attr(){
     local ident1="$1" ident2="$2" ident3="$3"
     local attrname=$4 attrvalues=("${@:5}")
 
@@ -47,41 +24,47 @@ srcyaml_write_attr(){
     attrvalues=("${attrvalues[@]%[[:space:]]}")
 
     case $attrname in
-        pkgver|pkgrel|epoch|url|install|changelog)
-            for v in "${attrvalues[@]}"; do
-                Yaml+=$(write_yaml_map "$ident3" "$attrname" "$v")
+        makedepends|checkdepends|depends|provides|arch)
+            Yaml+=$(write_yaml_map $ident1 "$attrname")
+            for v in ${attrvalues[@]};do
+                Yaml+=$(write_yaml_seq $ident2 "$v")
             done
         ;;
         *)
-            Yaml+=$(write_yaml_map "$ident1" "$attrname")
-            for v in "${attrvalues[@]}"; do
-                Yaml+=$(write_yaml_seq "$ident2" "$v")
+            for v in ${attrvalues[@]};do
+                Yaml+=$(write_yaml_map $ident3 "$attrname" "$v")
             done
         ;;
     esac
 }
 
-pkgbuild_extract_to_yaml() {
+extract_info() {
     local pkgname=$1 attrname=$2 isarray=$3 outvalue=
 
     if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then
-        [[ -z $pkgname ]] && srcyaml_write_attr 2 4 2 "$attrname" "${outvalue[@]}"
-        [[ -n $pkgname ]] && srcyaml_write_attr 4 6 2 "$attrname" "${outvalue[@]}"
+        [[ -z $pkgname ]] && write_attr 2 4 2 "$attrname" "${outvalue[@]}"
+        [[ -n $pkgname ]] && write_attr 4 6 2 "$attrname" "${outvalue[@]}"
     fi
 }
 
-srcyaml_write_section_details() {
+write_details() {
     local attr package_arch a
-    local multivalued_arch_attrs=(source provides conflicts depends replaces
-	                              optdepends makedepends checkdepends)
-# 	                              "${known_hash_algos[@]/%/sums}")
+    local multivalued_arch_attrs=(provides depends makedepends checkdepends)
+
+    local singlevalued=()
+    local multivalued=(arch provides depends checkdepends)
+
+    if [[ -z "$1" ]];then
+        singlevalued=(pkgver pkgrel epoch)
+        multivalued=(arch provides depends makedepends checkdepends)
+    fi
 
     for attr in "${singlevalued[@]}"; do
-        pkgbuild_extract_to_yaml "$1" "$attr" 0
+        extract_info "$1" "$attr" 0
     done
 
     for attr in "${multivalued[@]}"; do
-        pkgbuild_extract_to_yaml "$1" "$attr" 1
+        extract_info "$1" "$attr" 1
     done
 
     get_pkgbuild_attribute "$1" 'arch' 1 'package_arch'
@@ -90,75 +73,56 @@ srcyaml_write_section_details() {
         [[ $a = any ]] && continue
 
         for attr in "${multivalued_arch_attrs[@]}"; do
-            pkgbuild_extract_to_yaml "$1" "${attr}_$a" 1
+            extract_info "$1" "${attr}_$a" 1
         done
     done
 }
 
-yaml_write_global() {
-    local singlevalued=(pkgver pkgrel epoch url install changelog) #pkgdesc
-    local multivalued=(arch groups license checkdepends makedepends
-                    depends provides conflicts replaces)
-                    #noextract options backup optdepends
-                    #source validpgpkeys "${known_hash_algos[@]/%/sums}")
+write_pkg_yaml(){
+
+    Yaml=$(write_yaml_header)
 
     Yaml+=$(write_empty_line)
+
+    local full=$(get_full_version)
+
+    local ver=${full:-0}
+
+    pkgbase=${pkgbase:-${pkgname[0]}}
+
     Yaml+=$(write_yaml_map 0 "pkgbase")
-    Yaml+=$(write_yaml_map 2 "name" "${pkgbase:-$pkgname}")
-    ${details} && srcyaml_write_section_details ''
+    Yaml+=$(write_yaml_map 2 "pkgname" "${pkgbase}")
+    ${details} && write_details ''
+    Yaml+=$(write_yaml_map 2 "fullver" "${ver}")
+
     Yaml+=$(write_empty_line)
-}
 
-yaml_write_package() {
-    local singlevalued=(url install changelog) #pkgdesc
-    local multivalued=(arch groups license checkdepends depends
-                    provides conflicts replaces) #options backup optdepends)
-
-    Yaml+=$(write_yaml_map 0 "packages")
+    Yaml+=$(write_yaml_map 0 "package")
     for pkg in "${pkgname[@]}"; do
         Yaml+=$(write_yaml_seq_map 2 "pkgname" "$pkg")
-        ${details} && srcyaml_write_section_details "$pkg"
+        ${details} && write_details "$pkg"
     done
-    Yaml+=$(write_empty_line)
-}
 
-yaml_write_fileinfo(){
-    local version
-    version=$(get_full_version)
-    pkgbase=${pkgbase:-$pkgname}
-    Yaml+=$(write_yaml_map 0 "version" "${version:-0}")
     Yaml+=$(write_empty_line)
-    local pkgfile debug_pkg
-    pkgfile=$(print_package_names)
-    Yaml+=$(write_yaml_map 0 "files")
-    for f in ${pkgfile}; do
+
+    local pkgfile=$(print_all_package_names)
+
+    Yaml+=$(write_yaml_map 0 "pkgfile")
+    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(){
-    Yaml=$(write_yaml_header)
-    yaml_write_global
-    yaml_write_package
-    yaml_write_fileinfo
-    printf '%s\n' "${Yaml}"
-}
+    Yaml+=$(write_empty_line)
 
-#}}}
+    printf '%s' "${Yaml}"
+}
 
 usage() {
-    printf 'Usage: %s [options]\n' "${0##*/}"
-    printf '    -d            Do not include details\n'
-    printf '    -h            This help\n'
-    printf '\n'
-    exit "$1"
+    echo "Usage: ${0##*/} [options]"
+    echo "    -d            Don't include details"
+    echo '    -h            This help'
+    echo ''
+    exit $1
 }
 
 details=true
@@ -169,19 +133,17 @@ while getopts "${opts}" arg; do
     case "${arg}" in
         d) details=false ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $(( $OPTIND - 1 ))
 
-srcpath=$(readlink -f "$1")
+[[ -f "$1"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$1"
+PACKAGE="$1"/PKGBUILD; shift
 
-[[ -f "$srcpath"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$srcpath"
-package="$srcpath"/PKGBUILD; shift
-
-# shellcheck disable=1090
-. "${package}"
+. "$PACKAGE"
 
 load_makepkg_config
 
-write_srcyaml
+write_pkg_yaml

bin/pkg/signpkg.in

@@ -12,14 +12,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+. @libdir@/artools/util-pkg.sh
 
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/pkg/deploy.sh
+prepare_artools
 
 load_makepkg_config
 
-passfiles=("$@")
+passfiles="$@"
 
 sign_pkg(){
     local file_to_sign="$1"
@@ -33,13 +32,12 @@ sign_pkg(){
         msg "Signing [%s]" "${file_to_sign##*/}"
         gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
     else
-        msg "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
+        msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
         gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
     fi
 }
 
-for pkg in "${passfiles[@]}"; do
-    msg "Searching %s ..." "$pkg"
+for pkg in ${passfiles[@]}; do
     if pkgfile=$(find_cached_pkgfile "$pkg");then
         msg2 "Found: %s" "${pkgfile}"
         [[ -e "${pkgfile}".sig ]] && rm "${pkgfile}".sig

data/conf/artools-base.conf

@@ -6,4 +6,4 @@
 # CHROOTS_DIR=/var/lib/artools
 
 # the workspace directory
-# WORKSPACE_DIR="${USER_HOME}/artools-workspace"
+# WORKSPACE_DIR="/home/${OWNER}/artools-workspace"

data/conf/artools-iso.conf

@@ -8,14 +8,14 @@
 # the dist release; default: auto
 # ISO_VERSION=$(date +%Y%m%d)
 
-# possible values: openrc, runit, s6, suite66, dinit
+# possible values: openrc, runit, s6
 # INITSYS="openrc"
 
 # gpg key; leave empty or commented to skip img signing
 # GPG_KEY=""
 
-# possible values: zstd (default), xz
-# COMPRESSION="zstd"
+# set upload bandwidth limit in kB/s
+# UPLIMIT=1000
 
-# zstd only: range 1..22
-# COMPRESSION_LEVEL=15
+# the server user
+# ACCOUNT=[SetUser]

data/conf/artools-pkg.conf

@@ -2,22 +2,47 @@
 ################ artools-pkg ################
 #############################################
 
-# gitea user access token for buildtree
+# gitea user access token
 # GIT_TOKEN=''
 
+# HOST_TREE_ARTIX='gitea@gitea.artixlinux.org:artixlinux'
+
 # TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
 
-# customize buildtree
-# ARTIX_TREE=(
-#     main
-#     initsys
-#     desktop
-#     addons
-#     lib32
+# customize buildtree, packages and community should be enabled
+# TREE_NAMES_ARTIX=(
+#         packages
+#         community
+#         packages-kernel
+#         packages-net
+#         packages-gfx
+#         packages-openrc
+#         packages-runit
+#         packages-s6
+#         packages-media
+#         packages-xorg
+#         packages-python
+#         packages-perl
+#         packages-java
+#         packages-qt5
+#         packages-devel
+#         packages-ruby
+#         packages-gtk
+#         packages-gnome
+#         packages-cinnamon
+#         packages-lxqt
+#         packages-mate
+#         packages-kde
+#         packages-xfce
+#         packages-wm
 # )
 
-# default repos root for deploypkg
+# HOST_TREE_ARCH=git://git.archlinux.org/svntogit
+
+# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
+
+# default repos root
 # REPOS_ROOT=${WORKSPACE_DIR}/repos
 
-# default mirror for checkrepo
+# default mirror for sogrep
 # REPOS_MIRROR="http://mirror1.artixlinux.org/repos"

data/docker/package-cleanup.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = *
+
+[Action]
+Description = Cleaning up package cache...
+Depends = coreutils
+When = PostTransaction
+Exec = /usr/bin/find /var/cache/pacman/pkg/ -type f -delete

data/docker/pacman-docker.conf

@@ -0,0 +1,111 @@
+#
+# /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

data/pacman/goblins.conf

@@ -1,104 +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
-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
-
-# 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

data/pacman/gremlins.conf

@@ -1,95 +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
-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-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
-
-[galaxy-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-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

data/pacman/makepkg.conf

@@ -11,10 +11,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -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'
+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'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -26,7 +26,6 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -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')
@@ -39,26 +38,21 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
-#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"
+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"
 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"
-DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-DEBUG_RUSTFLAGS="-C debuginfo=2"
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 
 #########################################################################
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# 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
@@ -81,7 +75,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -92,12 +86,11 @@ 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 lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
-INTEGRITY_CHECK=(sha256)
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
 #-- 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.
@@ -153,10 +146,4 @@ 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:

data/pacman/pacman-default.conf

@@ -31,11 +31,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+#TotalDownload
+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.
@@ -45,7 +43,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 artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,15 +68,12 @@ 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.
 
-#[system-gremlins]
+#[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
 
@@ -88,8 +83,39 @@ 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
+
+#
+# ARCHLINUX
+#
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-gnome-wobble.conf

@@ -0,0 +1,145 @@
+#
+# /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.
+
+[gnome-wobble]
+Include = /etc/pacman.d/mirrorlist
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+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
+
+#
+# ARCHLINUX
+#
+
+[gnome-unstable]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-goblins.conf

@@ -31,11 +31,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+#TotalDownload
+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.
@@ -45,7 +43,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 artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,24 +68,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.
 
-[kde-wobble]
+[goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[system-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[system-gremlins]
+[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
 
@@ -100,8 +89,51 @@ 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
+
+#
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-gremlins.conf

@@ -31,11 +31,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+#TotalDownload
+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.
@@ -45,7 +43,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 artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,15 +68,12 @@ 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.
 
-[system-gremlins]
+[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
 
@@ -91,14 +86,36 @@ 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-gremlins]
+#Include = /etc/pacman.d/mirrorlist
 
-[lib32]
-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
+
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-kde-wobble.conf

@@ -0,0 +1,145 @@
+#
+# /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.
+
+[kde-wobble]
+Include = /etc/pacman.d/mirrorlist
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+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
+
+#
+# ARCHLINUX
+#
+
+[kde-unstable]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-lib32-goblins.conf

@@ -31,11 +31,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+#TotalDownload
+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.
@@ -45,7 +43,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 artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,24 +68,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.
 
-[gnome-wobble]
+[goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[system-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[system-gremlins]
+[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
 
@@ -100,8 +89,51 @@ 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
+
+#
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-lib32-gremlins.conf

@@ -31,11 +31,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+#TotalDownload
+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.
@@ -45,7 +43,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 artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,27 +68,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.
 
-[system-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[system-gremlins]
+[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
 
@@ -100,9 +86,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
 
@@ -114,3 +97,25 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-lib32.conf

@@ -31,11 +31,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+#TotalDownload
+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.
@@ -45,7 +43,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 artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,15 +68,12 @@ 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.
 
-#[system-gremlins]
+#[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
 
@@ -102,3 +97,25 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/patches/artix-bash.patch

@@ -0,0 +1,87 @@
+--- /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
+ #
+

initcpio/Makefile

@@ -0,0 +1,23 @@
+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

initcpio/hooks/artix

@@ -0,0 +1,275 @@
+# 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:

initcpio/hooks/artix_loop_mnt

@@ -0,0 +1,35 @@
+# 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
+}

initcpio/hooks/artix_pxe_common

@@ -0,0 +1,72 @@
+# 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
+}

initcpio/hooks/artix_pxe_http

@@ -0,0 +1,63 @@
+# 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}
+}

initcpio/hooks/artix_pxe_nbd

@@ -0,0 +1,47 @@
+# 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
+}

initcpio/hooks/artix_pxe_nfs

@@ -0,0 +1,30 @@
+# 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}
+}

initcpio/hooks/artix_shutdown

@@ -0,0 +1,6 @@
+run_cleanuphook() {
+    rm -rf /usr/lib/modules
+    cp -ax / /run/initramfs
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix

@@ -0,0 +1,30 @@
+#!/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:

initcpio/install/artix_kms

@@ -0,0 +1,16 @@
+#!/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
+}

initcpio/install/artix_loop_mnt

@@ -0,0 +1,13 @@
+#!/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:

initcpio/install/artix_pxe_common

@@ -0,0 +1,26 @@
+#!/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:

initcpio/install/artix_pxe_http

@@ -0,0 +1,17 @@
+#!/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:

initcpio/install/artix_pxe_nbd

@@ -0,0 +1,17 @@
+#!/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:

initcpio/install/artix_pxe_nfs

@@ -0,0 +1,17 @@
+#!/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:

initcpio/install/artix_shutdown

@@ -0,0 +1,20 @@
+#!/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:

initcpio/script/artix_shutdown

@@ -0,0 +1,37 @@
+#!/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

lib/base/chroot.sh

@@ -1,20 +1,16 @@
-#!/hint/bash
-
-#{{{ chroot
-
-check_root() {
-    local keepenv=$1
-    shift
-    local orig_argv=("$@")
-
-    (( EUID == 0 )) && return
-    if type -P sudo >/dev/null; then
-        exec sudo --preserve-env="${keepenv}" -- "${orig_argv[@]}"
-    else
-        exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
-    fi
-}
-
+#!/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.
 
 is_btrfs() {
     [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
@@ -24,9 +20,9 @@ is_subvolume() {
     [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs && "$(stat -c %i "$1")" == 256 ]]
 }
 
-# is_same_fs() {
-#     [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]]
-# }
+is_same_fs() {
+    [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]]
+}
 
 subvolume_delete_recursive() {
     local subvol
@@ -46,4 +42,19 @@ subvolume_delete_recursive() {
     return 0
 }
 
-# }}}
+# $1: chroot
+kill_chroot_process(){
+    local prefix="$1" flink pid name
+    for root_dir in /proc/*/root; do
+        flink=$(readlink $root_dir)
+        if [ "x$flink" != "x" ]; then
+            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
+                # 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"
+                kill -9 "$pid"
+            fi
+        fi
+    done
+}

lib/base/fstab.sh

@@ -0,0 +1,213 @@
+#!/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.
+
+declare -A pseudofs_types=([anon_inodefs]=1
+                        [autofs]=1
+                        [bdev]=1
+                        [bpf]=1
+                        [binfmt_misc]=1
+                        [cgroup]=1
+                        [cgroup2]=1
+                        [configfs]=1
+                        [cpuset]=1
+                        [debugfs]=1
+                        [devfs]=1
+                        [devpts]=1
+                        [devtmpfs]=1
+                        [dlmfs]=1
+                        [efivarfs]=1
+                        [fuse.gvfs-fuse-daemon]=1
+                        [fusectl]=1
+                        [hugetlbfs]=1
+                        [mqueue]=1
+                        [nfsd]=1
+                        [none]=1
+                        [pipefs]=1
+                        [proc]=1
+                        [pstore]=1
+                        [ramfs]=1
+                        [rootfs]=1
+                        [rpc_pipefs]=1
+                        [securityfs]=1
+                        [sockfs]=1
+                        [spufs]=1
+                        [sysfs]=1
+                        [tmpfs]=1)
+
+declare -A fsck_types=([cramfs]=1
+                    [exfat]=1
+                    [ext2]=1
+                    [ext3]=1
+                    [ext4]=1
+                    [ext4dev]=1
+                    [jfs]=1
+                    [minix]=1
+                    [msdos]=1
+                    [reiserfs]=1
+                    [vfat]=1
+                    [xfs]=1)
+
+fstype_is_pseudofs() {
+    (( pseudofs_types["$1"] ))
+}
+
+fstype_has_fsck() {
+    (( fsck_types["$1"] ))
+}
+
+valid_number_of_base() {
+    local base=$1 len=${#2} i=
+
+    for (( i = 0; i < len; i++ )); do
+        { _=$(( $base#${2:i:1} )) || return 1; } 2>/dev/null
+    done
+
+    return 0
+}
+
+mangle() {
+    local i= chr= out=
+
+    local {a..f}= {A..F}=
+
+    for (( i = 0; i < ${#1}; i++ )); do
+        chr=${1:i:1}
+        case $chr in
+            [[:space:]\\])
+                printf -v chr '%03o' "'$chr"
+                out+=\\
+            ;;
+        esac
+        out+=$chr
+    done
+
+    printf '%s' "$out"
+}
+
+unmangle() {
+    local i= chr= out= len=$(( ${#1} - 4 ))
+
+    local {a..f}= {A..F}=
+
+    for (( i = 0; i < len; i++ )); do
+        chr=${1:i:1}
+        case $chr in
+            \\)
+                if valid_number_of_base 8 "${1:i+1:3}" ||
+                    valid_number_of_base 16 "${1:i+1:3}"; then
+                    printf -v chr '%b' "${1:i:4}"
+                    (( i += 3 ))
+                fi
+            ;;
+        esac
+        out+=$chr
+    done
+
+    printf '%s' "$out${1:i}"
+}
+
+dm_name_for_devnode() {
+    read dm_name <"/sys/class/block/${1#/dev/}/dm/name"
+    if [[ $dm_name ]]; then
+        printf '/dev/mapper/%s' "$dm_name"
+    else
+        # don't leave the caller hanging, just print the original name
+        # along with the failure.
+        print '%s' "$1"
+        error 'Failed to resolve device mapper name for: %s' "$1"
+    fi
+}
+
+optstring_match_option() {
+    local candidate pat patterns
+
+    IFS=, read -ra patterns <<<"$1"
+    for pat in "${patterns[@]}"; do
+        if [[ $pat = *=* ]]; then
+            # "key=val" will only ever match "key=val"
+            candidate=$2
+        else
+            # "key" will match "key", but also "key=anyval"
+            candidate=${2%%=*}
+        fi
+
+        [[ $pat = "$candidate" ]] && return 0
+    done
+
+    return 1
+}
+
+optstring_remove_option() {
+    local o options_ remove=$2 IFS=,
+
+    read -ra options_ <<<"${!1}"
+
+    for o in "${!options_[@]}"; do
+        optstring_match_option "$remove" "${options_[o]}" && unset 'options_[o]'
+    done
+
+    declare -g "$1=${options_[*]}"
+}
+
+optstring_normalize() {
+    local o options_ norm IFS=,
+
+    read -ra options_ <<<"${!1}"
+
+    # remove empty fields
+    for o in "${options_[@]}"; do
+        [[ $o ]] && norm+=("$o")
+    done
+
+    # avoid empty strings, reset to "defaults"
+    declare -g "$1=${norm[*]:-defaults}"
+}
+
+optstring_append_option() {
+    if ! optstring_has_option "$1" "$2"; then
+        declare -g "$1=${!1},$2"
+    fi
+
+    optstring_normalize "$1"
+}
+
+optstring_prepend_option() {
+    local options_=$1
+
+    if ! optstring_has_option "$1" "$2"; then
+        declare -g "$1=$2,${!1}"
+    fi
+
+    optstring_normalize "$1"
+}
+
+optstring_get_option() {
+    local opts o
+
+    IFS=, read -ra opts <<<"${!1}"
+    for o in "${opts[@]}"; do
+        if optstring_match_option "$2" "$o"; then
+            declare -g "$o"
+            return 0
+        fi
+    done
+
+    return 1
+}
+
+optstring_has_option() {
+    local "${2%%=*}"
+
+    optstring_get_option "$1" "$2"
+}

lib/base/message.sh

@@ -1,40 +1,43 @@
-#!/hint/bash
-
-#{{{ message
-
-#set +u +o posix
-
-# shellcheck disable=1091
-. /usr/share/makepkg/util.sh
+#!/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.
 
+# export LC_MESSAGES=C
 export LANG=C
 
-if [[ -t 2 && "$TERM" != dumb ]] || [[ ${ARTOOLS_COLOR} == always ]]; then
+if [[ -t 2 && "$TERM" != dumb ]]; then
     colorize
 else
-    # shellcheck disable=2034
     declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi
 
+info() {
+    local mesg=$1; shift
+    printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
 stat_busy() {
     local mesg=$1; shift
-    # shellcheck disable=2059
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
-stat_progress() {
-    # shellcheck disable=2059
-    printf "${BOLD}.${ALL_OFF}" >&2
-}
-
 stat_done() {
-    # shellcheck disable=2059
     printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
 lock_close() {
-    local fd=$1
-    exec {fd}>&-
+	local fd=$1
+	exec {fd}>&-
 }
 
 lock() {
@@ -42,9 +45,9 @@ lock() {
         mkdir -p -- "$(dirname -- "$2")"
         eval "exec $1>"'"$2"'
     fi
-    if ! flock -n "$1"; then
+    if ! flock -n $1; then
         stat_busy "$3"
-        flock "$1"
+        flock $1
         stat_done
     fi
 }
@@ -54,9 +57,9 @@ slock() {
         mkdir -p -- "$(dirname -- "$2")"
         eval "exec $1>"'"$2"'
     fi
-    if ! flock -sn "$1"; then
+    if ! flock -sn $1; then
         stat_busy "$3"
-        flock -s "$1"
+        flock -s $1
         stat_done
     fi
 }
@@ -97,28 +100,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_table_header(){
+    local mesg=$1; shift
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&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_row_downgrade(){
+    local mesg=$1; shift
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&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
+msg_row_notify(){
+    local mesg=$1; shift
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-#}}}
+msg_row(){
+    local mesg=$1; shift
+#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_upgrade(){
+    local mesg=$1; shift
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
+}

lib/base/mount.sh

@@ -1,19 +1,54 @@
-#!/hint/bash
-
-#{{{ mount
+#!/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.
 
 ignore_error() {
     "$@" 2>/dev/null
     return 0
 }
 
+parse_fstab(){
+    echo $(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' $1/etc/fstab)
+# 	perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^/dev#;' $1/etc/fstab
+# 	perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^LABEL=#;' $1/etc/fstab
+}
+
+detect(){
+    local 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"
+}
+
+chroot_part_mount() {
+    info "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
+}
+
 trap_setup(){
     [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
     trap "$1" EXIT
 }
 
 chroot_mount() {
-#     msg2 "mount: [%s]" "$2"
+#     info "mount: [%s]" "$2"
     mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
 }
 
@@ -53,8 +88,8 @@ chroot_mount_conditional() {
 }
 
 chroot_setup(){
-    local mnt="$1" os="$2" args='-t tmpfs -o nosuid,nodev,mode=0755'
-    $os && args='--bind'
+    local mnt="$1" os="$2" run_args='-t tmpfs -o nosuid,nodev,mode=0755'
+    $os && run_args='--bind'
     chroot_mount_conditional "! mountpoint -q '$mnt'" "$mnt" "$mnt" --bind &&
     chroot_mount proc "$mnt/proc" -t proc -o nosuid,noexec,nodev &&
     chroot_mount sys "$mnt/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
@@ -63,10 +98,33 @@ chroot_setup(){
     chroot_mount udev "$mnt/dev" -t devtmpfs -o mode=0755,nosuid &&
     chroot_mount devpts "$mnt/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
     chroot_mount shm "$mnt/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount /run "$mnt/run" ${args} &&
+    chroot_mount /run "$mnt/run" ${run_args} &&
     chroot_mount tmp "$mnt/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
 }
 
+mount_os(){
+    CHROOT_ACTIVE_PART_MOUNTS=()
+    CHROOT_ACTIVE_MOUNTS=()
+
+    trap_setup chroot_part_umount
+
+    chroot_part_mount "$2" "$1"
+
+    local mounts=$(parse_fstab "$1")
+
+    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"
+}
+
 chroot_api_mount() {
     CHROOT_ACTIVE_MOUNTS=()
     trap_setup chroot_api_umount
@@ -75,10 +133,16 @@ chroot_api_mount() {
 
 chroot_api_umount() {
     if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
-#         msg2 "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+#         info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
         umount "${CHROOT_ACTIVE_MOUNTS[@]}"
     fi
     unset CHROOT_ACTIVE_MOUNTS
 }
 
-#}}}
+chroot_part_umount() {
+    chroot_api_umount
+    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    unset CHROOT_ACTIVE_PART_MOUNTS
+}
+

lib/base/util.sh

@@ -1,42 +1,47 @@
-#!/hint/bash
+#!/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.
 
-#{{{ base conf
+get_timer(){
+    echo $(date +%s)
+}
+
+# $1: start timer
+elapsed_time(){
+    echo $(echo $1 $(get_timer) | awk '{ printf "%0.2f",($2-$1)/60 }')
+}
+
+show_elapsed_time(){
+    info "Time %s: %s minutes" "$1" "$(elapsed_time $2)"
+}
 
 prepare_dir(){
-    [[ ! -d $1 ]] && mkdir -p "$1"
-    return 0
+    [[ ! -d $1 ]] && mkdir -p $1
 }
 
-if [[ -n $SUDO_USER ]]; then
-    eval "USER_HOME=~$SUDO_USER"
-else
-    USER_HOME=$HOME
-fi
-
-USER_CONF_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/artools"
-
-prepare_dir "${USER_CONF_DIR}"
-
-load_base_config(){
-
-    local conf="$1/artools-base.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    # shellcheck source=/etc/artools/artools-base.conf
-    [[ -r "$conf" ]] && . "$conf"
-
-    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
-
-    WORKSPACE_DIR=${WORKSPACE_DIR:-"${USER_HOME}/artools-workspace"}
-
-    return 0
+get_osname(){
+    . /usr/lib/os-release
+    echo "${NAME}"
 }
 
-#}}}
-
-
-load_base_config "${USER_CONF_DIR}" || load_base_config "${SYSCONFDIR}"
-
-prepare_dir "${WORKSPACE_DIR}"
+# orig_argv=("$0" "$@")
+check_root() {
+    local keepenv=$1
 
+    (( EUID == 0 )) && return
+    if type -P sudo >/dev/null; then
+        exec sudo --preserve-env=$keepenv -- "${orig_argv[@]}"
+    else
+        exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
+    fi
+}

lib/base/yaml.sh

@@ -1,13 +1,23 @@
-#!/hint/bash
-
-#{{{ yaml
+#!/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.
 
 write_yaml_header(){
-    printf '%s\n' '---'
+    printf '%s' '---'
 }
 
 write_empty_line(){
-    printf '\n'
+    printf '\n%s\n' ' '
 }
 
 write_yaml_map(){
@@ -24,5 +34,3 @@ write_yaml_seq_map(){
     local ident="$1" key="$2" val="$3"
     printf "\n%${ident}s- %s: %s\n" '' "$key" "$val"
 }
-
-#}}}

lib/iso/calamares.sh

@@ -1,55 +0,0 @@
-#!/hint/bash
-
-#{{{ calamares
-
-write_services_conf(){
-    local key1="$1" val1="$2" key2="$3" val2="$4"
-    local yaml
-    yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 "$key1" "$val1")
-    yaml+=$(write_yaml_map 0 "$key2" "$val2")
-    yaml+=$(write_yaml_map 0 'services')
-    for svc in "${SERVICES[@]}"; do
-        yaml+=$(write_yaml_seq 2 "$svc")
-    done
-    yaml+=$(write_empty_line)
-    printf '%s\n' "${yaml}"
-}
-
-write_services_openrc_conf(){
-    local conf="$1"/services-openrc.conf
-    write_services_conf 'initdDir' '/etc/init.d' 'runlevelsDir' '/etc/runlevels' > "$conf"
-}
-
-write_services_runit_conf(){
-    local conf="$1"/services-runit.conf
-    write_services_conf 'svDir' '/etc/runit/sv' 'runsvDir' '/etc/runit/runsvdir' > "$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_services_suite66_conf(){
-    local conf="$1"/services-suite66.conf
-    write_services_conf 'svDir' '/etc/66/service' 'runsvDir' '/var/lib/66/system' > "$conf"
-}
-
-write_services_dinit_conf(){
-    local conf="$1"/services-dinit.conf
-    write_services_conf 'initdDir' '/etc/dinit.d' 'runsvDir' '/etc/dinit.d/boot.d' > "$conf"
-}
-
-configure_calamares(){
-    local mods="$1/etc/calamares/modules"
-    if [[ -d "$mods" ]];then
-        msg2 "Configuring: Calamares"
-        write_services_"${INITSYS}"_conf "$mods"
-        sed -e "s|services-openrc|services-${INITSYS}|" \
-            -i "$1"/etc/calamares/settings.conf
-    fi
-}
-
-#}}}

lib/iso/chrootcfg.sh

@@ -0,0 +1,226 @@
+#!/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.
+
+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"
+            chroot $mnt rc-update add $svc $rlvl &>/dev/null
+        fi
+    done
+}
+
+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"
+            chroot $mnt ln -s /etc/runit/sv/$svc /etc/runit/runsvdir/$rlvl &>/dev/null
+        fi
+    done
+}
+
+add_svc_s6(){
+    local mnt="$1" names="$2" valid="" rlvl="${3:-default}"
+    for svc in $names; do
+        error=false
+        chroot $mnt s6-rc-db -c /etc/s6/rc/compiled type $svc &> /dev/null || error=true
+        if [ $? == 0 ] && [[ $error == false ]]; then
+            msg2 "Setting %s ..." "$svc"
+            valid=${valid:-}${valid:+' '}${svc}
+        fi
+    done
+    chroot $mnt s6-rc-bundle -c /etc/s6/rc/compiled add $rlvl $valid
+
+    # 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
+}
+
+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
+}
+
+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}"
+}
+
+configure_system(){
+    local mnt="$1"
+    configure_logind "$mnt" "elogind"
+    echo ${HOST_NAME} > $mnt/etc/hostname
+}
+
+write_users_conf(){
+    local 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=$(write_yaml_header)
+    yaml+=$(write_yaml_map 0 "$key1" "$val1")
+    yaml+=$(write_yaml_map 0 "$key2" "$val2")
+    yaml+=$(write_yaml_map 0 'services')
+    for svc in ${SERVICES[@]};do
+        yaml+=$(write_yaml_seq 2 "$svc")
+    done
+    yaml+=$(write_empty_line)
+    printf '%s' "${yaml}"
+}
+
+write_services_openrc_conf(){
+    local conf="$1"/services-openrc.conf
+    write_services_conf 'initdDir' '/etc/init.d' 'runlevelsDir' '/etc/runlevels' > "$conf"
+}
+
+write_services_runit_conf(){
+    local conf="$1"/services-runit.conf
+    write_services_conf 'svDir' '/etc/runit/sv' 'runsvDir' '/etc/runit/runsvdir' > "$conf"
+}
+
+write_services_s6_conf(){
+    local conf="$1"/services-s6.conf
+    write_services_conf 'svDir' '/etc/s6/sv' 'dbDir' '/etc/s6/rc/compiled' > "$conf"
+}
+
+write_postcfg(){
+    local 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_unpackfs() {
+    local 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}"
+}
+
+configure_calamares(){
+    local mods="$1/etc/calamares/modules"
+    if [[ -d "$mods" ]];then
+        msg2 "Configuring Calamares"
+        write_users_conf > "$mods"/users.conf
+        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
+}
+
+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"
+    write_live_session_conf > "$fs/etc/artools/live.conf"
+    msg "Done configuring [%s]" "${fs##*/}"
+}
+
+clean_up_chroot(){
+    local path mnt="$1"
+    msg2 "Cleaning [%s]" "${mnt##*/}"
+
+    path=$mnt/boot
+    if [[ -d "$path" ]]; then
+        find "$path" -name 'initramfs*.img' -delete &> /dev/null
+    fi
+    path=$mnt/var/lib/pacman/sync
+    if [[ -d $path ]];then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/cache/pacman/pkg
+    if [[ -d $path ]]; then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/log
+    if [[ -d $path ]]; then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/tmp
+    if [[ -d $path ]];then
+        find "$path" -mindepth 1 -delete &> /dev/null
+    fi
+    path=$mnt/tmp
+    if [[ -d $path ]];then
+        find "$path" -mindepth 1 -delete &> /dev/null
+    fi
+    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
+    if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
+        rm $mnt/boot/grub/grub.cfg
+    fi
+    if [[ -f "$mnt/etc/machine-id" ]]; then
+        rm $mnt/etc/machine-id
+    fi
+}

lib/iso/config.sh

@@ -1,30 +0,0 @@
-#!/hint/bash
-
-#{{{ session
-
-configure_services(){
-    local mnt="$1"
-    add_svc_"${INITSYS}" "$mnt" "${SERVICES[*]}"
-}
-
-
-write_live_session_conf(){
-    local conf=''
-    conf+=$(printf '%s\n' '# live session configuration')
-    conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
-    conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
-    printf '%s' "$conf"
-}
-
-configure_chroot(){
-    local fs="$1"
-    msg "Configuring [%s]" "${fs##*/}"
-    configure_services "$fs"
-    configure_calamares "$fs"
-    [[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
-    msg2 "Writing: live.conf"
-    write_live_session_conf > "$fs/etc/artools/live.conf"
-    msg "Done configuring [%s]" "${fs##*/}"
-}
-
-#}}}

lib/iso/dracut.sh

@@ -1,42 +0,0 @@
-#!/hint/bash
-
-#{{{ dracut
-
-prepare_initramfs_dracut(){
-    local mnt="$1"
-    local kver
-    kver=$(<"$mnt"/usr/src/linux/version)
-
-    printf "%s\n" 'add_dracutmodules+=" dmsquash-live"' > "$mnt"/etc/dracut.conf.d/50-live.conf
-
-    msg "Starting build: %s" "${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
-
-    prepare_boot_extras "$mnt"
-}
-
-configure_grub_dracut(){
-    msg "Configuring grub kernel options ..."
-    local kopts=()
-    kopts=(
-        "root=live:LABEL=${iso_label}"
-        'rd.live.squashimg=rootfs.img'
-        'rd.live.image'
-        'rootflags=auto'
-    )
-    [[ "${profile}" != 'base' ]] && kopts+=("rd.live.join=livefs.img")
-
-    local ro_opts=()
-    local rw_opts=()
-#         'rd.writable.fsimg=1'
-
-    sed -e "s|@kopts@|${kopts[*]}|" \
-        -e "s|@ro_opts@|${ro_opts[*]}|" \
-        -e "s|@rw_opts@|${rw_opts[*]}|" \
-        -i "${iso_root}"/boot/grub/kernels.cfg
-}
-
-#}}}

lib/iso/firmware.sh

@@ -1,17 +0,0 @@
-#!/hint/bash
-
-#{{{ firmware
-
-prepare_boot_extras(){
-    local src="$1" dest
-    dest=${iso_root}/boot
-
-    for fw in intel amd; do
-        cp "$src"/boot/"$fw"-ucode.img "$dest/$fw"-ucode.img
-    done
-
-    cp "$src"/boot/memtest86+/memtest.bin "$dest"/memtest
-    cp "$src"/usr/share/licenses/common/GPL2/license.txt "$dest"/memtest.COPYING
-}
-
-#}}}

lib/iso/grub.sh

@@ -1,6 +1,132 @@
-#!/hint/bash
+#!/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.
 
-#{{{ grub
+prepare_boot_extras(){
+    local src="$1" dest=${iso_root}/boot
+
+    for u in intel amd;do
+        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+    done
+
+    cp $src/boot/memtest86+/memtest.bin $dest/memtest
+    cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
+}
+
+##################dracut##################
+
+prepare_initramfs_dracut(){
+    local mnt="$1"
+    local kver=$(<"$mnt"/usr/src/linux/version)
+
+    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"
+    msg "Image generation successful"
+
+    cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${ARCH}".img
+
+    prepare_boot_extras "$mnt"
+}
+
+configure_grub_dracut(){
+    msg "Configuring grub kernel options ..."
+    local kopts=(
+        "root=live:LABEL=${iso_label}"
+        'rd.live.squashimg=rootfs.img'
+        'rd.live.image'
+        'rootflags=auto'
+    )
+    [[ "${PROFILE}" != 'base' ]] && kopts+=("rd.live.join=livefs.img")
+
+    local ro_opts=()
+    local rw_opts=()
+#         'rd.writable.fsimg=1'
+
+    sed -e "s|@kopts@|${kopts[*]}|" \
+        -e "s|@ro_opts@|${ro_opts[*]}|" \
+        -e "s|@rw_opts@|${rw_opts[*]}|" \
+        -i ${iso_root}/boot/grub/kernels.cfg
+}
+
+#############################################
+
+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
+    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(){
+    local mnt="$1"
+
+    prepare_initcpio "$mnt"
+
+    write_mkinitcpio_conf "$mnt"
+
+    if [[ -n ${GPG_KEY} ]]; then
+        su ${OWNER} -c "gpg --export ${GPG_KEY} >/tmp/GPG_KEY"
+        exec 17<>/tmp/GPG_KEY
+    fi
+    local _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 \
+        -g /boot/initramfs.img
+
+    if [[ -n ${GPG_KEY} ]]; then
+        exec 17<&-
+    fi
+    if [[ -f /tmp/GPG_KEY ]]; then
+        rm /tmp/GPG_KEY
+    fi
+
+    cp $mnt/boot/initramfs.img ${iso_root}/boot/initramfs-${ARCH}.img
+    prepare_boot_extras "$mnt"
+}
+
+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
@@ -9,53 +135,52 @@ 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}"
+    prepare_dir ${grub}/${platform}
 
-    cp "${lib}/${platform}"/* "${grub}/${platform}"
+    cp ${livecfg}/cfg/*.cfg ${grub}
+
+    cp ${lib}/${platform}/* ${grub}/${platform}
 
     msg2 "Building %s ..." "${img}"
 
-    grub-mkimage -d "${grub}/${platform}" -o "${grub}/${platform}/${img}" -O "${platform}" -p "${prefix}" biosdisk iso9660
+    grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660
 
-    cat "${grub}/${platform}"/cdboot.img "${grub}/${platform}/${img}" > "${grub}/${platform}"/eltorito.img
+    cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
 
     platform=x86_64-efi
     img=bootx64.efi
 
-    prepare_dir "${efi}"
-    prepare_dir "${grub}/${platform}"
+    prepare_dir ${efi}
+    prepare_dir ${grub}/${platform}
 
-    cp "${lib}/${platform}"/* "${grub}/${platform}"
+    cp ${lib}/${platform}/* ${grub}/${platform}
 
     msg2 "Building %s ..." "${img}"
 
-    grub-mkimage -d "${grub}/${platform}" -o "${efi}/${img}" -O "${platform}" -p "${prefix}" iso9660
+    grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
 
-    prepare_dir "${grub}"/themes
+    prepare_dir ${grub}/themes
 
-    cp -r "${theme}"/themes/artix "${grub}"/themes
-    cp -r "${livecfg}"/{locales,tz} "${grub}"
+    cp -r ${theme}/themes/artix ${grub}/themes
+    cp -r ${livecfg}/{locales,tz} ${grub}
 
     if [[ -f /usr/share/grub/unicode.pf2 ]];then
         msg2 "Copying %s ..." "unicode.pf2"
-        cp /usr/share/grub/unicode.pf2 "${grub}"/unicode.pf2
+        cp /usr/share/grub/unicode.pf2 ${grub}/unicode.pf2
     else
         msg2 "Creating %s ..." "unicode.pf2"
-        grub-mkfont -o "${grub}"/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+        grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
     fi
 
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="${iso_root}/boot/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
-    truncate -s "${size}" "${efi_img}"
+    truncate -s ${size} "${efi_img}"
     mkfs.fat -n ARTIX_EFI "${efi_img}" &>/dev/null
     prepare_dir "${mnt}"
     mount_img "${efi_img}" "${mnt}"
-    prepare_dir "${mnt}"/efi/boot
+    prepare_dir ${mnt}/efi/boot
     msg2 "Building %s ..." "${img}"
-    grub-mkimage -d "${grub}/${platform}" -o "${mnt}"/efi/boot/"${img}" -O "${platform}" -p "${prefix}" iso9660
+    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660
     umount_img "${mnt}"
 }
-
-#}}}

lib/iso/initcpio.sh

@@ -1,72 +0,0 @@
-#!/hint/bash
-
-#{{{ initcpio
-
-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_initramfs_mkinitcpio() {
-    local mnt="$1" packages=() mkinitcpio_conf k
-
-    mkinitcpio_conf=mkinitcpio-default.conf
-    [[ "${profile}" == 'base' ]] && mkinitcpio_conf=mkinitcpio-pxe.conf
-    k=$(<"$mnt"/usr/src/linux/version)
-
-    read_from_list "${common_dir}/Packages-boot"
-    basestrap "${basestrap_args[@]}" "$mnt" "${packages[@]}"
-
-    if [[ -n "${GPG_KEY}" ]]; then
-        exec {ARTIX_GNUPG_FD}<>"${key_export}"
-        export ARTIX_GNUPG_FD
-    fi
-
-    artix-chroot "$mnt" mkinitcpio -k "$k" \
-        -c /etc/"$mkinitcpio_conf" \
-        -g /boot/initramfs.img
-
-    if [[ -n "${GPG_KEY}" ]]; then
-        exec {ARTIX_GNUPG_FD}<&-
-        unset ARTIX_GNUPG_FD
-    fi
-    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
-}
-
-#}}}

lib/iso/iso.sh

@@ -1,30 +1,127 @@
-#!/hint/bash
+#!/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.
 
-#{{{ iso
-
-get_disturl(){
-    # shellcheck disable=1091
-    . /usr/lib/os-release
-    printf "%s\n" "${HOME_URL}"
+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}
 }
 
-get_osname(){
-    # shellcheck disable=1091
+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
+    local mnt="${mnt_dir}/${src##*/}"
+    mkdir -p ${work_dir}/embed${live_dir}
+    local extimg=${work_dir}/embed${live_dir}/${src##*/}.img
+
+    msg2 "Creating ext4 image of %s ..." "${size}"
+    truncate -s ${size} "${extimg}"
+    local ext4_args=()
+    ext4_args+=(-O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0)
+    mkfs.ext4 ${ext4_args[@]} -F "${extimg}" &>/dev/null
+    tune2fs -c 0 -i 0 "${extimg}" &> /dev/null
+    mount_img "${extimg}" "${mnt}"
+    msg2 "Copying %s ..." "${src}/"
+    cp -aT "${src}/" "${mnt}/"
+    umount_img "${mnt}"
+}
+
+has_changed(){
+    local src="$1" dest="$2"
+    if [[ -f "${dest}" ]]; then
+        local has_changes=$(find ${src} -newer ${dest})
+        if [[ -n "${has_changes}" ]]; then
+            msg2 "Possible changes for %s ..." "${src}"
+            msg2 "%s" "${has_changes}"
+            msg2 "SquashFS image %s is not up to date, rebuilding..." "${dest}"
+            rm "${dest}"
+        else
+            msg2 "SquashFS image %s is up to date, skipping." "${dest}"
+            return 1
+        fi
+    fi
+}
+
+# $1: image path
+make_sfs() {
+    local sfs_in="$1"
+    if [[ ! -e "${sfs_in}" ]]; then
+        error "The path %s does not exist" "${sfs_in}"
+        retrun 1
+    fi
+
+    mkdir -p ${iso_root}${live_dir}
+
+    local img_name=${sfs_in##*/}.img
+    local img_file=${sfs_in}.img
+
+    local sfs_out="${iso_root}${live_dir}/${img_name}"
+
+    if has_changed "${sfs_in}" "${sfs_out}"; then
+
+        msg "Generating SquashFS image for %s" "${sfs_in}"
+
+        local mksfs_args=()
+
+        if ${persist};then
+            make_ext_img "${sfs_in}"
+            mksfs_args+=("${work_dir}/embed")
+        else
+            mksfs_args+=("${sfs_in}")
+        fi
+
+        mksfs_args+=("${sfs_out}")
+
+        mksfs_args+=(-comp xz -b 256K -Xbcj x86 -noappend)
+
+        mksquashfs "${mksfs_args[@]}"
+
+        if ! ${use_dracut}; then
+            make_checksum "${img_name}"
+            if [[ -n ${GPG_KEY} ]];then
+                make_sig "${img_name}"
+            fi
+        fi
+        ${persist} && rm -r "${work_dir}/embed"
+    fi
+}
+
+get_disturl(){
     . /usr/lib/os-release
-    printf "%s\n" "${NAME}"
+    echo "${HOME_URL}"
 }
 
 assemble_iso(){
     msg "Creating ISO image..."
-    local mod_date
-    mod_date=$(date -u +%Y-%m-%d-%H-%M-%S-00  | sed -e s/-//g)
-    local appid
-    appid="$(get_osname) Live/Rescue CD"
-    local publisher
-    publisher="$(get_osname) <$(get_disturl)>"
+    local mod_date=$(date -u +%Y-%m-%d-%H-%M-%S-00  | sed -e s/-//g)
+    local appid="$(get_osname) Live/Rescue CD"
+    local publisher="$(get_osname) <$(get_disturl)>"
 
     xorriso -as mkisofs \
-        --modification-date="${mod_date}" \
+        --modification-date=${mod_date} \
         --protective-msdos-label \
         -volid "${iso_label}" \
         -appid "${appid}" \
@@ -33,18 +130,17 @@ assemble_iso(){
         -r -graft-points -no-pad \
         --sort-weight 0 / \
         --sort-weight 1 /boot \
-        --grub2-mbr "${iso_root}"/boot/grub/i386-pc/boot_hybrid.img \
+        --grub2-mbr ${iso_root}/boot/grub/i386-pc/boot_hybrid.img \
         -partition_offset 16 \
         -b boot/grub/i386-pc/eltorito.img \
         -c boot.catalog \
         -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info \
         -eltorito-alt-boot \
-        -append_partition 2 0xef "${iso_root}"/boot/efi.img \
+        -append_partition 2 0xef ${iso_root}/boot/efi.img \
         -e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
         -no-emul-boot \
         -iso-level 3 \
-        -o "${iso_dir}/${iso_file}" \
-        "${iso_root}"/
+        -o ${iso_dir}/${iso_file} \
+        ${iso_root}/
 }
 
-#}}}

lib/iso/mount.sh

@@ -1,9 +1,19 @@
-#!/hint/bash
-
-#{{{ mount
+#!/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.
 
 track_img() {
-    msg2 "mount: [%s]" "$2"
+    info "mount: [%s]" "$2"
     mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
 }
 
@@ -14,8 +24,8 @@ mount_img() {
 }
 
 umount_img() {
-    if [[ -n "${IMG_ACTIVE_MOUNTS[*]}" ]];then
-        msg2 "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
+    if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
+        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
         umount "${IMG_ACTIVE_MOUNTS[@]}"
         unset IMG_ACTIVE_MOUNTS
         rm -r "$1"
@@ -23,33 +33,30 @@ umount_img() {
 }
 
 track_fs() {
-    msg2 "overlayfs mount: [%s]" "$5"
+    info "overlayfs mount: [%s]" "$5"
     mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
 }
 
 mount_overlayfs(){
     FS_ACTIVE_MOUNTS=()
-    local lower upper="$1" work="$2"
+    local lower= upper="$1" work="$2"
     mkdir -p "${mnt_dir}/work"
     mkdir -p "$upper"
     case $upper in
         */livefs) lower="$work/rootfs" ;;
         */bootfs)
             lower="$work/rootfs"
-            [[ -d "$work/livefs" ]] && lower="$work/livefs:$work/rootfs"
+            [[ -d "$work/livefs" ]] && lower="$work/livefs":"$work/rootfs"
         ;;
     esac
-    # shellcheck disable=2140
     track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
 }
 
 umount_overlayfs(){
-    if [[ -n "${FS_ACTIVE_MOUNTS[*]}" ]];then
-        msg2 "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
+    if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
+        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
         umount "${FS_ACTIVE_MOUNTS[@]}"
         unset FS_ACTIVE_MOUNTS
         rm -rf "${mnt_dir}/work"
     fi
 }
-
-#}}}

lib/iso/profile.sh

@@ -1,86 +1,101 @@
-#!/hint/bash
-
-#{{{ profile
+#!/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.
 
 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
 
-    [[ -f $profile_dir/${profile}/profile.conf ]] || return 1
+    [[ -r $profile_dir/${PROFILE}/profile.conf ]] && . $profile_dir/${PROFILE}/profile.conf
 
-    # shellcheck disable=1090
-    [[ -r "$profile_dir/${profile}"/profile.conf ]] && . "$profile_dir/${profile}"/profile.conf
+    DISPLAYMANAGER=${DISPLAYMANAGER:-'none'}
 
-    AUTOLOGIN=${AUTOLOGIN:-true}
+    AUTOLOGIN=${AUTOLOGIN:-"true"}
+    [[ ${DISPLAYMANAGER} == 'none' ]] && AUTOLOGIN="false"
+
+    HOST_NAME=${HOST_NAME:-'artix'}
+
+    USER_NAME=${USER_NAME:-'artix'}
 
     PASSWORD=${PASSWORD:-'artix'}
 
-    if [[ -z "${SERVICES[*]}" ]];then
+    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
 }
 
-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|@initsys@|${INITSYS}|g"
-
-    msg2 "Loading Packages: [%s] ..." "${list##*/}"
-    packages+=($(sed "$_com_rm" "$list" \
-            | sed "$_space" \
-            | sed "$_init" \
-            | 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
+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"
 }
 
 load_pkgs(){
-    local pkglist="$1"
-    packages=()
+    local pkglist="$1" init="$2"
+    info "Loading Packages: [%s] ..." "${pkglist##*/}"
 
-    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
+    local _init="s|@$init||g"
+    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 _space="s| ||g" \
+        _clean=':a;N;$!ba;s/\n/ /g' \
+        _com_rm="s|#.*||g"
+
+    packages=($(sed "$_com_rm" "$pkglist" \
+            | sed "$_space" \
+            | sed "$_purge" \
+            | sed "$_init" \
+            | sed "$_init_rm1" \
+            | sed "$_init_rm2" \
+            | sed "$_clean"))
 }
-
-#}}}

lib/iso/services.sh

@@ -1,68 +0,0 @@
-#!/hint/bash
-
-#{{{ services
-
-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: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" rc-update add "$svc" "$rlvl" &>/dev/null
-        fi
-    done
-}
-
-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: [%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}" dep
-    dep="$mnt"/etc/s6/sv/"$display_manager"-srv/dependencies.d
-    for svc in $names; do
-        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 "$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
-}
-
-#}}}

lib/iso/squash.sh

@@ -1,86 +0,0 @@
-#!/hint/bash
-
-#{{{ squash
-
-make_ext_img(){
-    local src="$1"
-    local size=32G
-    local mnt="${mnt_dir}/${src##*/}"
-    mkdir -p "${work_dir}"/embed"${live_dir}"
-    local extimg="${work_dir}/embed${live_dir}/${src##*/}".img
-
-    msg2 "Creating ext4 image of %s ..." "${size}"
-    truncate -s ${size} "${extimg}"
-    local ext4_args=()
-    ext4_args+=("-O ^has_journal,^resize_inode" -E lazy_itable_init=0 -m 0)
-    mkfs.ext4 "${ext4_args[@]}" -F "${extimg}" &>/dev/null
-    tune2fs -c 0 -i 0 "${extimg}" &> /dev/null
-    mount_img "${extimg}" "${mnt}"
-    msg2 "Copying %s ..." "${src}/"
-    cp -aT "${src}/" "${mnt}/"
-    umount_img "${mnt}"
-}
-
-has_changed(){
-    local src="$1" dest="$2"
-    if [[ -f "${dest}" ]]; then
-        local has_changes
-        has_changes=$(find "${src}" -newer "${dest}")
-        if [[ -n "${has_changes}" ]]; then
-            msg2 "Possible changes for %s ..." "${src}"
-            msg2 "%s" "${has_changes}"
-            msg2 "SquashFS image %s is not up to date, rebuilding..." "${dest}"
-            rm "${dest}"
-        else
-            msg2 "SquashFS image %s is up to date, skipping." "${dest}"
-            return 1
-        fi
-    fi
-}
-
-# $1: image path
-make_sfs() {
-    local sfs_in="$1"
-    if [[ ! -e "${sfs_in}" ]]; then
-        error "The path %s does not exist" "${sfs_in}"
-        retrun 1
-    fi
-
-    mkdir -p "${iso_root}${live_dir}"
-
-    local img_name=${sfs_in##*/}.img
-
-    local sfs_out="${iso_root}${live_dir}/${img_name}"
-
-    if has_changed "${sfs_in}" "${sfs_out}"; then
-
-        msg "Generating SquashFS image for %s" "${sfs_in}"
-
-        local mksfs_args=()
-
-        if ${persist};then
-            make_ext_img "${sfs_in}"
-            mksfs_args+=("${work_dir}/embed")
-        else
-            mksfs_args+=("${sfs_in}")
-        fi
-
-        mksfs_args+=("${sfs_out}")
-
-        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 "${iso_root}${live_dir}/${img_name}"
-            fi
-        fi
-        if ${persist}; then
-            rm -r "${work_dir}/embed"
-        fi
-    fi
-}
-
-#}}}

lib/iso/trap.sh

@@ -1,48 +0,0 @@
-#!/hint/bash
-
-#{{{ trap
-
-error_function() {
-    local func="$1"
-    # first exit all subshells, then print the error
-    if (( ! BASH_SUBSHELL )); then
-        error "A failure occurred in %s()." "$func"
-        plain "Aborting..."
-    fi
-    umount_overlayfs
-    umount_img
-    exit 2
-}
-
-run_safe() {
-    local restoretrap func="$1"
-    set -e
-    set -E
-    restoretrap=$(trap -p ERR)
-    trap 'error_function $func' ERR
-
-    "$func"
-
-    eval "$restoretrap"
-    set +E
-    set +e
-}
-
-trap_exit() {
-    local sig=$1; shift
-    error "$@"
-    umount_overlayfs
-    trap -- "$sig"
-    kill "-$sig" "$$"
-}
-
-prepare_traps(){
-    for sig in TERM HUP QUIT; do
-        # shellcheck disable=2064
-        trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
-    done
-    trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
-#     trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
-}
-
-#}}}

lib/iso/util.sh

@@ -1,41 +1,155 @@
-#!/hint/bash
+#!/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.
 
-#{{{ iso conf
-
-load_iso_config(){
-
-    local conf="$1/artools-iso.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    # shellcheck source=/etc/artools/artools-iso.conf
-    [[ -r "$conf" ]] && . "$conf"
-
-    ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
-
-    ISO_VERSION=${ISO_VERSION:-"$(date +%Y%m%d)"}
-
-    INITSYS=${INITSYS:-'openrc'}
-
-    GPG_KEY=${GPG_KEY:-''}
-
-    COMPRESSION="${COMPRESSION:-zstd}"
-
-    COMPRESSION_LEVEL="${COMPRESSION_LEVEL:-15}"
-
-    if [[ -z "${COMPRESSION_ARGS[*]}" ]]; then
-        COMPRESSION_ARGS=(-Xcompression-level "${COMPRESSION_LEVEL}")
+error_function() {
+    local func="$1"
+    # first exit all subshells, then print the error
+    if (( ! BASH_SUBSHELL )); then
+        error "A failure occurred in %s()." "$func"
+        plain "Aborting..."
     fi
-
-    if [[ "${COMPRESSION}" == 'xz' ]]; then
-        COMPRESSION_ARGS=(-Xbcj x86)
-    fi
-
-    return 0
+    umount_overlayfs
+    umount_img
+    exit 2
 }
 
-#}}}
+run_safe() {
+    local restoretrap func="$1"
+    set -e
+    set -E
+    restoretrap=$(trap -p ERR)
+    trap 'error_function $func' ERR
 
-load_iso_config "${USER_CONF_DIR}" || load_iso_config "${SYSCONFDIR}"
+    "$func"
 
-prepare_dir "${ISO_POOL}"
+    eval $restoretrap
+    set +E
+    set +e
+}
+
+trap_exit() {
+    local sig=$1; shift
+    error "$@"
+    umount_overlayfs
+    trap -- "$sig"
+    kill "-$sig" "$$"
+}
+
+prepare_traps(){
+    for sig in TERM HUP QUIT; do
+        trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
+    done
+    trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
+#     trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
+}
+
+copy_overlay(){
+    local src="$1" dest="$2"
+    if [[ -e "$src" ]];then
+        msg2 "Copying [%s] ..." "${src##*/}"
+        cp -LR "$src"/* "$dest"
+    fi
+}
+
+make_rootfs() {
+    if [[ ! -e ${work_dir}/rootfs.lock ]]; then
+        msg "Prepare [Base installation] (rootfs)"
+        local rootfs="${work_dir}/rootfs"
+
+        prepare_dir "${rootfs}"
+
+        basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"
+
+        copy_overlay "${ROOT_OVERLAY}" "${rootfs}"
+
+        [[ -z ${LIVE_LIST} ]] && configure_chroot "${rootfs}"
+
+        clean_up_chroot "${rootfs}"
+
+        : > ${work_dir}/rootfs.lock
+
+        msg "Done [Base installation] (rootfs)"
+    fi
+}
+
+make_livefs() {
+    if [[ ! -e ${work_dir}/livefs.lock ]]; then
+        msg "Prepare [Live installation] (livefs)"
+        local livefs="${work_dir}/livefs"
+
+        prepare_dir "${livefs}"
+
+        mount_overlayfs "${livefs}" "${work_dir}"
+
+        basestrap "${basestrap_args[@]}" "${livefs}" "${packages[@]}"
+
+        copy_overlay "${LIVE_OVERLAY}" "${livefs}"
+
+        configure_chroot "${livefs}"
+
+        umount_overlayfs
+
+        clean_up_chroot "${livefs}"
+
+        : > ${work_dir}/livefs.lock
+
+        msg "Done [Live installation] (livefs)"
+    fi
+}
+
+make_bootfs() {
+    if [[ ! -e ${work_dir}/bootfs.lock ]]; then
+        msg "Prepare [/iso/boot]"
+
+        prepare_dir "${iso_root}/boot"
+
+        cp ${work_dir}/rootfs/boot/vmlinuz* ${iso_root}/boot/vmlinuz-${ARCH}
+
+        local bootfs="${work_dir}/bootfs"
+
+        mount_overlayfs "${bootfs}" "${work_dir}"
+
+        if ${use_dracut}; then
+            prepare_initramfs_dracut "${bootfs}"
+        else
+            prepare_initramfs "${bootfs}"
+        fi
+
+        umount_overlayfs
+
+        rm -R ${bootfs}
+        : > ${work_dir}/bootfs.lock
+        msg "Done [/iso/boot]"
+    fi
+}
+
+make_grub(){
+    if [[ ! -e ${work_dir}/grub.lock ]]; then
+        msg "Prepare [/iso/boot/grub]"
+
+        local layer=${work_dir}/rootfs
+        [[ -n ${LIVE_LIST} ]] && layer=${work_dir}/livefs
+
+        prepare_grub "${work_dir}/rootfs" "$layer"
+
+        if ${use_dracut}; then
+            configure_grub_dracut
+        else
+            configure_grub
+        fi
+
+        : > ${work_dir}/grub.lock
+        msg "Done [/iso/boot/grub]"
+    fi
+}

lib/pkg/api/gitea.sh

@@ -1,172 +0,0 @@
-#!/hint/bash
-
-#{{{ gitea api
-
-get_compliant() {
-    local name=$1
-    printf "%s" "${name}" \
-    | sed -E 's/([a-zA-Z0-9]+)\+([a-zA-Z]+)/\1-\2/g' \
-    | sed -E 's/\+/plus/g' \
-    | sed -E 's/[^a-zA-Z0-9_\-\.]/-/g' \
-    | sed -E 's/[_\-]{2,}/-/g'
-}
-
-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?limit=10000"
-
-    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&limit=10000"
-
-    stat_busy "Query for topic (${search})"
-    api_get "$url" \
-        -H 'accept: application/json'
-
-    stat_done
-}
-
-#}}}

lib/pkg/ci/jenkins.sh

@@ -1,39 +0,0 @@
-#!/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"
-}
-
-#}}}

lib/pkg/deploy.sh

@@ -1,41 +0,0 @@
-#!/hint/bash
-
-#{{{ functions
-
-shopt -s extglob
-
-find_cached_pkgfile() {
-    local searchdirs=("$PKGDEST" "$PWD") results=()
-    local pkg="$1"
-    for dir in "${searchdirs[@]}"; do
-        [[ -d "$dir" ]] || continue
-        [[ -e "$dir/$pkg" ]] && results+=("$dir/$pkg")
-    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
-
-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"
-}
-
-#}}}

lib/pkg/diff.sh

@@ -1,75 +0,0 @@
-#!/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
-
-#}}}

lib/pkg/git.sh

@@ -1,85 +1,185 @@
-#!/hint/bash
+#!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# 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.
 
-[[ -z ${ARTOOLS_INCLUDE_GIT_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_GIT_SH=1
-
-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 maintainer-mynickname
-        $ ${COMMAND} config -t libfoo
-        $ ${COMMAND} config -u libfoo
-        $ ${COMMAND} create libfoo
-_EOF_
+get_local_head(){
+    echo $(git log --pretty=%H ...refs/heads/master^ | head -n 1)
 }
 
-artixpkg_git() {
-    if (( $# < 1 )); then
-        artixpkg_git_usage
-        exit 0
+get_remote_head(){
+    echo $(git ls-remote origin -h refs/heads/master | cut -f1)
+}
+
+clone_tree(){
+    local timer=$(get_timer) url="$1" tree="$2" os="${3:-$(get_osname)}"
+
+    msg "Cloning %s (%s) ..." "$tree" "$os"
+
+    git clone $url/$tree.git
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+has_changes(){
+    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
     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
-        ;;
-        pull)
-            _ARTOOLS_COMMAND+=" $1"
-            shift
-            # shellcheck source=lib/git/pull.sh
-            source "${LIBDIR}"/pkg/git/pull.sh
-            artixpkg_git_pull "$@"
-            exit 0
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            die "invalid command: %s" "$1"
-        ;;
-        esac
-    done
 }
+
+pull_tree(){
+    local tree="$1" local_head="$2" os="${3:-$(get_osname)}"
+    local remote_head=$(get_remote_head)
+
+    msg "Checking (%s) (%s)" "${tree}" "$os"
+    if has_changes "${local_head}" "${remote_head}";then
+        git pull origin master
+    fi
+}
+
+push_tree(){
+    local tree="$1"
+    msg "Update (%s)" "${tree}"
+    git push origin master
+}
+
+write_jenkinsfile(){
+    local pkg="$1"
+    local jenkins=$pkg/Jenkinsfile
+
+    echo "@Library('artix-ci') import org.artixlinux.RepoPackage" > $jenkins
+    echo '' >> $jenkins
+    echo 'PackagePipeline(new RepoPackage(this))' >> $jenkins
+    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 '%YAML 1.2' > $agent
+    echo '---' >> $agent
+    echo '' >> $agent
+    echo "label: $label" >> $agent
+    echo '' >> $agent
+
+    git add $agent
+}
+
+commit_jenkins_files(){
+    local pkg="$1"
+
+    write_jenkinsfile "$pkg"
+    write_agentyaml "$pkg"
+
+    git commit -m "initial commit"
+}
+
+config_tree(){
+    local tree="$1"
+    cd $tree
+        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 ..
+}
+
+# write_gitignore() {
+#     local pkg="$1"
+#     local gitignore=$pkg/.gitignore
+#     echo '# ---> ArchLinuxPackages' > $gitignore
+#     echo '*.tar' >> $gitignore
+#     echo '*.tar.*' >> $gitignore
+#     echo '*.jar' >> $gitignore
+#     echo '*.exe' >> $gitignore
+#     echo '*.msi' >> $gitignore
+#     echo '*.zip' >> $gitignore
+#     echo '*.tgz' >> $gitignore
+#     echo '*.log' >> $gitignore
+#     echo '*.log.*' >> $gitignore
+#     echo '*.sig' >> $gitignore
+#     echo '' >> $gitignore
+#     echo 'pkg/' >> $gitignore
+#     echo 'src/' >> $gitignore
+#     echo '' >> $gitignore
+#     echo '# ---> Archives' >> $gitignore
+#     echo '*.7z' >> $gitignore
+#     echo '*.rar' >> $gitignore
+#     echo '*.gz' >> $gitignore
+#     echo '*.bzip' >> $gitignore
+#     echo '*.bz2' >> $gitignore
+#     echo '*.xz' >> $gitignore
+#     echo '*.lzma' >> $gitignore
+#     echo '*.cab' >> $gitignore
+#     echo '' >> $gitignore
+#     echo '# ---> systemd' >> $gitignore
+#     echo '*.service' >> $gitignore
+#     echo '*.socket' >> $gitignore
+#     echo '*.timer' >> $gitignore
+#     echo '' >> $gitignore
+#     echo '# ---> snap' >> $gitignore
+#     echo '*.snap' >> $gitignore
+#     echo '' >> $gitignore
+#
+#     git add $gitignore
+# }
+#
+# write_readme(){
+#     local pkg="$1"
+#     local readme=$pkg/README.md
+#
+#     echo "# $pkg" > $readme
+#     echo '' >> $readme
+#
+#     git add $readme
+# }
+#
+# subrepo_new2(){
+#     local group="${1:-$GROUP}" team="${2:-$TEAM}"
+#     local dest=${TREE_DIR_ARTIX}/$group/${PACKAGE}/trunk
+#
+#     cd ${TREE_DIR_ARTIX}/$group
+#
+#     local org=$(get_pkg_org "${PACKAGE}")
+#
+#     prepare_dir "$dest"
+#
+#     subrepo_init "${PACKAGE}" "$org"
+#
+#     commit_jenkins_files2 "${PACKAGE}"
+#
+#     subrepo_push "${PACKAGE}"
+#
+#     add_repo_to_team "${PACKAGE}" "$org" "$team"
+# }
+#
+# commit_jenkins_files2(){
+#     local pkg="$1"
+#
+#     write_jenkinsfile "$pkg"
+#     write_agentyaml "$pkg"
+#     write_readme "$pkg"
+#     write_gitignore "$pkg"
+#
+#     git commit -m "initial commit"
+# }

lib/pkg/git/clone.sh

@@ -1,165 +0,0 @@
-#!/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
-        --protocol https       Clone the repository over https
-        -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
-            ;;
-            --protocol=https)
-                GIT_REPO_BASE_URL="${GIT_URL}/"
-                CONFIGURE_OPTIONS+=("$1")
-                shift
-            ;;
-            --protocol)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                if [[ $2 == https ]]; then
-                    GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
-                else
-                    die "unsupported protocol: %s" "$2"
-                fi
-                CONFIGURE_OPTIONS+=("$1" "$2")
-                shift 2
-            ;;
-            -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
-}

lib/pkg/git/config.sh

@@ -1,251 +0,0 @@
-#!/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
-        --protocol https     Configure remote url to use https
-        -j, --jobs N       Run up to N jobs in parallel (default: $(nproc))
-        -h, --help         Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} -t libfoo
-        $ ${COMMAND} -u libfoo
-        $ ${COMMAND} *
-_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 proto_force=0
-    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
-        ;;
-        --protocol=https)
-            proto_force=1
-            shift
-        ;;
-        --protocol)
-            (( $# <= 1 )) && die "missing argument for %s" "$1"
-            if [[ $2 == https ]]; then
-                proto_force=1
-            else
-                die "unsupported protocol: %s" "$2"
-            fi
-            shift 2
-        ;;
-        -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
-            if (( ! proto_force )); then
-                proto=ssh
-                GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
-            fi
-        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}"; 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}"; then
-                    warning "failed to set the upstream: ${remote_url}"
-                fi
-            fi
-        )
-    done
-}

lib/pkg/git/create.sh

@@ -1,116 +0,0 @@
-#!/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/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   Assign team name [default: world]
-        -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
-}

lib/pkg/git/pull.sh

@@ -1,158 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_GIT_PULL_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_GIT_PULL_SH=1
-
-source "${LIBDIR}"/pkg/git/config.sh
-
-set -e
-
-
-artixpkg_git_pull_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
-        --fetch                Fetch only
-        -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_pull() {
-    if (( $# < 1 )); then
-        artixpkg_git_pull_usage
-        exit 0
-    fi
-
-    # options
-    local PULL_ALL=0
-    local FETCH=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_pull_usage
-                exit 0
-            ;;
-            -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)
-                PULL_ALL=1
-                shift
-            ;;
-            --fetch)
-                FETCH=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 (( PULL_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 pull some packages, please check the output'
-            exit 1
-        fi
-        exit 0
-    fi
-
-    for pkgbase in "${pkgbases[@]}"; do
-        if [[ -d ${pkgbase} ]]; then
-            ( cd ${pkgbase} || return
-                if (( FETCH )); then
-                    msg "Fetching ${pkgbase} ..."
-                    if ! git fetch origin; then
-                        die 'failed to fetch %s' "${pkgbase}"
-                    fi
-                else
-                    msg "Pulling ${pkgbase} ..."
-                    if ! git pull origin master; then
-                        die 'failed to pull %s' "${pkgbase}"
-                    fi
-                fi
-            )
-        else
-            warning "Skip pulling ${pkgbase}: Directory does not exist"
-        fi
-    done
-}

lib/pkg/gitea.sh

@@ -0,0 +1,57 @@
+#!/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.
+
+create_repo() {
+    local pkg="$1" org="$2"
+    local 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
+}
+
+get_team_id() {
+    local org="$1" team="$2"
+    local 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=$(get_team_id "$org" "$team")
+    local 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=$(get_team_id "$org" "$team")
+    local 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"
+}

lib/pkg/repo.sh

@@ -1,104 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_REPO_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_REPO_SH=1
-
-set -e
-
-artixpkg_repo_usage() {
-    local -r COMMAND=${_ARTOOLS_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
-        import       import latest tag from arch upstream
-
-    OPTIONS
-        -h, --help     Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} add extra libfoo
-        $ ${COMMAND} remove extra libfoo
-        $ ${COMMAND} move extra-testing extra libfoo
-        $ ${COMMAND} import libfoo
-_EOF_
-}
-
-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
-    core-rebuild
-    extra-rebuild
-)
-
-artixpkg_repo() {
-    if (( $# < 1 )); then
-        artixpkg_repo_usage
-        exit 0
-    fi
-
-    # option checking
-    while (( $# )); do
-        case $1 in
-        -h|--help)
-                artixpkg_repo_usage
-                exit 0
-        ;;
-        add)
-                _ARTOOLS_COMMAND+=" $1"
-                shift
-                # shellcheck source=lib/pkg/repo/add.sh
-                source "${LIBDIR}"/pkg/repo/add.sh
-                artixpkg_repo_add "$@"
-                exit 0
-        ;;
-        move)
-                _ARTOOLS_COMMAND+=" $1"
-                shift
-                # shellcheck source=lib/pkg/repo/move.sh
-                source "${LIBDIR}"/pkg/repo/move.sh
-                artixpkg_repo_move "$@"
-                exit 0
-        ;;
-        remove)
-                _ARTOOLS_COMMAND+=" $1"
-                shift
-                # shellcheck source=lib/pkg/repo/remove.sh
-                source "${LIBDIR}"/pkg/repo/remove.sh
-                artixpkg_repo_remove "$@"
-                exit 0
-        ;;
-        import)
-                _ARTOOLS_COMMAND+=" $1"
-                shift
-                # shellcheck source=lib/pkg/repo/import.sh
-                source "${LIBDIR}"/pkg/repo/import.sh
-                artixpkg_repo_import "$@"
-                exit 0
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            die "invalid command: %s" "$1"
-        ;;
-        esac
-    done
-}

lib/pkg/repo/add.sh

@@ -1,142 +0,0 @@
-#!/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} -t -p 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}"/
-
-                pkgbuild="$CARCH/${DEST}"/PKGBUILD
-
-                # shellcheck disable=1090
-                source "$pkgbuild"
-
-                local commit_msg
-                commit_msg=$(get_commit_msg)
-
-                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
-
-                    msg 'Staging files'
-                    for f in $(git ls-files --modified -o --directory); do
-                        git add "$f"
-                    done
-#                     stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-#                     stat_done
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
-#                         stat_done
-                    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
-            )
-        fi
-
-    done
-}

lib/pkg/repo/import.sh

@@ -1,135 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_REPO_IMPORT_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_REPO_IMPORT_SH=1
-
-set -e
-
-patch_pkgbase(){
-    local name="$1"
-    local pkgbuild
-    pkgbuild=trunk/PKGBUILD
-
-    sed -e 's|arch-meson|artix-meson|' -i "${pkgbuild}"
-
-    case "${name}" in
-        glibc)
-            msg "Patching %s" "${name}"
-            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
-                -e '/nscd.service/d' \
-                -i "${pkgbuild}"
-        ;;
-        linux|linux-lts)
-            msg "Patching %s" "${name}"
-            sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "${pkgbuild}"
-            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i "$pkgpath"/config
-        ;;
-        gstreamer|gst-plugins-*|licenses)
-            msg "Patching %s" "${name}"
-            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
-                -e 's|(Arch Linux)|(Artix Linux)|' \
-                -i "${pkgbuild}"
-        ;;
-    esac
-}
-
-
-artixpkg_repo_import_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-    OPTIONS
-        --switch TAG       Switch the current trunk to a specified version tag
-        -h, --help         Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} libfoo
-        $ ${COMMAND} libfoo --switch TAG
-_EOF_
-}
-
-artixpkg_repo_import() {
-    if (( $# < 1 )); then
-        artixpkg_repo_import_usage
-        exit 0
-    fi
-
-    # options
-    local pkgbases=()
-    local pkgbase
-    local upstream_url
-    upstream_url="https://gitlab.archlinux.org/archlinux/packaging/packages"
-    local TAG
-    local rsync_args=()
-    rsync_args+=(-aWxvci --progress --delete-before --no-R --no-implied-dirs --exclude '.git')
-
-    while (( $# )); do
-        case $1 in
-        --switch=*)
-            TAG="${1#*=}"
-            shift
-        ;;
-        -h|--help)
-            artixpkg_repo_import_usage
-            exit 0
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            break
-        ;;
-        esac
-    done
-
-    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
-                stat_busy "Checking for upstream url"
-                if ! git config --local --get remote.upstream.url &>/dev/null; then
-                    git remote add upstream "${upstream_url}"/${pkgbase}.git
-                fi
-                stat_done
-
-                stat_busy "Fetching upstream tags"
-                git fetch upstream --tags
-                stat_done
-
-                local latest version
-                latest=$(git describe --tags FETCH_HEAD)
-                version="${latest}"
-                if [[ -n "${TAG}" ]]; then
-                    version="${TAG}"
-                fi
-
-                stat_busy "Importing upstream changeset for ${version}"
-
-                git checkout "${version}" -b "${version}" &>/dev/null
-                local temp
-                temp=$(mktemp -d --tmpdir "${pkgbase}.XXXXXXXXXX")
-
-                rsync "${rsync_args[@]}" "$(pwd)"/ "${temp}"/ &>/dev/null
-                git checkout master &>/dev/null
-                git branch -D "${version}" &>/dev/null
-                rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/trunk/ &>/dev/null
-
-                patch_pkgbase "${pkgbase}"
-
-                stat_done
-            )
-        fi
-
-    done
-}

lib/pkg/repo/move.sh

@@ -1,157 +0,0 @@
-#!/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} -t -p 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}"
-
-                mv -T "$CARCH/${SRC}" "$CARCH/${DEST}"
-
-                pkgbuild="$CARCH/${DEST}"/PKGBUILD
-
-                # shellcheck disable=1090
-                source "$pkgbuild"
-
-                local commit_msg
-                commit_msg=$(get_commit_msg)
-
-                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
-
-#                     git add .
-                    msg 'Staging files'
-                    for f in $(git ls-files --deleted); do
-                        git rm "$f"
-                    done
-                    for f in $(git ls-files -o --unmerged); do
-                        git add "$f"
-                    done
-#                     stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-#                     stat_done
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
-#                         stat_done
-                    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
-            )
-        fi
-
-    done
-}

lib/pkg/repo/remove.sh

@@ -1,137 +0,0 @@
-#!/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} -t -p 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
-
-                pkgbuild="$CARCH/${DEST}"/PKGBUILD
-
-                # shellcheck disable=1090
-                source "$pkgbuild"
-
-                local commit_msg
-                commit_msg=$(get_commit_msg)
-
-                rm -r "$CARCH/${DEST}"
-
-                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
-
-                    msg 'Staging files'
-                    for f in $(git ls-files --deleted); do
-                        git rm "$f"
-                    done
-#                     stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-#                     stat_done
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
-#                         stat_done
-                    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
-            )
-        fi
-
-    done
-}