refactor (#45)

fix workspace defaults

buildiso: fix pac conf selection

refactor

use load_valid_names()

Reviewed-on: artix/artools#45
Co-Authored-By: artoo <artoo@artixlinux.org>
Co-Committed-By: artoo <artoo@artixlinux.org>

Makefile

@@ -1,12 +1,9 @@
-VERSION=0.20
-
-CHROOT_VERSION=0.10
+VERSION=0.21
 
 TOOLS = artools
 PREFIX ?= /usr
 SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
-LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
 CPIODIR = $(SYSCONFDIR)/initcpio
 
@@ -17,14 +14,9 @@ BASE_BIN = \
 	bin/base/chroot-run \
 	bin/base/mkchroot \
 	bin/base/basestrap \
-	bin/base/artools-chroot \
+	bin/base/artix-chroot \
 	bin/base/fstabgen
 
-BASE_LIBS = \
-	$(wildcard lib/base/*.sh)
-
-BASE_UTIL = lib/util-base.sh
-
 BASE_DATA = \
 	$(wildcard data/pacman/pacman*.conf)
 
@@ -45,7 +37,8 @@ PKG_BIN = \
 	bin/pkg/finddeps \
 	bin/pkg/find-libdeps \
 	bin/pkg/batchpkg \
-	bin/pkg/signpkg
+	bin/pkg/signpkg \
+	bin/pkg/checkrepo
 
 LN_COMMITPKG = \
 	extrapkg \
@@ -59,7 +52,8 @@ LN_COMMITPKG = \
 	multilib-testingpkg \
 	multilib-stagingpkg \
 	kde-unstablepkg \
-	gnome-unstablepkg
+	gnome-unstablepkg \
+	rebuildpkg
 
 LN_BUILDPKG = \
 	buildpkg-system \
@@ -89,13 +83,9 @@ LN_DEPLOYPKG = \
 	deploypkg-kde-wobble \
 	deploypkg-gnome-wobble
 
-PKG_LIBS = \
-	$(wildcard lib/pkg/*.sh)
-
-PKG_UTIL = lib/util-pkg.sh
-
 PKG_DATA = \
-	data/pacman/makepkg.conf
+	data/pacman/makepkg.conf \
+	data/valid-names.conf
 
 PATCHES = \
 	$(wildcard data/patches/*.patch)
@@ -104,18 +94,12 @@ ISO_CONF = \
 	data/conf/artools-iso.conf
 
 ISO_BIN = \
-	bin/iso/buildiso \
-	bin/iso/deployiso
+	bin/iso/buildiso
 
 LN_BUILDISO = \
 	buildiso-gremlins \
 	buildiso-goblins
 
-ISO_LIBS = \
-	$(wildcard lib/iso/*.sh)
-
-ISO_UTIL = lib/util-iso.sh
-
 DIRMODE = -dm0755
 FILEMODE = -m0644
 MODE =  -m0755
@@ -126,32 +110,22 @@ 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)
 
-EDIT_UTIL = sed -e "s|@datadir[@]|$(DATADIR)|g" \
-	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
-	-e "s|@libdir[@]|$(LIBDIR)|g" \
-	-e "s|@chroot_version@|$(CHROOT_VERSION)|"
+EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g"
 
-EDIT_BIN = sed -e "s|@libdir[@]|$(LIBDIR)|g"
-
-$(UTIL): %: %.in Makefile
+%: %.in Makefile lib/util-base.sh
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@$(M4) $@.in | $(EDIT_UTIL) >$@
-	@$(CHMODAW) "$@"
-
-$(BIN): %: %.in Makefile
-	@echo "GEN $@"
-	@$(RM) "$@"
-	@$(M4) $@.in | $(EDIT_BIN) >$@
+	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | $(M4) | $(EDIT) >$@
 	@$(CHMODAW) "$@"
 	@$(CHMODX) "$@"
+	@bash -O extglob -n "$@"
 
 clean:
-	$(RM) $(BIN) $(UTIL)
+	$(RM) $(BIN)
 
 install_base:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
@@ -160,10 +134,6 @@ install_base:
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
-	install $(FILEMODE) $(BASE_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	install $(FILEMODE) $(BASE_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
-
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
@@ -182,9 +152,7 @@ install_pkg:
 	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)$(LIBDIR)/$(TOOLS)/pkg
-	install $(FILEMODE) $(PKG_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	install $(FILEMODE) $(PKG_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
+	$(LN) artix-chroot $(DESTDIR)$(BINDIR)/artools-chroot
 
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
@@ -204,10 +172,6 @@ install_iso: install_cpio
 
 	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

bin/base/artix-chroot.in

@@ -14,23 +14,78 @@
 
 shopt -s extglob
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/base/message.sh)
+m4_include(lib/base/chroot.sh)
+m4_include(lib/base/mount.sh)
+
+#{{{ functions
+
+chroot_part_mount() {
+    info "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
+}
+
+chroot_part_umount() {
+    chroot_api_umount
+    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    unset CHROOT_ACTIVE_PART_MOUNTS
+}
+
+detect(){
+    local detected
+    detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
+    echo "${detected}"
+}
+
+# $1: os-prober array
+get_os_name(){
+    local str=$1
+    str="${str#*:}"
+    str="${str#*:}"
+    str="${str%:*}"
+    echo "$str"
+}
+
+mount_os(){
+    CHROOT_ACTIVE_PART_MOUNTS=()
+    CHROOT_ACTIVE_MOUNTS=()
+
+    trap_setup chroot_part_umount
+
+    chroot_part_mount "$2" "$1"
+
+    local mounts
+    mounts=$(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' "$1"/etc/fstab)
+
+    for entry in ${mounts}; do
+        entry=${entry//UUID=}
+        local dev=${entry%:*} mp=${entry#*:}
+        case "${entry#*:}" in
+            '/'|'swap'|'none') continue ;;
+            *) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
+        esac
+    done
+
+    chroot_setup "$1" true
+    chroot_add_resolv_conf "$1"
+}
 
 select_os(){
-    local os_list=( $(detect) ) count=${#os_list[@]}
-    if [[ ${count} > 1 ]];then
+    local os_list=( "$(detect)" ) count=${#os_list[@]}
+    if [[ ${count} -gt 1 ]];then
         msg "Detected systems:"
         local i=0
-        for os in ${os_list[@]};do
+        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)) ;;
+                *) info "$i) $(get_os_name "$os")"; i=$((i+1)) ;;
             esac
         done
         i=0
         msg "Select system to mount [0-%s] : " "$((count-1))"
-        read select
+        read -r select
     else
         select=0
     fi
@@ -39,13 +94,15 @@ select_os(){
     root=${os_str%%:*}
     type=${type##*:}
     if [[ "${type##*:}" == 'linux' ]];then
-        msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
+        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() {
@@ -59,11 +116,9 @@ usage() {
     echo "    and ${chrootdir}."
     echo ''
     echo ''
-    exit $1
+    exit "$1"
 }
 
-orig_argv=("$0" "$@")
-
 opts=':ha'
 
 while getopts ${opts} arg; do
@@ -79,13 +134,13 @@ check_root
 
 if ${automount};then
     chrootdir=/mnt
-    run_args=/bin/bash
+    run_args=(/bin/bash)
 
     select_os "${chrootdir}"
 else
     chrootdir=$1
     shift
-    run_args="$@"
+    run_args=("$@")
 
     [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
 
@@ -93,4 +148,4 @@ else
     chroot_add_resolv_conf "${chrootdir}"
 fi
 
-SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}
+SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "${run_args[@]}"

bin/base/basestrap.in

@@ -22,7 +22,11 @@
 
 shopt -s extglob
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/base/message.sh)
+m4_include(lib/base/mount.sh)
+m4_include(lib/base/chroot.sh)
+
+#{{{ functions
 
 copy_mirrorlist(){
     cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
@@ -36,11 +40,13 @@ 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
@@ -62,11 +68,9 @@ usage() {
     echo ' If no packages are given, basestrap defaults to the "base" group.'
     echo ''
     echo ''
-    exit $1
+    exit "$1"
 }
 
-orig_argv=("$0" "$@")
-
 opts=':C:cGiMU'
 
 while getopts ${opts} arg; do

bin/base/chroot-run.in

@@ -12,9 +12,26 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-chroot_version=0.9
+m4_include(lib/base/message.sh)
+m4_include(lib/base/mount.sh)
+m4_include(lib/base/chroot.sh)
 
-. @libdir@/artools/util-base.sh
+# $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
+}
 
 # umask might have been changed in /etc/profile
 # ensure that sane default is set again
@@ -23,7 +40,7 @@ umask 0022
 working_dir=''
 files=()
 
-mount_args=()
+mount_args=("-B:/etc/hosts:/etc/hosts")
 
 usage() {
     echo "Usage: ${0##*/} [options] working-dir [run arguments]"
@@ -41,8 +58,6 @@ usage() {
     exit 1
 }
 
-orig_argv=("$0" "$@")
-
 opts='hC:M:c:b:f:s'
 
 while getopts ${opts} arg; do
@@ -52,12 +67,12 @@ 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.'
 
@@ -74,10 +89,12 @@ if (( ${#cache_dirs[@]} == 0 )); then
     mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
 
-host_mirrors=($($pacconf_cmd --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
+# shellcheck disable=2016
+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=$(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")
@@ -85,15 +102,16 @@ for host_mirror in "${host_mirrors[@]}"; do
 done
 
 while read -r line; do
+    # shellcheck disable=2016
     mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
-        --repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
+        --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 < <($pacconf_cmd --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
@@ -101,9 +119,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
@@ -114,7 +132,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]//:/\\:}" "-B:/etc/hosts:/etc/hosts")
+mount_args+=("-B:${cache_dirs[0]//:/\\:}:${cache_dirs[0]//:/\\:}")
 
 for cache_dir in "${cache_dirs[@]:1}"; do
     mount_args+=("-Br:${cache_dir//:/\\:}:${cache_dir//:/\\:}")
@@ -123,10 +141,8 @@ done
 chroot_extra_mount() {
     chroot_add_resolv_conf "${working_dir}"
 
-    for arg in ${mount_args[@]}; do
-        local flag=${arg%%:*}
-        local dest=${arg##*:}
-        local src=${arg%:*}
+    for arg in "${mount_args[@]}"; do
+        local flag=${arg%%:*} dest=${arg##*:} src=${arg%:*}
         src=${src#*:}
         chroot_mount "${src}" "${working_dir}${dest}" "${flag}"
     done
@@ -143,7 +159,7 @@ 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
 
@@ -155,7 +171,7 @@ 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
 

bin/base/fstabgen.in

@@ -14,10 +14,214 @@
 
 shopt -s extglob
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/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"
+}
 
 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)
@@ -45,7 +249,7 @@ write_source() {
         ;;
     esac
 
-    [[ $comment ]] && printf '# %s\n' "${comment[*]}"
+    [[ -n "${comment[*]}" ]] && printf '# %s\n' "${comment[*]}"
 
     if [[ $spec ]]; then
         printf '%-20s' "$bytag=$(mangle "$spec")"
@@ -55,7 +259,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
@@ -78,7 +282,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
@@ -86,6 +290,8 @@ optstring_apply_quirks() {
     esac
 }
 
+#}}}
+
 usage() {
   cat <<EOF
 usage: ${0##*/} [options] root
@@ -203,7 +409,7 @@ done
 # handle swaps devices
 {
     # ignore header
-    read
+    read -r
 
     while read -r device type _ _ prio; do
         options=defaults

bin/base/mkchroot.in

@@ -12,7 +12,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/base/message.sh)
+m4_include(lib/base/chroot.sh)
 
 working_dir=''
 umode=''
@@ -33,8 +34,6 @@ usage() {
     exit 1
 }
 
-orig_argv=("$0" "$@")
-
 opts='hUC:M:c:f:s'
 
 while getopts ${opts} arg; do
@@ -53,13 +52,13 @@ while getopts ${opts} arg; do
         [[ -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
 
-working_dir="$(readlink -f $1)"
+working_dir="$(readlink -f "$1")"
 shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
@@ -72,9 +71,9 @@ 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"
 
@@ -94,10 +93,11 @@ for f in "${files[@]}"; do
 done
 
 basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
-    ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
+    "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
 
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
 echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
+# echo 'KEYMAP=en' > "$working_dir/etc/vconsole.conf"
 echo "${CHROOTVERSION}" > "$working_dir/.artools"
 
 dbus-uuidgen --ensure="$working_dir"/etc/machine-id

bin/iso/buildiso.in

@@ -12,63 +12,206 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-iso.sh
+m4_include(lib/util-base.sh)
+m4_include(lib/util-iso.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/base/common.sh)
+m4_include(lib/base/chroot.sh)
+m4_include(lib/iso/mount.sh)
+m4_include(lib/iso/services.sh)
+m4_include(lib/base/yaml.sh)
+m4_include(lib/iso/calamares.sh)
+m4_include(lib/iso/config.sh)
+m4_include(lib/iso/firmware.sh)
+m4_include(lib/iso/dracut.sh)
+m4_include(lib/iso/initcpio.sh)
+m4_include(lib/iso/grub.sh)
+m4_include(lib/iso/squash.sh)
+m4_include(lib/iso/iso.sh)
+m4_include(lib/iso/profile.sh)
+m4_include(lib/iso/trap.sh)
 
-prepare_artools
+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 "${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
+}
 
 gen_iso_fn(){
     local vars=("artix") name
-    vars+=("${PROFILE}")
+    vars+=("${profile}")
     vars+=("${INITSYS}")
-    case "${REPOSITORY}" in
-        'gremlins'|'goblins') vars+=("${REPOSITORY}") ;;
+    case "${repo}" in
+        'gremlins'|'goblins') vars+=("${repo}") ;;
     esac
     vars+=("${ISO_VERSION}")
-    vars+=("${ARCH}")
-    for n in ${vars[@]};do
+    vars+=("${arch}")
+    for n in "${vars[@]}"; do
         name=${name:-}${name:+-}${n}
     done
-    echo $name
+    echo "$name"
 }
 
 prepare_build(){
-    timer_start=$(get_timer)
-
     load_profile
 
-    local pacman_conf pac_file="pacman-default.conf"
-
-    case "${REPOSITORY}" in
-        'gremlins'|'goblins') pac_file="pacman-${REPOSITORY}.conf" ;;
+    case "${repo}" in
+        'gremlins'|'goblins') repo="${repo}" ;;
+        *) repo=default ;;
     esac
 
-    pacman_conf="${DATADIR}/$pac_file"
-    [[ -f ${USER_CONF_DIR}/$pac_file ]] && pacman_conf="${USER_CONF_DIR}/$pac_file"
+    get_pacman_conf "${repo}"
 
     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
 
-    prepare_dir "${ISO_POOL}"
+    iso_dir="${ISO_POOL}/${profile}"
 
-    iso_dir="${ISO_POOL}/${PROFILE}"
-
-    iso_root=${CHROOTS_ISO}/${PROFILE}/iso
+    iso_root=${chroots_iso}/${profile}/iso
     live_dir=/LiveOS
 
-    mnt_dir=${CHROOTS_ISO}/${PROFILE}/mnt
-
-    prepare_dir "${mnt_dir}"
-    prepare_dir "${iso_dir}"
-    prepare_dir "${iso_root}"
+    mnt_dir=${chroots_iso}/${profile}/mnt
 }
 
 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}"
 
@@ -80,10 +223,10 @@ display_settings(){
 }
 
 mk_squash(){
-    local timer=$(get_timer)
     make_sfs "${work_dir}/rootfs"
-    [[ -d "${work_dir}/livefs" ]] && make_sfs "${work_dir}/livefs"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
+    if [[ -d "${work_dir}/livefs" ]]; then
+        make_sfs "${work_dir}/livefs"
+    fi
 }
 
 mk_iso(){
@@ -96,29 +239,25 @@ 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(){
-    local timer=$(get_timer)
     load_pkgs "${ROOT_LIST}" "${INITSYS}"
     run_safe "make_rootfs"
     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
@@ -137,35 +276,28 @@ build(){
         rm -rf --one-file-system "${iso_root}"
     fi
 
-    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}"
+    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}"
 }
 
 clean_first=true
@@ -180,13 +312,17 @@ boot_only=false
 basestrap_args=(-GMc)
 cmd=${0##*/}
 
-REPOSITORY=${cmd##*-}
+repo=${cmd##*-}
+owner=${SUDO_USER:-$USER}
+profile='base'
+chroots_iso="${CHROOTS_DIR}/buildiso"
+arch=$(uname -m)
 
 usage() {
     echo "Usage: ${cmd} [options]"
-    echo "    -p <profile>       Profile [default: ${PROFILE}]"
+    echo "    -p <profile>       Profile [default: ${profile}]"
     echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${CHROOTS_ISO}]"
+    echo "                       [default: ${chroots_iso}]"
     echo '    -t <dir>           Target directory'
     echo "                       [default: ${ISO_POOL}]"
     echo '    -i <name>          Init system to use'
@@ -205,17 +341,15 @@ usage() {
     echo '    -h                 This help'
     echo ''
     echo ''
-    exit $1
+    exit "$1"
 }
 
-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" ;;
@@ -232,14 +366,18 @@ while getopts "${opts}" arg; do
     esac
 done
 
-shift $(($OPTIND - 1))
-
-check_root
-
-prepare_traps
+shift $(( OPTIND - 1 ))
 
 prepare_build
 
 ${pretend} && display_settings && exit 1
 
+check_root
+
+prepare_dir "${mnt_dir}"
+prepare_dir "${iso_dir}"
+prepare_dir "${iso_root}"
+
+prepare_traps
+
 build

bin/iso/deployiso.in

@@ -1,73 +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@/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/batchpkg.in

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018-20 artoo@artixlinux.org
 # Copyright (C) 2018 Artix Linux Developers
 #
 # This program is free software; you can redistribute it and/or modify
@@ -12,15 +12,17 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. /usr/lib/artools/util-pkg.sh
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
 
-prepare_artools
+#{{{ functions
 
 batch_move() {
     local name="${1:-pkg_moves}"
-    local pkglist=${TREE_DIR_ARTIX}/$name.list
+    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
     [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read entry;do
+    while read -r entry; do
         local pkg=${entry##*:}
         local src=${entry%:*}
         src=${src#*:}
@@ -30,44 +32,84 @@ batch_move() {
         else
             msg "%s" "${dest}pkg -s ${src} -u -p ${pkg}"
         fi
-    done < $pkglist
+    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
-# }
+batch_create() {
+    local name="${1:-pkg_create}"
+    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
+    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
+    while read -r entry; do
+        local pkg=${entry##*:}
+        local group=${entry%:*}
+        group=${group#*:}
+        local team=${entry%%:*}
+        if ${runlist}; then
+            buildtree -n -p "${pkg}" -t "${team}" -g "${group}"
+            buildtree -i -p "${pkg}"
+            commitpkg -p "${pkg}"
+        else
+            msg "%s" "buildtree -n -p ${pkg} -t ${team} -g ${group}"
+            msg2 "%s" "buildtree -i -p ${pkg}"
+            msg2 "%s" "commitpkg -p ${pkg}"
+        fi
+    done < "$pkglist"
+}
+
+batch_update() {
+    local name="${1:-pkg_upgrades}"
+    local pkglist=${TREE_DIR_ARTIX}/$name.list
+    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
+    while read -r entry; do
+        local pkg=${entry#*:}
+        local dest=${entry%:*}
+        if ${runlist}; then
+            buildtree -i -p "${pkg}"
+            "${dest}"pkg -u -p "${pkg}"
+        else
+            msg "buildtree -i -p ${pkg}"
+            msg2 "${dest}pkg -u -p ${pkg}"
+        fi
+    done < "$pkglist"
+}
+
+#}}}
 
 usage() {
     echo "Usage: ${0##*/} [optional listname]"
     echo '    -r                 Run generated commands'
+    echo '    -c                 Create subrepos from list'
+    echo '    -u                 Update subrepos from list'
     echo '    -h                 This help'
     echo ''
     echo ''
-    exit $1
+    exit "$1"
 }
 
-movelistname=pkg_moves
 runlist=false
+create=false
+update=false
 
-opts='rh'
+opts='rcuh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         r) runlist=true ;;
+        c) create=true ;;
+        u) update=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(($OPTIND - 1))
+shift $(( OPTIND - 1 ))
 
-movelistname="$1"; shift
+listname="$1"; shift
 
-batch_move "$movelistname"
+if ${create}; then
+    batch_create "${listname}"
+elif ${update}; then
+    batch_update "${listname}"
+else
+    batch_move "${listname}"
+fi

bin/pkg/buildpkg.in

@@ -12,20 +12,21 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
-
-prepare_artools
+m4_include(lib/util-base.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/base/common.sh)
+m4_include(lib/base/chroot.sh)
 
 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() {
     echo "Usage: ${0##*/} [options] -- [mkchrootpkg_args]"
@@ -39,21 +40,19 @@ usage() {
     echo ''
     echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
     echo ''
-    exit $1
+    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) is_checkpkg=true; mkchrootpkg_args+=(-C) ;;
-        N) no_check=true; mkchrootpkg_args+=(-N) ;;
+        C) mkchrootpkg_args+=(-C) ;;
+        N) mkchrootpkg_args+=(-N) ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
     esac
@@ -69,20 +68,18 @@ else
     esac
 fi
 
-pacman_conf="${DATADIR}/pacman-${repo}.conf"
-[[ -f ${USER_CONF_DIR}/pacman-${repo}.conf ]] && pacman_conf="${USER_CONF_DIR}/pacman-${repo}.conf"
+get_pacman_conf "${repo}"
 
-makepkg_conf="${DATADIR}/makepkg.conf"
-[[ -f ${USER_CONF_DIR}/makepkg.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.conf"
+get_makepkg_conf
 
-check_root SOURCE_DATE_EPOCH
+check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
 
 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}")"
 
@@ -93,19 +90,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 "${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
 
@@ -114,9 +111,5 @@ if [[ ! -v SOURCE_DATE_EPOCH ]]; then
     export SOURCE_DATE_EPOCH=$(date +%s)
 fi
 
-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}"
+msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
+exec mkchrootpkg -r "${chroots_pkg}/${repo}-${arch}" "${mkchrootpkg_args[@]}"

bin/pkg/buildtree.in

@@ -12,9 +12,125 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/git.sh)
+m4_include(lib/pkg/repo.sh)
+m4_include(lib/pkg/jenkins.sh)
 
-prepare_artools
+#{{{ new git repo
+
+get_compliant_name(){
+    local gitname="$1"
+    case "$gitname" in
+        *+) gitname=${gitname//+/plus} ;;
+        *+*) gitname=${gitname//+/-} ;;
+    esac
+    echo "$gitname"
+}
+
+subrepo_clone(){
+    local pkg="$1" org="$2" gitname
+    gitname=$(get_compliant_name "$pkg")
+    msg2 "Subrepo clone [%s] from (%s)" "$pkg" "$org/$gitname"
+    git subrepo clone "${GIT_SSH}":"$org"/"$gitname".git "$pkg"
+}
+
+create_repo() {
+    local pkg="$1" org="$2" gitname
+    gitname=$(get_compliant_name "$pkg")
+    local json="{ \"auto_init\": true, \"name\":\"$gitname\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
+
+    msg2 "Create package repo [%s] in org (%s)" "${pkg}" "${org}"
+
+    curl -s -X POST "${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}" \
+        -H "accept: application/json" \
+        -H "content-type: application/json" \
+        -d "$json"
+
+    echo
+}
+
+subrepo_new(){
+    cd "${TREE_DIR_ARTIX}/${GROUP}" || return
+
+    local org
+    org=$(get_pkg_org "${PACKAGE}")
+
+    create_repo "${PACKAGE}" "$org"
+
+    add_repo_to_team "${PACKAGE}" "$org" "${TEAM}"
+
+    subrepo_clone "${PACKAGE}" "$org"
+
+    mkdir -p "${TREE_DIR_ARTIX}/${GROUP}/${PACKAGE}/trunk"
+
+    commit_jenkins_files "${PACKAGE}"
+}
+
+#}}}
+
+#{{{ pull
+
+clone_tree(){
+    local url="$1" tree="$2" os="${3:-Artix}"
+
+    msg "Cloning %s (%s) ..." "$tree" "$os"
+
+    git clone "$url/$tree".git
+}
+
+pull_tree_arch(){
+    cd "${TREE_DIR_ARCH}" || return
+    for tree in "${ARCH_TREE[@]}";do
+        if [[ -d "${tree}" ]];then
+            ( cd "${tree}" || return
+                pull_tree "${tree}" "$(get_local_head)" "Arch"
+            )
+        else
+            clone_tree "${host_tree_arch}" "${tree}" "Arch"
+        fi
+    done
+}
+
+config_tree(){
+    local tree="$1"
+    cd "$tree" || return
+        git config --bool pull.rebase true
+        git config commit.gpgsign true
+        if [[ -n "${GPGKEY}" ]];then
+            git config user.signingkey "${GPGKEY}"
+        else
+            warning "No GPGKEY configured in makepkg.conf!"
+        fi
+    cd ..
+}
+
+pull_tree_artix(){
+    local repos=()
+    if ${sync_group}; then
+        repos=("${GROUP}")
+    else
+        repos=("${ARTIX_TREE[@]}")
+    fi
+    cd "${TREE_DIR_ARTIX}" || return
+    for tree in "${repos[@]}"; do
+        if [[ -d "${tree}" ]];then
+            config_tree "${tree}"
+            ( cd "${tree}" || return
+                pull_tree "${tree}" "$(get_local_head)"
+            )
+        else
+            clone_tree "${host_tree_artix}" "${tree}"
+            config_tree "${tree}"
+        fi
+    done
+}
+
+#}}}
+
+#{{{ patch
 
 patch_pkg(){
     local pkgpath="$1"
@@ -25,116 +141,86 @@ patch_pkg(){
             msg2 "Patching %s" "$pkg"
             sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
                 -e '/nscd.service/d' \
-                -i $pkgpath/PKGBUILD
+                -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|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "$pkgpath"/PKGBUILD
             sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i $pkgpath/config
+                -i "$pkgpath"/config
         ;;
         bash)
             msg2 "Patching %s" "$pkg"
+            # shellcheck disable=2016
             sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
             -e "s|etc/bash.|etc/bash/|g" \
             -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
-            -i $pkgpath/PKGBUILD
-            cd $pkgpath
-                patch -Np 1 -i ${DATADIR}/patches/artix-bash.patch
+            -i "$pkgpath"/PKGBUILD
+            ( cd "$pkgpath" || return
+                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
+                -i "$pkgpath"/PKGBUILD
         ;;
     esac
 }
 
-pull_tree_arch(){
-    cd ${TREE_DIR_ARCH}
-    for tree in ${ARCH_TREE[@]};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
-}
+#{{{ pkgbuild import
 
 sync_pkg(){
     local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
     local src="$1" dest="$2"
     msg "Sync from Arch [%s] to Artix [%s]" "${src##*archlinux/}" "${dest##*artixlinux/}"
-    rsync "${rsync_args[@]}" $src/ $dest/
+    rsync "${rsync_args[@]}" "$src"/ "$dest"/
 }
 
 show_deps(){
-    local src="$1"
+    local src="$1" archver
 
-    . $src/PKGBUILD 2>/dev/null
+    # shellcheck disable=1090
+    . "$src"/PKGBUILD 2>/dev/null
 
-    local archver=$(get_full_version)
+    archver=$(get_full_version)
 
+    # shellcheck disable=2154
     [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
+    # shellcheck disable=2154
     msg2 "pkgname: %s" "${pkgname[*]}"
-    [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
+    # shellcheck disable=2154
+    [[ -n "${pkgdesc}" ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
+    # shellcheck disable=2154
     msg2 "Arch Version: %s" "$archver"
+    # shellcheck disable=2154
     msg2 "arch: %s" "$arch"
-
-    [[ -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}"
+    # shellcheck disable=2154
+    [[ -n ${makedepends[*]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    # shellcheck disable=2154
+    [[ -n ${checkdepends[*]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    # shellcheck disable=2154
+    [[ -n ${depends[*]} ]] && msg2 "depends: %s" "${depends[*]}"
+    # shellcheck disable=2154
+    [[ -n ${optdepends[*]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
 }
 
 from_arch(){
-    cd ${TREE_DIR_ARTIX}
+    cd "${TREE_DIR_ARTIX}" || return
 
-    local srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
+    local srcpath repo archpath artixpath
+    srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
     [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
 
-    local repo=$(find_repo "$srcpath")
+    repo=$(find_repo "$srcpath")
     msg "repo: %s" "${repo#*/}"
 
-    local archpath=$srcpath/$repo
-    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    archpath=$srcpath/$repo
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
 
     show_deps "$archpath"
 
@@ -150,20 +236,24 @@ from_arch(){
     fi
 }
 
+#}}}
+
 view_build(){
-    local archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
+    local archpath repo
+    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
     [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-    local repo=$(find_repo "${archpath}")
+    repo=$(find_repo "${archpath}")
     archpath=$archpath/$repo
     msg "repo: %s" "${repo#*/}"
     show_deps "$archpath"
 }
 
 check_tree(){
-    local archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
+    local archpath artixpath group
+    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%/*}
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    group=${artixpath%/*}
     msg "group: %s" "${group##*/}"
 
     [[ -z $artixpath ]] && msg2 "exists: %s" "no"
@@ -172,17 +262,13 @@ check_tree(){
 
 sync_repos(){
     ${sync_arch} && pull_tree_arch
-    if ${sync_artix};then
-        if ${sync_group}; then
-            pull_tree_artix "${GROUP}"
-        else
-            pull_tree_artix "${ARTIX_TREE[*]}"
-        fi
-    fi
+    ${sync_artix} && pull_tree_artix
 }
 
 load_makepkg_config
 
+load_valid_names
+
 testing=true
 staging=true
 unstable=false
@@ -199,7 +285,10 @@ check=false
 PACKAGE=''
 
 TEAM='community'
-GROUP=${ARTIX_TREE[0]}
+GROUP="${ARTIX_TREE[0]}"
+
+host_tree_artix="${GIT_SSH}:artixlinux"
+host_tree_arch='https://github.com/archlinux'
 
 usage() {
     echo "Usage: ${0##*/} [options]"
@@ -222,11 +311,9 @@ usage() {
     echo '    -h            This help'
     echo ''
     echo ''
-    exit $1
+    exit "$1"
 }
 
-orig_argv=("$0" "$@")
-
 opts='p:t:g:sinabcvxyzh'
 
 while getopts "${opts}" arg; do
@@ -249,10 +336,7 @@ while getopts "${opts}" arg; do
     esac
 done
 
-shift $(($OPTIND - 1))
-
-prepare_dir "${TREE_DIR_ARTIX}"
-prepare_dir "${TREE_DIR_ARCH}"
+shift $(( OPTIND - 1 ))
 
 set_arch_repos "$testing" "$staging" "$unstable"
 

bin/pkg/checkpkg.in

@@ -12,12 +12,14 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
+m4_include(lib/base/message.sh)
 
 shopt -s extglob
 
 load_makepkg_config
 
+#{{{ functions
+
 pkgver_equal() {
     if [[ $1 = *-* && $2 = *-* ]]; then
         # if both versions have a pkgrel, then they must be an exact match
@@ -80,6 +82,8 @@ find_cached_package() {
     esac
 }
 
+#}}}
+
 usage() {
     cat <<- _EOF_
         Usage: ${BASH_SOURCE[0]##*/} [OPTIONS]

bin/pkg/checkrepo.in

@@ -0,0 +1,182 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/repo.sh)
+m4_include(lib/pkg/table.sh)
+
+update_db_cache(){
+    msg "Updating database cache"
+    for repo in "${searchrepos[@]}"; do
+        local cachedir=${db_cache_dir}/${linksdb_ext}/${CARCH}/${repo}
+        rm -rf "$cachedir"
+        mkdir -p "$cachedir"
+        msg2 "%s" "$repo"
+        curl -L -s "${REPOS_MIRROR}/${repo}/os/${CARCH}/${repo}.${linksdb_ext}" \
+            | bsdtar -xf - -C "$cachedir"
+    done
+    msg "Done"
+}
+
+#{{{ sogrep
+
+query_db() {
+    for repo in "${searchrepos[@]}"; do
+        local db=${db_cache_dir}/${linksdb_ext}/${CARCH}/${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
+}
+
+#}}}
+
+#{{{ check db
+
+is_db_entry() {
+    local pkgname="$1" repo="${REPOS[$2]}"
+
+    if [[ -d ${db_cache_dir}/${linksdb_ext}/${CARCH}/$repo/$pkgname ]];then
+        return 0
+    fi
+    return 1
+}
+
+check_db(){
+    local pkgpath="${1%/*}"
+
+    for repo in "${!REPOS[@]}"; do
+        local pkgbuild artixver
+        [[ -f $pkgpath/$CARCH/$repo/PKGBUILD ]] && pkgbuild=$pkgpath/$CARCH/$repo/PKGBUILD
+        [[ -f $pkgpath/repos/$repo-$CARCH/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-$CARCH/PKGBUILD
+        [[ -f $pkgpath/repos/$repo-any/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-any/PKGBUILD
+
+        # shellcheck disable=1090
+        . "$pkgbuild" 2>/dev/null
+
+        artixver=$(get_full_version)
+        for name in "${pkgname[@]}"; do
+
+            if ! is_db_entry "$name-$artixver" "$repo"; then
+                msg_row "${tableU}" "$repo" "$name" "$artixver" "false"
+            fi
+
+        done
+        unset artixver pkgbuild pkgver epoch pkgname pkgbase
+    done
+}
+
+#}}}
+
+show_lib_table() {
+    msg_table_header "${tableQ}" "Repo" "Package" "Library"
+    query_db
+}
+
+show_db_table(){
+    msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
+    tree_loop check_db
+}
+
+db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
+
+linksdb_ext="links.tar.${DBEXT}"
+
+load_makepkg_config
+
+sync=false
+check=false
+query=false
+
+readonly tableU="%-20s %-35s %-30s %-10s"
+readonly tableQ="%-20s %-45s %s"
+
+load_valid_names
+
+#{{{ repo names arrays
+
+declare -A REPOS=(
+    [${valid_names[0]}]=system
+    [${valid_names[1]}]=world
+    [${valid_names[2]}]=galaxy
+    [${valid_names[3]}]=lib32
+    [${valid_names[4]}]=gremlins
+    [${valid_names[5]}]=galaxy-gremlins
+    [${valid_names[6]}]=lib32-gremlins
+    [${valid_names[7]}]=goblins
+    [${valid_names[8]}]=galaxy-goblins
+    [${valid_names[9]}]=lib32-goblins
+    [${valid_names[11]}]=kde-wobble
+    [${valid_names[12]}]=gnome-wobble
+)
+
+searchrepos=(
+    "${REPOS[${valid_names[11]}]}"
+    "${REPOS[${valid_names[12]}]}"
+    "${REPOS[${valid_names[7]}]}"
+    "${REPOS[${valid_names[8]}]}"
+    "${REPOS[${valid_names[9]}]}"
+    "${REPOS[${valid_names[4]}]}"
+    "${REPOS[${valid_names[5]}]}"
+    "${REPOS[${valid_names[6]}]}"
+    "${REPOS[${valid_names[0]}]}"
+    "${REPOS[${valid_names[1]}]}"
+    "${REPOS[${valid_names[2]}]}"
+    "${REPOS[${valid_names[3]}]}"
+)
+
+#}}}
+
+usage() {
+    echo "Usage: ${0##*/} [options] (with -q [libname])"
+    echo '    -r <repo>     Repo name to query'
+    echo '                  [default: all]'
+    echo "    -s            Sync repo databases"
+    echo '    -c            Check repos'
+    echo "    -q            Query repo databases for so libs"
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit "$1"
+}
+
+opts='r:qcsh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) searchrepos=("$OPTARG") ;;
+        s) sync=true ;;
+        c) check=true ;;
+        q) query=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+
+library="$1"; shift
+
+${sync} && update_db_cache
+
+${check} && show_db_table
+
+${query} && show_lib_table

bin/pkg/commitpkg.in

@@ -12,9 +12,37 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/git.sh)
+m4_include(lib/pkg/repo.sh)
 
-prepare_artools
+#{{{ functions
+
+push_tree(){
+    local tree="$1"
+    msg "Update (%s)" "${tree}"
+    git push origin master
+}
+
+subrepo_push(){
+    local pkg="$1"
+    msg2 "Subrepo push (%s)" "$pkg"
+    git subrepo push "$pkg" || die "%s push failed" "$pkg"
+}
+
+subrepo_clean(){
+    local pkg="$1"
+    msg2 "Subrepo clean (%s)" "$pkg"
+    git subrepo clean "$pkg"
+}
+
+subrepo_pull(){
+    local pkg="$1"
+    msg2 "Subrepo pull (%s)" "$pkg"
+    git subrepo pull "$pkg"
+}
 
 prepare_commit(){
     # create new layout, copy & remove repos
@@ -22,10 +50,13 @@ prepare_commit(){
         msg "Switching to new layout ..."
         [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
 
-        for r in $(ls repos); do
-            mkdir "$CARCH/${r%-*}"
-            cp repos/${r}/* $CARCH/${r%-*}/
-            git add $CARCH/${r%-*}
+        for r in repos/*; do
+            local name noarch
+            name=${r#*/}
+            noarch=${name%-*}
+            mkdir "$CARCH/${noarch}"
+            cp repos/"${name}"/* "$CARCH/${noarch}/"
+            git add "$CARCH/${noarch}"
         done
 
         git rm -r repos
@@ -40,45 +71,66 @@ prepare_commit(){
     fi
 }
 
-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
+check_rebuild(){
+    if [[ -d "$CARCH"/"${valid_names[10]}" ]] \
+    && [[ "${REPO_DEST}" == "${valid_names[7]}" ]]; then
+        git rm -r "$CARCH"/"${valid_names[10]}"
+        git commit -m "switch from ${valid_names[10]} to ${valid_names[7]}"
+    elif [[ -d "$CARCH"/"${valid_names[7]}" ]] \
+    && [[ "${REPO_DEST}" == "${valid_names[10]}" ]]; then
+        git rm -r "$CARCH"/"${valid_names[7]}"
+        git commit -m "switch from ${valid_names[7]} to ${valid_names[10]}"
+    fi
+}
 
-        local org=$(get_pkg_org "${PACKAGE}")
+check_team(){
+    if [[ "${REPO_SRC}" == "${valid_names[0]}" \
+    && "${REPO_DEST}" == "${valid_names[1]}" ]] || \
+        [[ "${REPO_SRC}" == "${valid_names[1]}" \
+        && "${REPO_DEST}" == "${valid_names[0]}" ]] || \
+        [[ "${REPO_SRC}" == "${valid_names[1]}" \
+        && "${REPO_DEST}" == "${valid_names[2]}" ]] || \
+        [[ "${REPO_SRC}" == "${valid_names[2]}" \
+        && "${REPO_DEST}" == "${valid_names[1]}" ]] ;then
+
+        local org
+        org=$(get_pkg_org "${PACKAGE}")
         add_repo_to_team "${PACKAGE}" "$org" "${REPO_DEST}"
         remove_repo_from_team "${PACKAGE}" "$org" "${REPO_SRC}"
     fi
 }
 
-config() {
+path_config() {
     [[ "${REPO_SRC}" != 'trunk' ]] && pkgbuild="$CARCH/${REPO_SRC}"/PKGBUILD
 
     if [[ ! -f "$pkgbuild" ]]; then
         pkgbuild=repos/"${REPO_SRC}-${CARCH}"/PKGBUILD
         [[ -f repos/"${REPO_SRC}"-any/PKGBUILD ]] && pkgbuild=repos/"${REPO_SRC}"-any/PKGBUILD
     fi
+
+    # shellcheck disable=1090
+    . "$pkgbuild"
 }
 
 commit_pkg() {
+    local commit_msg pkg
     if ${remove};then
         action='remove'
         if [[ "${REPO_SRC}" == 'trunk' ]];then
-            local pkg=${PACKAGE}
+            pkg=${PACKAGE}
             git rm -r trunk
         else
-            local pkg="${PACKAGE}-$(get_full_version)"
+            pkg="${PACKAGE}-$(get_full_version)"
 
             prepare_commit
 
             git rm -r "$CARCH/${REPO_SRC}"
         fi
-        local commit_msg="[${REPO_SRC}] '$pkg' ${action}"
+        commit_msg="[${REPO_SRC}] '$pkg' ${action}"
         msg "Action: %s" "$commit_msg"
     else
         action='modify'
-        local commit_msg="[${REPO_SRC}] '${PACKAGE}-$(get_full_version)' ${action}"
+        commit_msg="[${REPO_SRC}] '${PACKAGE}-$(get_full_version)' ${action}"
         msg "Action: %s" "$commit_msg"
         git add .
     fi
@@ -86,9 +138,13 @@ commit_pkg() {
 }
 
 repo_commit_pkg() {
+    local commit_msg
     if [[ "${REPO_SRC}" == 'trunk' ]];then
         action='add'
+
         prepare_commit
+        check_rebuild
+
         cp trunk/* "$CARCH/${REPO_DEST}"/
     else
         action='move'
@@ -99,7 +155,7 @@ repo_commit_pkg() {
         cp "$CARCH/${REPO_SRC}"/* "$CARCH/${REPO_DEST}"/
         git rm -r "$CARCH/${REPO_SRC}"
     fi
-    local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$(get_full_version)' ${action}"
+    commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$(get_full_version)' ${action}"
     msg "Action: %s" "$commit_msg"
 
     git add .
@@ -107,15 +163,16 @@ repo_commit_pkg() {
 }
 
 run(){
-    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    local artixpath head group
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
     if [[ -n ${artixpath} ]];then
-        local group=${artixpath%/*}
-        cd ${group}
-        local head=$(get_local_head)
+        group=${artixpath%/*}
+        cd "${group}" || return
+        head=$(get_local_head)
 
-        cd ${artixpath}
-        config
-        . $pkgbuild
+        cd "${artixpath}" || return
+
+        path_config
 
         if [[ "${cmd}" == 'commitpkg' ]];then
             commit_pkg
@@ -123,7 +180,7 @@ run(){
             repo_commit_pkg
         fi
 
-        cd ${group}
+        cd "${group}" || return
 
         ${push} && pull_tree "${group##*/}" "$head"
 #         subrepo_pull "${PACKAGE}"
@@ -141,14 +198,22 @@ run(){
 }
 
 is_valid_repo(){
-    case "${REPO_SRC}" in
-        core|extra|community|multilib|testing|community-testing|multilib-testing|staging|community-staging|multilib-staging|gnome-unstable|kde-unstable|trunk) return 0 ;;
+    local _valid=trunk
+    for repo in "${valid_names[@]}"; do
+        _valid=${repo:-}${repo:+|}$_valid
+    done
+    eval "case ${REPO_SRC} in
+        ${_valid}) return 0 ;;
         *) return 1 ;;
-    esac
+    esac"
 }
 
+#}}}
+
 load_makepkg_config
 
+load_valid_names
+
 REPO_SRC='trunk'
 PACKAGE=''
 remove=false
@@ -168,11 +233,9 @@ usage() {
     echo '    -h                 This help'
     echo ''
     echo ''
-    exit $1
+    exit "$1"
 }
 
-orig_argv=("$0" "$@")
-
 opts='p:s:urh'
 
 while getopts "${opts}" arg; do
@@ -186,9 +249,9 @@ while getopts "${opts}" arg; do
     esac
 done
 
-shift $(($OPTIND - 1))
+shift $(( OPTIND - 1 ))
 
-if $(is_valid_repo);then
+if is_valid_repo;then
     run
 else
     die "source repository '%s' is not valid!" "${REPO_SRC}"

bin/pkg/comparepkg.in

@@ -12,80 +12,96 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/repo.sh)
+m4_include(lib/pkg/table.sh)
 
-prepare_artools
 
-get_import_path(){
-    local pkg="$1" import_path=
+#{{{ upgrades, downgrades, moves
 
-    for tree in ${ARCH_TREE[@]};do
-        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && import_path=${TREE_DIR_ARCH}/$tree/$pkg
-    done
-    echo $import_path
+remove_list(){
+    local name="$1"
+    [[ -f "${TREE_DIR_ARTIX}"/$name.list ]] && rm "${TREE_DIR_ARTIX}"/"$name".list
+}
+
+write_list(){
+    local line="$1" name="$2"
+    printf "%s\n" "$line" >> "${TREE_DIR_ARTIX}"/"$name".list
 }
 
 compare_m(){
-    local result=$(vercmp "$artixver" "$archver")
-    if [[ $artixrepo == *testing* ]] || [[ $artixrepo == *staging* ]]; then
-        if [[ "${a}" == "${b}"  ]]; then
-            msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        else
-            msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-            if [[ -n "$archrepo" ]]; then
-                printf "%s\n" "${a}:${b}:$pkg" >> ${TREE_DIR_ARTIX}/pkg_moves.list
+    case ${artixrepo} in
+        *testing*|*staging*|*rebuild)
+            if [[ "${a}" == "${b}" ]] || [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
+                msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            else
+                msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+                [[ -n "$archrepo" ]] && write_list "${a}:${b}:$pkg" pkg_moves
             fi
-        fi
-
-    fi
+        ;;
+    esac
 }
 
 compare_u(){
-    local result=$(vercmp "$artixver" "$archver")
-    if [ $result -eq -1 ];then
+    if [ "$result" -eq -1 ];then
         msg_row_upgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        printf "%s\n" "${a}:$pkg" >> ${TREE_DIR_ARTIX}/pkg_upgrades.list
+        write_list "${a}:$pkg" pkg_upgrades
     fi
 }
 
 compare_d(){
-    local result=$(vercmp "$artixver" "$archver")
-    if [ $result -eq 1 ];then
+    if [ "$result" -eq 1 ];then
         if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
             msg_row_downgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
         fi
     fi
 }
 
+get_archpath(){
+    local pkg="$1" archpath
+
+    for tree in "${ARCH_TREE[@]}"; do
+        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && archpath=${TREE_DIR_ARCH}/$tree/$pkg
+    done
+    echo "$archpath"
+}
+
 pre_compare(){
-    local func="$1" pkgpath="$2"
-    local group="${pkgpath%/*}"
+    local func="$1" pkgpath="$2" result group pkg
+    group="${pkgpath%/*}"
     group=${group##*/}
-    local pkg=${pkgpath##*/}
-    local artixrepo=$(find_repo "$pkgpath")
-    local pkgbuild=$pkgpath/$artixrepo/PKGBUILD
+    pkg=${pkgpath##*/}
 
-    if [[ -f $pkgbuild ]];then
-        . $pkgbuild 2>/dev/null
-        local artixver=$(get_full_version)
+    local artixrepo archrepo pkgbuild artixver archver archpath node a b
+    artixrepo=$(find_repo "$pkgpath")
+    pkgbuild=$pkgpath/$artixrepo/PKGBUILD
 
-        local archpath=$(get_import_path $pkg)
-        local archrepo=$(find_repo "${archpath}")
+    if [[ -f $pkgbuild ]]; then
+        # shellcheck disable=1090
+        . "$pkgbuild" 2>/dev/null
+        artixver=$(get_full_version)
+        archpath=$(get_archpath "$pkg")
+        archrepo=$(find_repo "${archpath}")
         pkgbuild=$archpath/$archrepo/PKGBUILD
-        local node=${artixrepo%/*}
-        local a=${archrepo#*/} b=${artixrepo#*/}
+        node=${artixrepo%/*}
+        a=${archrepo#*/} b=${artixrepo#*/}
         a="${a%-*}"
 
         [[ "$node" != "$CARCH" ]] && b=${b%-*}
 
-        if [[ -f "$pkgbuild" ]];then
-            . $pkgbuild 2>/dev/null
-            local archver=$(get_full_version)
+        if [[ -f "$pkgbuild" ]]; then
+            # shellcheck disable=1090
+            . "$pkgbuild" 2>/dev/null
+            archver=$(get_full_version)
         fi
 
+        result=$(vercmp "$artixver" "$archver")
+
         "$func"
 
-        unset pkgver epoch pkgrel artixver archver pkgbuild archpath
+        unset epoch
     fi
 }
 
@@ -104,15 +120,7 @@ compare_move(){
     pre_compare compare_m "$pkgpath"
 }
 
-tree_loop(){
-    local func="$1"
-    for tree in ${ARTIX_TREE[@]};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"
@@ -120,7 +128,7 @@ show_compare_header(){
 
 show_upgrades_table(){
     show_compare_header
-    [[ -f ${TREE_DIR_ARTIX}/pkg_upgrades.list ]] && rm ${TREE_DIR_ARTIX}/pkg_upgrades.list
+    remove_list pkg_upgrades
     tree_loop compare_upgrades
 }
 
@@ -131,85 +139,14 @@ show_downgrades_table(){
 
 show_move_table(){
     show_compare_header
-    [[ -f ${TREE_DIR_ARTIX}/pkg_moves.list ]] && rm ${TREE_DIR_ARTIX}/pkg_moves.list
+    remove_list pkg_moves
     tree_loop compare_move
 }
 
-update_db_cache(){
-    msg "Updating database cache"
-    for repo in "${searchrepos[@]}"; do
-        local cachedir=${db_cache_dir}/${LINKSDBEXT}/${CARCH}/${repo}
-        rm -rf "$cachedir"
-        mkdir -p "$cachedir"
-        msg2 "%s" "$repo"
-        curl -L -s "${REPOS_MIRROR}/${repo}/os/${CARCH}/${repo}.${LINKSDBEXT}" \
-            | bsdtar -xf - -C "$cachedir"
-    done
-    msg "Done"
-}
-
-query_db() {
-    for repo in "${searchrepos[@]}"; do
-        local prefix=
-        local db=${db_cache_dir}/${LINKSDBEXT}/${CARCH}/${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}/${CARCH}/$repo/$pkgname ]];then
-        return 0
-    fi
-    return 1
-}
-
-check_db(){
-    local pkgpath="${1%/*}"
-
-    for repo in ${!REPOS[@]};do
-        local pkgbuild=
-        [[ -f $pkgpath/$CARCH/$repo/PKGBUILD ]] && pkgbuild=$pkgpath/$CARCH/$repo/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-$CARCH/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-$CARCH/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-any/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-any/PKGBUILD
-
-        . $pkgbuild 2>/dev/null
-        local artixver=$(get_full_version)
-        for name in ${pkgname[@]};do
-
-            if ! is_db_entry "$name-$artixver" "$repo";then
-                msg_row "${tableU}" "$repo" "$name" "$artixver" "false"
-            fi
-
-        done
-        unset artixver pkgbuild pkgver epoch pkgname pkgbase
-    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
 
+load_valid_names
+
 testing=true
 staging=true
 unstable=false
@@ -218,43 +155,7 @@ 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])"
@@ -264,30 +165,19 @@ usage() {
     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
+    exit "$1"
 }
 
-orig_argv=("$0" "$@")
-
-opts='r:qcsudmxyzh'
+opts='udmxyzh'
 
 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 ;;
@@ -296,9 +186,7 @@ while getopts "${opts}" arg; do
     esac
 done
 
-shift $(($OPTIND - 1))
-
-library="$1"; shift
+shift $(( OPTIND - 1 ))
 
 set_arch_repos "$testing" "$staging" "$unstable"
 
@@ -307,7 +195,3 @@ ${move} && show_move_table
 ${upgrades} && show_upgrades_table
 
 ${downgrades} && show_downgrades_table
-
-${check} && show_db_table
-
-${query} && show_lib_table

bin/pkg/deploypkg.in

@@ -12,42 +12,47 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/deploy.sh)
 
-prepare_artools
+#{{{ functions
 
 add(){
-    pkg=${pkgname%.*}
-    for ext in zst xz;do
-        if pkgfile=$(find_cached_pkgfile "$pkg.$ext");then
-            msg "Found: %s" "${pkgfile}"
-            packages+=("$pkg.$ext")
-            action='add'
-            ln -sf "${pkgfile}"{,.sig} "$repo_path"/
-        fi
-    done
+    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
+        msg "Found: %s" "${pkgfile}"
+        packages+=("${pkgname}")
+        action='add'
+        ln -sfv "${pkgfile}"{,.sig} "$repo_path"/
+    fi
 }
 
 remove(){
     packages+=("$pkgname")
     action='remove'
-    rm "$repo_path"/"$pkgname"*pkg.tar*
+    rm -v "$repo_path"/"$pkgname"*.pkg.tar.*
 }
 
 repo_action(){
-    local packages=() action= func="$1"
-    for pkgname in ${passfiles[@]}; do
+    local packages=() action func="$1"
+    for pkgname in "${passfiles[@]}"; do
         "$func"
     done
-    cd $repo_path
-    if [[ -n "$action" ]]; then
-        repo-"$action" -R "${dest_repo}"."${PKGDBEXT}" "${packages[@]}"
-        ${linksdb} && links-"$action" "${dest_repo}"."${LINKSDBEXT}" "${packages[@]}"
+    cd "$repo_path" || return
+    if [[ -n "${action}" ]]; then
+        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
+        ${linksdb} && links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
     fi
 }
 
+#}}}
+
 load_makepkg_config
 
+pkgdb_ext="db.tar.${DBEXT}"
+linksdb_ext="links.tar.${DBEXT}"
+
 add_pkg=false
 rm_pkg=false
 linksdb=false
@@ -64,7 +69,7 @@ usage() {
     echo '    -h                 This help'
     echo ''
     echo ''
-    exit $1
+    exit "$1"
 }
 
 opts='arlhd:'
@@ -80,19 +85,13 @@ while getopts "${opts}" arg; do
     esac
 done
 
-shift $(($OPTIND - 1))
+shift $(( OPTIND - 1 ))
 
-passfiles="$@"
-
-prepare_dir "${REPOS_ROOT}"
+passfiles=("$@")
 
 repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
 
-if [[ -n ${passfiles[@]} ]]; then
-    if ${add_pkg}; then
-        repo_action add
-    fi
-    if ${rm_pkg}; then
-        repo_action remove
-    fi
+if [[ -n "${passfiles[*]}" ]]; then
+    ${add_pkg} && repo_action add
+    ${rm_pkg} && repo_action remove
 fi

bin/pkg/find-libdeps.in

@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
+m4_include(lib/base/message.sh)
 
 set -e
 shopt -s extglob

bin/pkg/finddeps.in

@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/base/message.sh)
 
 match=$1
 

bin/pkg/lddd.in

@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/base/message.sh)
 
 ifs=$IFS
 IFS="${IFS}:"

bin/pkg/links-add.in

@@ -19,6 +19,8 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+m4_include(lib/base/message.sh)
+
 shopt -s extglob
 
 declare -r REPO_DB_NAME="links"
@@ -35,8 +37,6 @@ LOCKFILE=
 CLEAN_LOCK=0
 # PREVENT_DOWNGRADE=0
 
-. @libdir@/artools/util-base.sh
-
 # ensure we have a sane umask set
 umask 0022
 
@@ -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.${LINKSDBEXT} pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
+        printf -- "Example:  links-add /path/to/repo.links.tar.xz pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
     elif [[ $cmd == "links-remove" ]] ; then
-        printf -- "Example:  links-remove /path/to/repo.${LINKSDBEXT} kernel26\n"
+        printf -- "Example:  links-remove /path/to/repo.links.tar.xz kernel26\n"
     fi
 }
 
@@ -88,8 +88,8 @@ find_pkgentry() {
 
     for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
         name=${pkgentry##*/}
-        if [[ ${name%-*-*} = $pkgname ]]; then
-            echo $pkgentry
+        if [[ ${name%-*-*} = "$pkgname" ]]; then
+            echo "$pkgentry"
             return 0
         fi
     done
@@ -103,8 +103,8 @@ check_gpg() {
     fi
 
     if (( ! VERIFY )); then
-        if ! gpg --list-key ${GPGKEY} &>/dev/null; then
-            if [[ ! -z $GPGKEY ]]; then
+        if ! gpg --list-key "${GPGKEY}" &>/dev/null; then
+            if [[ -n "$GPGKEY" ]]; then
                 error "The key ${GPGKEY} does not exist in your keyring."
             elif (( ! KEY )); then
                 error "There is no key in your keyring."
@@ -125,7 +125,7 @@ create_signature() {
     if [[ -n $GPGKEY ]]; then
         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"
@@ -222,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"
@@ -233,9 +233,9 @@ db_write_entry() {
 
     local linksentry=$tmpdir/${REPO_DB_NAME}/$pkgname-$pkgver/${REPO_DB_NAME}
 
-    for f in $(find $tmppkg -type f); 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
@@ -248,7 +248,8 @@ db_write_entry() {
 db_remove_entry() {
     local pkgname=$1
     local notfound=1
-    local pkgentry=$(find_pkgentry "$pkgname")
+    local pkgentry
+    pkgentry=$(find_pkgentry "$pkgname")
     while [[ -n $pkgentry ]]; do
         notfound=0
 
@@ -257,7 +258,8 @@ db_remove_entry() {
         rm -rf "$pkgentry"
 
         # remove entries in "links" database
-        local linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
+        local linksentry
+        linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
         rm -rf "$linksentry"
 
         pkgentry=$(find_pkgentry "$pkgname")
@@ -404,11 +406,11 @@ create_db() {
 
     pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
     if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then
-        bsdtar -c${TAR_OPT}f "$tempname" *
+        bsdtar -c"${TAR_OPT}"f "$tempname" *
     else
         # we have no packages remaining? zip up some emptyness
         warning "No packages remain, creating empty database."
-        bsdtar -c${TAR_OPT}f "$tempname" -T /dev/null
+        bsdtar -c"${TAR_OPT}"f "$tempname" -T /dev/null
     fi
     popd >/dev/null
 
@@ -433,7 +435,7 @@ clean_up() {
     [[ -d $tmpdir ]] && rm -rf "$tmpdir"
     (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE"
 
-    exit $exit_code
+    exit "$exit_code"
 }
 
 # PROGRAM START

bin/pkg/mkchrootpkg.in

@@ -12,7 +12,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/base/message.sh)
+m4_include(lib/base/chroot.sh)
 
 shopt -s nullglob
 
@@ -278,8 +279,6 @@ move_products() {
 }
 # }}}
 
-orig_argv=("$0" "$@")
-
 opts='hcur:I:l:nNCTb:U:'
 
 while getopts "${opts}" arg; do

bin/pkg/pkg2yaml.in

@@ -12,7 +12,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-base.sh
+m4_include(lib/base/message.sh)
+m4_include(lib/base/yaml.sh)
+
+#{{{ functions
 
 srcyaml_write_attr(){
     local ident1="$1" ident2="$2" ident3="$3"
@@ -25,14 +28,14 @@ srcyaml_write_attr(){
 
     case $attrname in
         pkgver|pkgrel|epoch|url|install|changelog)
-            for v in ${attrvalues[@]};do
-                Yaml+=$(write_yaml_map $ident3 "$attrname" "$v")
+            for v in "${attrvalues[@]}"; do
+                Yaml+=$(write_yaml_map "$ident3" "$attrname" "$v")
             done
         ;;
         *)
-            Yaml+=$(write_yaml_map $ident1 "$attrname")
-            for v in ${attrvalues[@]};do
-                Yaml+=$(write_yaml_seq $ident2 "$v")
+            Yaml+=$(write_yaml_map "$ident1" "$attrname")
+            for v in "${attrvalues[@]}"; do
+                Yaml+=$(write_yaml_seq "$ident2" "$v")
             done
         ;;
     esac
@@ -100,13 +103,15 @@ yaml_write_package() {
 }
 
 yaml_write_fileinfo(){
-    local version=$(get_full_version)
+    local version
+    version=$(get_full_version)
     pkgbase=${pkgbase:-$pkgname}
     Yaml+=$(write_yaml_map 0 "version" "${version:-0}")
     Yaml+=$(write_empty_line)
-    local pkgfile=$(print_all_package_names)
+    local pkgfile
+    pkgfile=$(print_all_package_names)
     Yaml+=$(write_yaml_map 0 "files")
-    for f in ${pkgfile[@]};do
+    for f in ${pkgfile}; do
         Yaml+=$(write_yaml_seq 2 "${f##*/}")
     done
     Yaml+=$(write_empty_line)
@@ -120,12 +125,14 @@ write_srcyaml(){
     printf '%s' "${Yaml}"
 }
 
+#}}}
+
 usage() {
     echo "Usage: ${0##*/} [options]"
     echo "    -d            Don't include details"
     echo '    -h            This help'
     echo ''
-    exit $1
+    exit "$1"
 }
 
 details=true
@@ -140,13 +147,14 @@ while getopts "${opts}" arg; do
     esac
 done
 
-shift $(( $OPTIND - 1 ))
+shift $(( OPTIND - 1 ))
 
 srcpath=$(readlink -f "$1")
 
 [[ -f "$srcpath"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$srcpath"
 PACKAGE="$srcpath"/PKGBUILD; shift
 
+# shellcheck disable=1090
 . "$PACKAGE"
 
 load_makepkg_config

bin/pkg/signpkg.in

@@ -12,13 +12,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-pkg.sh
-
-prepare_artools
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/deploy.sh)
 
 load_makepkg_config
 
-passfiles="$@"
+passfiles=("$@")
 
 sign_pkg(){
     local file_to_sign="$1"
@@ -32,12 +31,13 @@ sign_pkg(){
         msg "Signing [%s]" "${file_to_sign##*/}"
         gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
     else
-        msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
+        msg "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
+for pkg in "${passfiles[@]}"; do
+    msg "Searching %s ..." "$pkg"
     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="/home/${OWNER}/artools-workspace"
+# WORKSPACE_DIR="${USER_HOME}/artools-workspace"

data/conf/artools-iso.conf

@@ -13,9 +13,3 @@
 
 # gpg key; leave empty or commented to skip img signing
 # GPG_KEY=""
-
-# set upload bandwidth limit in kB/s
-# UPLIMIT=1000
-
-# the server user
-# ACCOUNT=[SetUser]

data/conf/artools-pkg.conf

@@ -2,11 +2,9 @@
 ################ artools-pkg ################
 #############################################
 
-# gitea user access token
+# gitea user access token for buildtree
 # GIT_TOKEN=''
 
-# HOST_TREE_ARTIX='gitea@gitea.artixlinux.org:artixlinux'
-
 # TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
 
 # customize buildtree; uncomment to include
@@ -30,14 +28,13 @@
 #         packages-wm
 #         packages-devel
 #         packages-lib32
+#         packages-qt6
 # )
 
-# HOST_TREE_ARCH=git://git.archlinux.org/svntogit
-
 # TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
 
-# default repos root
+# default repos root for deploypkg
 # REPOS_ROOT=${WORKSPACE_DIR}/repos
 
-# default mirror for sogrep
+# default mirror for checkrepo
 # REPOS_MIRROR="http://mirror1.artixlinux.org/repos"

data/valid-names.conf

@@ -0,0 +1,42 @@
+#!/hint/bash
+
+valid_names=(
+    core
+    extra
+    community
+    multilib
+    testing
+    community-testing
+    multilib-testing
+    staging
+    community-staging
+    multilib-staging
+    rebuild
+    gnome-unstable
+    kde-unstable
+)
+
+stable=(
+    "${valid_names[0]}"
+    "${valid_names[1]}"
+    "${valid_names[2]}"
+    "${valid_names[3]}"
+)
+
+gremlins=(
+    "${valid_names[4]}"
+    "${valid_names[5]}"
+    "${valid_names[6]}"
+)
+
+goblins=(
+    "${valid_names[7]}"
+    "${valid_names[8]}"
+    "${valid_names[9]}"
+    "${valid_names[10]}"
+)
+
+wobble=(
+    "${valid_names[11]}"
+    "${valid_names[12]}"
+)

lib/base/chroot.sh

@@ -1,16 +1,22 @@
-#!/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.
+#!/hint/bash
+
+#{{{ chroot
+
+CHROOTVERSION=0.10
+
+orig_argv=("$0" "$@")
+check_root() {
+    local keepenv="$1"
+
+    (( EUID == 0 )) && return
+    if type -P sudo >/dev/null; then
+        # shellcheck disable=2154
+        exec sudo --preserve-env="$keepenv" -- "${orig_argv[@]}"
+    else
+        # shellcheck disable=2154
+        exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
+    fi
+}
 
 is_btrfs() {
     [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
@@ -20,9 +26,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
@@ -42,19 +48,4 @@ 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/common.sh

@@ -0,0 +1,16 @@
+#!/hint/bash
+
+#{{{ common
+
+get_makepkg_conf() {
+    makepkg_conf="${DATADIR}/makepkg.conf"
+    [[ -f ${USER_CONF_DIR}/makepkg.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.conf"
+}
+
+get_pacman_conf() {
+    local repo="$1"
+    pacman_conf="${DATADIR}/pacman-${repo}.conf"
+    [[ -f "${USER_CONF_DIR}/pacman-${repo}.conf" ]] && pacman_conf="${USER_CONF_DIR}/pacman-${repo}.conf"
+}
+
+#}}}

lib/base/fstab.sh

@@ -1,213 +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.
-
-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,20 +1,16 @@
-#!/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.
+#!/hint/bash
+
+#{{{ message
+
+#set +u +o posix
+
+# shellcheck disable=1091
+. /usr/share/makepkg/util.sh
 
-# export LC_MESSAGES=C
 export LANG=C
 
+shopt -s extglob
+
 if [[ -t 2 && "$TERM" != dumb ]]; then
     colorize
 else
@@ -23,15 +19,18 @@ fi
 
 info() {
     local mesg=$1; shift
+    # shellcheck disable=2059
     printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
 stat_busy() {
     local mesg=$1; shift
+    # shellcheck disable=2059
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
 stat_done() {
+    # shellcheck disable=2059
     printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
@@ -45,9 +44,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
 }
@@ -57,9 +56,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
 }
@@ -100,28 +99,4 @@ die() {
     cleanup 255
 }
 
-msg_table_header(){
-    local mesg=$1; shift
-    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
-}
-
-msg_row_downgrade(){
-    local mesg=$1; shift
-    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&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,47 +1,12 @@
-#!/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.
+#!/hint/bash
+
+#{{{ mount
 
 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
@@ -88,8 +53,8 @@ chroot_mount_conditional() {
 }
 
 chroot_setup(){
-    local mnt="$1" os="$2" run_args='-t tmpfs -o nosuid,nodev,mode=0755'
-    $os && run_args='--bind'
+    local mnt="$1" os="$2" args='-t tmpfs -o nosuid,nodev,mode=0755'
+    $os && 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 &&
@@ -98,33 +63,10 @@ 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" ${run_args} &&
+    chroot_mount /run "$mnt/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
@@ -139,10 +81,4 @@ chroot_api_umount() {
     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,47 +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.
-
-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
-}
-
-get_osname(){
-    . /usr/lib/os-release
-    echo "${NAME}"
-}
-
-# 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,16 +1,6 @@
-#!/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.
+#!/hint/bash
+
+#{{{ yaml
 
 write_yaml_header(){
     printf '%s' '---'
@@ -34,3 +24,5 @@ write_yaml_seq_map(){
     local ident="$1" key="$2" val="$3"
     printf "\n%${ident}s- %s: %s\n" '' "$key" "$val"
 }
+
+#}}}

lib/iso/calamares.sh

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

lib/iso/chrootcfg.sh

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

@@ -0,0 +1,55 @@
+#!/hint/bash
+
+#{{{ session
+
+configure_hosts(){
+    sed -e "s|localhost.localdomain|localhost.localdomain ${HOST_NAME}|" -i "$1"/etc/hosts
+}
+
+configure_logind(){
+    local conf=$1/etc/"$2"/logind.conf
+    if [[ -e "$conf" ]];then
+        msg2 "Configuring logind ..."
+        sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
+        sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
+        sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
+    fi
+}
+
+configure_services(){
+    local mnt="$1"
+    info "Configuring [%s] services" "${INITSYS}"
+    add_svc_"${INITSYS}" "$mnt" "${SERVICES[*]} ${SERVICES_LIVE[*]}"
+    info "Done configuring [%s] services" "${INITSYS}"
+}
+
+configure_system(){
+    local mnt="$1"
+    configure_logind "$mnt" "elogind"
+    echo "${HOST_NAME}" > "$mnt"/etc/hostname
+}
+
+write_live_session_conf(){
+    local conf=''
+    conf+=$(printf '%s\n' '# live session configuration')
+    conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
+    conf+=$(printf "\nUSER_NAME=%s\n" "${USER_NAME}")
+    conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
+    conf+=$(printf "\nADDGROUPS='%s'\n" "${ADDGROUPS}")
+    printf '%s' "$conf"
+}
+
+configure_chroot(){
+    local fs="$1"
+    msg "Configuring [%s]" "${fs##*/}"
+    configure_hosts "$fs"
+    configure_system "$fs"
+    configure_services "$fs"
+    configure_calamares "$fs"
+    [[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
+    msg2 "Writing live.conf"
+    write_live_session_conf > "$fs/etc/artools/live.conf"
+    msg "Done configuring [%s]" "${fs##*/}"
+}
+
+#}}}

lib/iso/dracut.sh

@@ -0,0 +1,42 @@
+#!/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}"
+    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=()
+    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

@@ -0,0 +1,17 @@
+#!/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,117 +1,6 @@
-#!/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.
+#!/hint/bash
 
-prepare_boot_extras(){
-    local src="$1" 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
-}
-
-##################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"
-}
+#{{{ grub
 
 configure_grub(){
     msg "Configuring grub kernel options ..."
@@ -119,12 +8,12 @@ configure_grub(){
     local rw_opts=()
     local kopts=("label=${iso_label}")
 
-    [[ "${PROFILE}" != 'base' ]] && kopts+=('overlay=livefs')
+    [[ "${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
+        -i "${iso_root}"/boot/grub/kernels.cfg
 }
 
 prepare_grub(){
@@ -135,51 +24,53 @@ prepare_grub(){
     local grub=${iso_root}/boot/grub efi=${iso_root}/efi/boot
 
 
-    prepare_dir ${grub}/${platform}
+    prepare_dir "${grub}/${platform}"
 
-    cp ${livecfg}/cfg/*.cfg ${grub}
+    cp "${livecfg}"/cfg/*.cfg "${grub}"
 
-    cp ${lib}/${platform}/* ${grub}/${platform}
+    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

@@ -0,0 +1,57 @@
+#!/hint/bash
+
+#{{{ initcpio
+
+write_mkinitcpio_conf() {
+    msg2 "Writing mkinitcpio.conf ..."
+    local conf="$1/etc/mkinitcpio-artix.conf"
+    printf "%s\n" 'MODULES=(loop dm-snapshot)' > "$conf"
+    printf "%s\n" 'COMPRESSION="xz"' >> "$conf"
+    if [[ "${profile}" == 'base' ]];then
+        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
+                            artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs
+                            artix_kms modconf block filesystems keyboard keymap)' >> "$conf"
+    else
+        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
+                            artix_kms modconf block filesystems keyboard keymap)' >> "$conf"
+    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
+     _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"
+}
+
+#}}}

lib/iso/iso.sh

@@ -1,127 +1,30 @@
-#!/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.
+#!/hint/bash
 
-make_sig () {
-    local file="$1"
-    msg2 "Creating signature file..."
-    cd ${iso_root}${live_dir}
-    chown "${OWNER}:$(id --group ${OWNER})" "${iso_root}${live_dir}"
-    su ${OWNER} -c "gpg --detach-sign --default-key ${GPG_KEY} $file"
-    chown -R root "${iso_root}${live_dir}"
-    cd ${OLDPWD}
-}
-
-make_checksum(){
-    local file="$1"
-    msg2 "Creating md5sum ..."
-    cd ${iso_root}${live_dir}
-    md5sum $file > $file.md5
-    cd ${OLDPWD}
-}
-
-make_ext_img(){
-    local src="$1"
-    local size=32G
-    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
-}
+#{{{ iso
 
 get_disturl(){
+    # shellcheck disable=1091
     . /usr/lib/os-release
     echo "${HOME_URL}"
 }
 
+get_osname(){
+    # shellcheck disable=1091
+    . /usr/lib/os-release
+    echo "${NAME}"
+}
+
 assemble_iso(){
     msg "Creating ISO image..."
-    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)>"
+    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)>"
 
     xorriso -as mkisofs \
-        --modification-date=${mod_date} \
+        --modification-date="${mod_date}" \
         --protective-msdos-label \
         -volid "${iso_label}" \
         -appid "${appid}" \
@@ -130,17 +33,18 @@ 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,16 +1,6 @@
-#!/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.
+#!/hint/bash
+
+#{{{ mount
 
 track_img() {
     info "mount: [%s]" "$2"
@@ -24,7 +14,7 @@ mount_img() {
 }
 
 umount_img() {
-    if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
+    if [[ -n "${IMG_ACTIVE_MOUNTS[*]}" ]];then
         info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
         umount "${IMG_ACTIVE_MOUNTS[@]}"
         unset IMG_ACTIVE_MOUNTS
@@ -39,24 +29,27 @@ track_fs() {
 
 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
+    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,16 +1,6 @@
-#!/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.
+#!/hint/bash
+
+#{{{ profile
 
 show_profile(){
     msg2 "iso_file: %s" "${iso_file}"
@@ -27,15 +17,16 @@ load_profile(){
     local profile_dir="${DATADIR}/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"
 
-    [[ -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'}
 
@@ -50,7 +41,7 @@ load_profile(){
 
     ADDGROUPS=${ADDGROUPS:-"video,power,optical,network,lp,scanner,wheel,users,log"}
 
-    if [[ -z ${SERVICES[@]} ]];then
+    if [[ -z "${SERVICES[*]}" ]];then
         SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
     fi
 
@@ -66,21 +57,11 @@ load_profile(){
     return 0
 }
 
-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" init="$2"
     info "Loading Packages: [%s] ..." "${pkglist##*/}"
 
-    local _init="s|@$init||g"
+    local _init="s|@$init||g" _init_rm1 _init_rm2
     case "$init" in
         'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6.*||g" ;;
         's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
@@ -99,3 +80,5 @@ load_pkgs(){
             | sed "$_init_rm2" \
             | sed "$_clean"))
 }
+
+#}}}

lib/iso/services.sh

@@ -0,0 +1,52 @@
+#!/hint/bash
+
+#{{{ services
+
+set_xdm(){
+    if [[ -f "$1"/etc/conf.d/xdm ]];then
+        local conf='DISPLAYMANAGER="'${DISPLAYMANAGER}'"'
+        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" "$1"/etc/conf.d/xdm
+    fi
+}
+
+add_svc_openrc(){
+    local mnt="$1" names="$2" rlvl="${3:-default}"
+    for svc in $names; do
+        if [[ -f $mnt/etc/init.d/$svc ]];then
+            msg2 "Setting %s ..." "$svc"
+            [[ $svc == "xdm" ]] && set_xdm "$mnt"
+            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" rlvl="${3:-default}" error ret
+    for svc in $names; do
+        error=false
+        chroot "$mnt" s6-rc-db -c /etc/s6/rc/compiled type "$svc" &> /dev/null || error=true
+        ret="$?"
+        if [ $ret -eq 0 ] && [[ "$error" == false ]]; then
+            msg2 "Setting %s ..." "$svc"
+            chroot "$mnt" s6-rc-bundle-update -c /etc/s6/rc/compiled add "$rlvl" "$svc"
+        fi
+    done
+
+    # 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
+}
+
+#}}}

lib/iso/squash.sh

@@ -0,0 +1,104 @@
+#!/hint/bash
+
+#{{{ squash
+
+make_sig () {
+    local file="$1"
+    msg2 "Creating signature file..."
+    cd "${iso_root}${live_dir}"
+    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
+    su "${owner}" -c "gpg --detach-sign --default-key ${GPG_KEY} $file"
+    chown -R root "${iso_root}${live_dir}"
+    cd "${OLDPWD}"
+}
+
+make_checksum(){
+    local file="$1"
+    msg2 "Creating md5sum ..."
+    cd "${iso_root}${live_dir}"
+    md5sum "$file" > "$file".md5
+    cd "${OLDPWD}"
+}
+
+make_ext_img(){
+    local src="$1"
+    local size=32G
+    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 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
+        if ${persist}; then
+            rm -r "${work_dir}/embed"
+        fi
+    fi
+}
+
+#}}}

lib/iso/trap.sh

@@ -0,0 +1,48 @@
+#!/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,155 +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.
-
-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
-        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/deploy.sh

@@ -0,0 +1,28 @@
+#!/hint/bash
+
+#{{{ deploy
+
+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
+}
+
+#}}}

lib/pkg/git.sh

@@ -1,35 +1,61 @@
-#!/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.
+#!/hint/bash
+
+#{{{ git
+
+get_pkg_org(){
+    local pkg="$1" org sub
+    case ${pkg} in
+        ruby-*) org="packagesRuby" ;;
+        perl-*) org="packagesPerl" ;;
+        python-*|python2-*) org="packagesPython" ;;
+        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
+    esac
+    echo "$org"
+}
+
+get_team_id() {
+    local org="$1" team="$2"
+    local id
+    id=$(curl -s -X GET "${GIT_URL}/api/v1/orgs/$org/teams/search?q=$team&access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json" | jq '.data[] .id')
+    echo "$id"
+}
+
+add_repo_to_team() {
+    local pkg="$1" org="$2" team="$3"
+    local id
+    id=$(get_team_id "$org" "$team")
+    local gitname
+    gitname=$(get_compliant_name "$pkg")
+
+    msg2 "Adding package repo [%s] to team (%s)" "$gitname" "$team"
+
+    curl -s -X PUT "${GIT_URL}/api/v1/teams/$id/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json"
+}
+
+remove_repo_from_team() {
+    local pkg="$1" org="$2" team="$3"
+    local id
+    id=$(get_team_id "$org" "$team")
+    local gitname
+    gitname=$(get_compliant_name "$pkg")
+
+    msg2 "Removing package repo [%s] from team (%s)" "$gitname" "$team"
+
+    curl -s -X DELETE "${GIT_URL}/api/v1/teams/$id/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json"
+}
 
 get_local_head(){
-    echo $(git log --pretty=%H ...refs/heads/master^ | head -n 1)
+    git log --pretty=%H ...refs/heads/master^ | head -n 1
 }
 
 get_remote_head(){
-    echo $(git ls-remote origin -h refs/heads/master | cut -f1)
+    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(){
+has_changeset(){
     local head_l="$1" head_r="$2"
     if [[ "$head_l" == "$head_r" ]]; then
         msg2 "remote changes: no"
@@ -41,65 +67,14 @@ has_changes(){
 }
 
 pull_tree(){
-    local tree="$1" local_head="$2" os="${3:-$(get_osname)}"
-    local remote_head=$(get_remote_head)
+    local tree="$1" local_head="$2" os="${3:-Artix}"
+    local remote_head
+    remote_head=$(get_remote_head)
 
     msg "Checking (%s) (%s)" "${tree}" "$os"
-    if has_changes "${local_head}" "${remote_head}";then
+    if has_changeset "${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 ..
-}
+#}}}

lib/pkg/gitea.sh

@@ -1,57 +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.
-
-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/jenkins.sh

@@ -0,0 +1,43 @@
+#!/hint/bash
+
+#{{{ jenkins
+
+write_jenkinsfile(){
+    local pkg="$1"
+    local jenkins=$pkg/Jenkinsfile
+
+    echo "@Library('artix-ci') import org.artixlinux.RepoPackage" > "$jenkins"
+    {
+    echo ''
+    echo 'PackagePipeline(new RepoPackage(this))'
+    echo ''
+    } >> "$jenkins"
+
+    git add "$jenkins"
+}
+
+write_agentyaml(){
+    local pkg="$1"
+    local agent="$pkg"/.artixlinux/agent.yaml label='master'
+    [[ -d $pkg/.artixlinux ]] || mkdir "$pkg"/.artixlinux
+
+    echo '---' > "$agent"
+    {
+    echo ''
+    echo "label: $label"
+    echo ''
+    } >> "$agent"
+
+    git add "$agent"
+}
+
+commit_jenkins_files(){
+    local pkg="$1"
+
+    write_jenkinsfile "$pkg"
+    write_agentyaml "$pkg"
+
+    git commit -m "initial commit"
+}
+
+#}}}

lib/pkg/repo.sh

@@ -0,0 +1,51 @@
+#!/hint/bash
+
+##{{{ repo
+
+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
+}
+
+set_arch_repos(){
+    local _testing="$1" _staging="$2" _unstable="$3"
+    [[ -z ${valid_names[*]} ]] && load_valid_names
+    ARCH_REPOS=("${stable[@]}")
+    $_testing && ARCH_REPOS+=("${gremlins[@]}")
+    $_staging && ARCH_REPOS+=("${goblins[@]}")
+    $_unstable && ARCH_REPOS+=("${wobble[@]}")
+}
+
+find_repo(){
+    local pkg="$1" pkgarch="${2:-${CARCH}}" repo
+    for r in "${ARCH_REPOS[@]}"; do
+        [[ -f $pkg/repos/$r-$pkgarch/PKGBUILD ]] && repo=repos/"$r-$pkgarch"
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=repos/"$r"-any
+        [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$pkgarch/$r"
+    done
+    echo "$repo"
+}
+
+find_pkg(){
+    local searchdir="$1" pkg="$2" result
+    result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
+    echo "$result"
+}
+
+tree_loop(){
+    local func="$1" pkgs
+    for tree in "${ARTIX_TREE[@]}"; do
+        pkgs=$(find "${TREE_DIR_ARTIX}/$tree" -name repos -o -name "$CARCH")
+        for package in ${pkgs}; do
+            "$func" "$package"
+        done
+    done
+}
+
+#}}}

lib/pkg/subrepo.sh

@@ -1,56 +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.
-
-get_pkg_org(){
-    local pkg="$1" org= sub=
-    case ${pkg} in
-        ruby-*) org="packagesRuby" ;;
-        perl-*) org="packagesPerl" ;;
-        python-*|python2-*) org="packagesPython" ;;
-        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
-    esac
-    echo $org
-}
-
-subrepo_init() {
-    local pkg="$1" org="$2"
-    local gitname=$(get_compliant_name "$pkg")
-    msg2 "Subrepo init (%s)" "$pkg"
-    git subrepo init "$pkg" -r gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git
-}
-
-subrepo_push(){
-    local pkg="$1"
-    msg2 "Subrepo push (%s)" "$pkg"
-    git subrepo push "$pkg" || die "%s push failed" "$pkg"
-}
-
-subrepo_clean(){
-    local pkg="$1"
-    msg2 "Subrepo clean (%s)" "$pkg"
-    git subrepo clean "$pkg"
-}
-
-subrepo_pull(){
-    local pkg="$1"
-    msg2 "Subrepo pull (%s)" "$pkg"
-    git subrepo pull "$pkg"
-}
-
-subrepo_clone(){
-    local pkg="$1" org="$2"
-    local gitname=$(get_compliant_name "$pkg")
-    msg2 "Subrepo clone [%s] from (%s)" "$pkg" "$org/$gitname"
-    git subrepo clone gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git "$pkg"
-}

lib/pkg/table.sh

@@ -0,0 +1,36 @@
+#!/hint/bash
+
+#{{{ table
+
+msg_table_header(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_downgrade(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_notify(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row(){
+    local mesg=$1; shift
+#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+    # shellcheck disable=2059
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_upgrade(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
+}
+
+#}}}

lib/pkg/util.sh

@@ -1,72 +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
-
-get_compliant_name(){
-    local gitname="$1"
-    case "$gitname" in
-        *+) gitname=${gitname//+/plus} ;;
-        *+*) gitname=${gitname//+/-} ;;
-    esac
-    echo "$gitname"
-}
-
-set_arch_repos(){
-    local x="$1" y="$2" z="$3"
-    ARCH_REPOS=(core extra community multilib)
-
-    $x && ARCH_REPOS+=(testing community-testing multilib-testing)
-    $y && ARCH_REPOS+=(staging community-staging multilib-staging)
-    $z && ARCH_REPOS+=(gnome-unstable kde-unstable)
-}
-
-find_repo(){
-    local pkg="$1" repo= pkgarch="${2:-${CARCH}}"
-    for r in ${ARCH_REPOS[@]};do
-        [[ -f $pkg/repos/$r-$pkgarch/PKGBUILD ]] && repo=repos/"$r-$pkgarch"
-        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=repos/"$r"-any
-        [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$pkgarch/$r"
-    done
-    echo $repo
-}
-
-find_pkg(){
-    local searchdir="$1" pkg="$2"
-    local result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    echo "$result"
-}
-
-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
-}

lib/util-base.sh

@@ -0,0 +1,41 @@
+#!/hint/bash
+
+#{{{ base conf
+
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+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(){
+    [[ ! -d $1 ]] && mkdir -p "$1"
+}
+
+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
+}
+
+#}}}
+
+load_base_config "${USER_CONF_DIR}" || load_base_config "${SYSCONFDIR}"
+
+prepare_dir "${WORKSPACE_DIR}"
+prepare_dir "${USER_CONF_DIR}"

lib/util-base.sh.in

@@ -1,59 +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.
-
-CHROOTVERSION=@chroot_version@
-
-. @datadir@/makepkg/util.sh
-
-DATADIR=${DATADIR:-'@datadir@/artools'}
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
-
-OWNER=${SUDO_USER:-$USER}
-
-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"
-
-for baselib in ${LIBDIR}/base/*.sh; do
-    . $baselib
-done
-
-prepare_artools(){
-    prepare_dir "${WORKSPACE_DIR}"
-    prepare_dir "${USER_CONF_DIR}"
-}
-
-load_base_config(){
-
-    local conf="$1/artools-base.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    [[ -r "$conf" ]] && . "$conf"
-
-    ARCH=$(uname -m)
-
-    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
-
-    WORKSPACE_DIR=${WORKSPACE_DIR:-"/home/${OWNER}/artools-workspace"}
-
-    return 0
-}
-
-load_base_config "${USER_CONF_DIR}" || load_base_config "${SYSCONFDIR}"

lib/util-iso.sh

@@ -0,0 +1,29 @@
+#!/hint/bash
+
+#{{{ 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:-''}
+
+    return 0
+}
+
+#}}}
+
+load_iso_config "${USER_CONF_DIR}" || load_iso_config "${SYSCONFDIR}"
+
+prepare_dir "${ISO_POOL}"

lib/util-iso.sh.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.
-
-. @libdir@/artools/util-base.sh
-
-for isolib in ${LIBDIR}/iso/*.sh; do
-    . $isolib
-done
-
-load_iso_config(){
-
-    local conf="$1/artools-iso.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    [[ -r "$conf" ]] && . "$conf"
-
-    CHROOTS_ISO="${CHROOTS_DIR}/buildiso"
-
-    ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
-
-    PROFILE='base'
-
-    ISO_VERSION=${ISO_VERSION:-"$(date +%Y%m%d)"}
-
-    INITSYS=${INITSYS:-'openrc'}
-
-    GPG_KEY=${GPG_KEY:-''}
-
-    UPLIMIT=${UPLIMIT:-1000}
-
-    FILE_HOST="download.${DOMAIN}"
-
-    FILE_HOME=${FILE_HOME:-'/srv/iso'}
-
-    FILE_PORT=${FILE_PORT:-65432}
-
-    ACCOUNT=${ACCOUNT:-'naughtyISOuploader'}
-
-    return 0
-}
-
-load_iso_config "${USER_CONF_DIR}" || load_iso_config "${SYSCONFDIR}"

lib/util-pkg.sh

@@ -0,0 +1,69 @@
+#!/hint/bash
+
+#{{{ pkg conf
+
+load_pkg_config(){
+
+    local conf="$1/artools-pkg.conf"
+
+    [[ -f "$conf" ]] || return 1
+
+    # shellcheck source=/etc/artools/artools-pkg.conf
+    [[ -r "$conf" ]] && . "$conf"
+
+    local git_domain="gitea.artixlinux.org"
+
+    GIT_URL="https://${git_domain}"
+
+    GIT_SSH="gitea@${git_domain}"
+
+    GIT_TOKEN=${GIT_TOKEN:-''}
+
+    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
+
+    ARTIX_TREE=(
+        packages community
+        packages-{gfx,gtk,media,net,qt5,xorg}
+    )
+
+    local dev_tree=(packages-{python,perl,java,ruby})
+
+    local init_tree=(packages-{openrc,runit,s6})
+
+    local desktop_tree=(
+        packages-{kf5,plasma,kde,qt6}
+        packages-{lxqt,gnome,cinnamon,mate,xfce,wm}
+    )
+
+    [[ -z ${TREE_NAMES_ARTIX[*]} ]] && \
+    TREE_NAMES_ARTIX=(
+        packages-kernel
+        "${init_tree[@]}"
+        "${dev_tree[@]}"
+        "${desktop_tree[@]}"
+        packages-devel
+        packages-lib32
+    )
+
+    ARTIX_TREE+=("${TREE_NAMES_ARTIX[@]}")
+
+    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
+
+    ARCH_TREE=(svntogit-{packages,community})
+
+    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
+
+    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
+
+    DBEXT=${DBEXT:-'xz'}
+
+    return 0
+}
+
+#}}}
+
+load_pkg_config "${USER_CONF_DIR}" || load_pkg_config "${SYSCONFDIR}"
+
+prepare_dir "${REPOS_ROOT}"
+prepare_dir "${TREE_DIR_ARTIX}"
+prepare_dir "${TREE_DIR_ARCH}"

lib/util-pkg.sh.in

@@ -1,88 +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@/artools/util-base.sh
-
-for pkglib in ${LIBDIR}/pkg/*.sh; do
-    . $pkglib
-done
-
-load_pkg_config(){
-
-    local conf="$1/artools-pkg.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    [[ -r "$conf" ]] && . "$conf"
-
-    DOMAIN='artixlinux.org'
-
-    GIT_DOMAIN="gitea.${DOMAIN}"
-
-    GIT_URL="https://${GIT_DOMAIN}"
-
-    GIT_TOKEN=${GIT_TOKEN:-''}
-
-    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
-
-    ARTIX_TREE=(
-        packages community
-        packages-{gfx,gtk,media,net,qt5,xorg}
-    )
-
-    local dev_tree=(packages-{python,perl,java,ruby})
-
-    local init_tree=(packages-{openrc,runit,s6})
-
-    local desktop_tree=(
-        packages-{kf5,plasma,kde}
-        packages-{lxqt,gnome,cinnamon,mate,xfce,wm}
-    )
-
-    [[ -z ${TREE_NAMES_ARTIX[@]} ]] && \
-    TREE_NAMES_ARTIX=(
-        packages-kernel
-        "${init_tree[@]}"
-        "${dev_tree[@]}"
-        "${desktop_tree[@]}"
-        packages-devel
-        packages-lib32
-    )
-
-    ARTIX_TREE+=("${TREE_NAMES_ARTIX[@]}")
-
-    HOST_TREE_ARTIX=${HOST_TREE_ARTIX:-"gitea@${GIT_DOMAIN}:artixlinux"}
-
-    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
-
-    ARCH_TREE=(packages community)
-
-    HOST_TREE_ARCH=${HOST_TREE_ARCH:-'git://git.archlinux.org/svntogit'}
-
-    CHROOTS_PKG="${CHROOTS_DIR}/buildpkg"
-
-    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
-
-    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
-
-    DBEXT=${DBEXT:-'xz'}
-
-    LINKSDBEXT=${LINKSDBEXT:-"links.tar.${DBEXT}"}
-
-    PKGDBEXT=${PKGDBEXT:-"db.tar.${DBEXT}"}
-
-    return 0
-}
-
-load_pkg_config "${USER_CONF_DIR}" || load_pkg_config "${SYSCONFDIR}"