Makefile: update 0.14

remove initcpio

Makefile

@@ -1,28 +1,32 @@
-V=0.27
+VERSION=0.14
+
+CHROOT_VERSION=0.9
 
 TOOLS = artools
 PREFIX ?= /usr
 SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
 
-BASE_CONF = \
+CONF = \
-	data/conf/artools-base.conf
+	data/artools.conf
 
 BASE_BIN = \
+	bin/base/signfile \
 	bin/base/chroot-run \
 	bin/base/mkchroot \
 	bin/base/basestrap \
-	bin/base/artix-chroot \
+	bin/base/artools-chroot \
 	bin/base/fstabgen
 
+BASE_LIBS = \
+	$(wildcard lib/base/*.sh)
+
+BASE_UTIL = lib/util-base.sh
+
 BASE_DATA = \
-	$(wildcard data/pacman/pacman*.conf)
+	$(wildcard data/base/pacman*.conf)
-
-PKG_CONF = \
-	data/conf/artools-pkg.conf
-
-SETARCH_ALIASES = \
 
 PKG_BIN = \
 	bin/pkg/buildpkg \
@@ -33,15 +37,7 @@ PKG_BIN = \
 	bin/pkg/pkg2yaml \
 	bin/pkg/buildtree \
 	bin/pkg/lddd \
-	bin/pkg/links-add \
+	bin/pkg/links-add
-	bin/pkg/checkpkg \
-	bin/pkg/finddeps \
-	bin/pkg/find-libdeps \
-	bin/pkg/batchpkg \
-	bin/pkg/signpkg \
-	bin/pkg/checkrepo \
-	bin/pkg/gitearepo \
-	bin/pkg/tidyarch
 
 LN_COMMITPKG = \
 	extrapkg \
@@ -55,8 +51,7 @@ LN_COMMITPKG = \
 	multilib-testingpkg \
 	multilib-stagingpkg \
 	kde-unstablepkg \
-	gnome-unstablepkg \
+	gnome-unstablepkg
-	rebuildpkg
 
 LN_BUILDPKG = \
 	buildpkg-system \
@@ -86,79 +81,100 @@ LN_DEPLOYPKG = \
 	deploypkg-kde-wobble \
 	deploypkg-gnome-wobble
 
+PKG_LIBS = \
+	$(wildcard lib/pkg/*)
+
+PKG_LISTS = \
+	$(wildcard data/pkglists/*.list)
+
+PKG_UTIL = lib/util-pkg.sh
+
 PKG_DATA = \
-	data/pacman/makepkg.conf \
+	data/pkg/makepkg.conf
-	data/valid-names.conf
 
 PATCHES = \
 	$(wildcard data/patches/*.patch)
 
-ISO_CONF = \
-	data/conf/artools-iso.conf
-
 ISO_BIN = \
-	bin/iso/buildiso
+	bin/iso/buildiso \
+	bin/iso/deployiso
 
 LN_BUILDISO = \
 	buildiso-gremlins \
 	buildiso-goblins
 
+ISO_LIBS = \
+	$(wildcard lib/iso/*.sh)
+
+ISO_UTIL = lib/util-iso.sh
+
+DRACUT = \
+	data/dracut.conf
+
 DIRMODE = -dm0755
 FILEMODE = -m0644
 MODE =  -m0755
 LN = ln -sf
 RM = rm -f
-M4 = m4 -P --define=m4_artools_pkg_version=$V
+M4 = m4 -P
 CHMODAW = chmod a-w
 CHMODX = chmod +x
 
 BIN = $(BASE_BIN) $(PKG_BIN) $(ISO_BIN)
+UTIL = $(BASE_UTIL) $(PKG_UTIL) $(ISO_UTIL)
 
-all: $(BIN)
+all: $(BIN) $(UTIL)
 
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
+EDIT_UTIL = sed -e "s|@datadir[@]|$(DATADIR)|g" \
-	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g"
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
+	-e "s|@chroot_version@|$(CHROOT_VERSION)|"
 
-%: %.in Makefile lib/util-base.sh
+EDIT_BIN = sed -e "s|@libdir[@]|$(LIBDIR)|g"
+
+$(UTIL): %: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | $(M4) | $(EDIT) >$@
+	@$(M4) $@.in | $(EDIT_UTIL) >$@
+	@$(CHMODAW) "$@"
+
+$(BIN): %: %.in Makefile
+	@echo "GEN $@"
+	@$(RM) "$@"
+	@$(M4) $@.in | $(EDIT_BIN) >$@
 	@$(CHMODAW) "$@"
 	@$(CHMODX) "$@"
-	@bash -O extglob -n "$@"
 
 clean:
-	$(RM) $(BIN)
+	$(RM) $(BIN) $(UTIL)
 
 install_base:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(BASE_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install $(FILEMODE) $(CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 
 	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)
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d
-	for a in ${SETARCH_ALIASES}; do install $(FILEMODE) setarch-aliases.d/$$a $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d; done
-
 install_pkg:
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(PKG_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(PKG_BIN) $(DESTDIR)$(BINDIR)
 
-	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
-
 	$(LN) links-add $(DESTDIR)$(BINDIR)/links-remove
 
 	for l in $(LN_COMMITPKG); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
 	for l in $(LN_BUILDPKG); do $(LN) buildpkg $(DESTDIR)$(BINDIR)/$$l; done
 	for l in $(LN_DEPLOYPKG); do $(LN) deploypkg $(DESTDIR)$(BINDIR)/$$l; done
 
-	$(LN) artix-chroot $(DESTDIR)$(BINDIR)/artools-chroot
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
+	install $(FILEMODE) $(PKG_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(PKG_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
 
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
@@ -166,15 +182,22 @@ install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 
-install_iso:
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install $(FILEMODE) $(PKG_LISTS) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
-	install $(FILEMODE) $(ISO_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 
+install_iso:
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(ISO_BIN) $(DESTDIR)$(BINDIR)
 
 	for l in $(LN_BUILDISO); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
 
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+	install $(FILEMODE) $(ISO_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(ISO_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+
+	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/dracut.cond.d
+	install $(FILEMODE) $(DRACUT) $(DESTDIR)$(SYSCONFDIR)/dracut.cond.d/90-artix-live.conf
+
 install: install_base install_pkg install_iso
 
 .PHONY: all clean install install_base install_pkg install_iso

README.md

@@ -18,34 +18,36 @@ artools
 ##### Runtime:
 
 - base:
+  * openssh
+  * rsync
+  * haveged
   * os-prober
+  * gnupg
   * pacman
 
 - pkg:
   * namcap
   * git-subrepo
-  * rsync
+  * jshon
 
 - iso:
   * dosfstools
   * libisoburn
   * squashfs-tools
+  * dracut
   * grub
 
 #### Configuration
 
-artools-{base,pkg,iso}.conf are the configuration files for artools.
+artools.conf is the central configuration file for artools.
-By default, the config files are installed in
+By default, the config is installed in
 
-```bash
+    /etc/artools/artools.conf
-/etc/artools/artools-{base,pkg,iso}.conf
-```
 
-A user artools-{base,pkg,iso}.conf can be placed in
+A user artools.conf can be placed in
+
+    $HOME/.config/artools/artools.conf
 
-```bash
-$HOME/.config/artools/artools-{base,pkg,iso}.conf
-```
 
 If the userconfig is present, artools will load the userconfig values, however, if variables have been set in the systemwide
 
@@ -53,17 +55,13 @@ These values take precedence over the userconfig.
 Best practise is to leave systemwide file untouched.
 By default it is commented and shows just initialization values done in code.
 
-Tools configuration is done in artools-{base,pkg,iso}.conf or by args.
+Tools configuration is done in artools.conf or by args.
-Specifying args will override artools-{base,pkg,iso}.conf settings.
+Specifying args will override artools.conf settings.
 
 Both, pacman.conf and makepkg.conf for chroots are loaded from
 
-```bash
+    /usr/share/artools/{makepkg,pacman-*}.conf
-usr/share/artools/{makepkg,pacman-*}.conf
-```
 
 and can be overridden dropping them in
 
-```bash
+    $HOME/.config/artools/
-$HOME/.config/artools/
-```

bin/base/artix-chroot.in

@@ -1,150 +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
-
-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/mount.sh)
-
-#{{{ functions
-
-chroot_part_mount() {
-    msg2 "mount: [%s]" "$2"
-    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
-}
-
-chroot_part_umount() {
-    chroot_api_umount
-    msg2 "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 ' ')"
-    printf "%s\n" "${detected}"
-}
-
-# $1: os-prober array
-get_os_name(){
-    local str=$1
-    str="${str#*:}"
-    str="${str#*:}"
-    str="${str%:*}"
-    printf "%s\n" "$str"
-}
-
-mount_os(){
-    CHROOT_ACTIVE_PART_MOUNTS=()
-    CHROOT_ACTIVE_MOUNTS=()
-
-    trap_setup chroot_part_umount
-
-    chroot_part_mount "$2" "$1"
-
-    local mounts
-    mounts=$(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' "$1"/etc/fstab)
-
-    for entry in ${mounts}; do
-        entry=${entry//UUID=}
-        local dev=${entry%:*} mp=${entry#*:}
-        case "${entry#*:}" in
-            '/'|'swap'|'none') continue ;;
-            *) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
-        esac
-    done
-
-    chroot_setup "$1" true
-    chroot_add_resolv_conf "$1"
-}
-
-select_os(){
-    local os_list=( "$(detect)" ) count=${#os_list[@]}
-    if [[ ${count} -gt 1 ]];then
-        msg "Detected systems:"
-        local i=0
-        for os in "${os_list[@]}"; do
-            local last=${os##*:}
-            case $last in
-                'efi') count=$((count-1)) ;;
-                *) msg2 "$i) $(get_os_name "$os")"; i=$((i+1)) ;;
-            esac
-        done
-        i=0
-        msg "Select system to mount [0-%s] : " "$((count-1))"
-        read -r select
-    else
-        select=0
-    fi
-    local os_str=${os_list[$select]} type
-    type=$os_str
-    root=${os_str%%:*}
-    type=${type##*:}
-    if [[ "${type##*:}" == 'linux' ]];then
-        msg "Mounting (%s) [%s]" "$(get_os_name "$os_str")" "$root"
-        mount_os "$1" "$root"
-    else
-        die "You can't mount %s!" "$select"
-    fi
-}
-
-#}}}
-
-automount=false
-
-usage() {
-    printf 'usage: %s -a [or] %s chroot-dir [command]\n' "${0##*/}" "${0##*/}"
-    printf '    -a             Automount detected linux system\n'
-    printf '    -h             Print this help message\n'
-    printf '\n'
-    printf "    If 'command' is unspecified, %s will launch /bin/sh.\n" "${0##*/}"
-    printf '\n'
-    printf "    If 'automount' is true, %s will launch /bin/bash\n" "${0##*/}"
-    printf '    and %s\n' "${chrootdir}"
-    printf '\n'
-    printf '\n'
-    exit "$1"
-}
-
-opts=':ha'
-
-while getopts ${opts} arg; do
-    case "${arg}" in
-        a) automount=true ;;
-        h|?) usage 0 ;;
-    esac
-done
-shift $(( OPTIND - 1 ))
-
-check_root
-
-if ${automount};then
-    chrootdir=/mnt
-    run_args=(/bin/bash)
-
-    select_os "${chrootdir}"
-else
-    chrootdir=$1
-    shift
-    run_args=("$@")
-
-    [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
-
-    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
-    chroot_add_resolv_conf "${chrootdir}"
-fi
-
-SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "${run_args[@]}"

bin/base/artools-chroot.in

@@ -0,0 +1,100 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+shopt -s extglob
+
+. @libdir@/artools/util-base.sh
+
+select_os(){
+    local os_list=( $(detect) ) count=${#os_list[@]}
+    if [[ ${count} > 1 ]];then
+        msg "Detected systems:"
+        local i=0
+        for os in ${os_list[@]};do
+            local last=${os##*:}
+            case $last in
+                'efi') count=$((count-1)) ;;
+                *) info "$i) $(get_os_name $os)"; i=$((i+1)) ;;
+            esac
+        done
+        i=0
+        msg "Select system to mount [0-%s] : " "$((count-1))"
+        read select
+    else
+        select=0
+    fi
+    local os_str=${os_list[$select]} type
+    type=$os_str
+    root=${os_str%%:*}
+    type=${type##*:}
+    if [[ "${type##*:}" == 'linux' ]];then
+        msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
+        mount_os "$1" "$root"
+    else
+        die "You can't mount %s!" "$select"
+    fi
+}
+
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
+automount=false
+
+usage() {
+    echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
+    echo '    -a             Automount detected linux system'
+    echo '    -h             Print this help message'
+    echo ''
+    echo "    If 'command' is unspecified, ${0##*/} will launch /bin/sh."
+    echo ''
+    echo "    If 'automount' is true, ${0##*/} will launch /bin/bash"
+    echo "    and ${chrootdir}."
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts=':ha'
+
+while getopts ${opts} arg; do
+    case "${arg}" in
+        a) automount=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument ${arg}"; usage 1 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+check_root
+
+if ${automount};then
+    chrootdir=/mnt
+    run_args=/bin/bash
+
+    select_os "${chrootdir}"
+else
+    chrootdir=$1
+    shift
+    run_args="$@"
+
+    [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
+
+    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
+    chroot_add_resolv_conf "${chrootdir}"
+fi
+
+SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}

bin/base/basestrap.in

@@ -22,11 +22,7 @@
 
 shopt -s extglob
 
-m4_include(lib/base/message.sh)
+. @libdir@/artools/util-base.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/"
@@ -40,48 +36,48 @@ 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 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
-    mkdir -m 1777 -p "$1"/tmp
+    mkdir -m 1777 -p $1/{tmp,run}
-    mkdir -m 0555 -p "$1"/{sys,proc}
+    mkdir -m 0555 -p $1/{sys,proc}
 }
 
-#}}}
-
 newroot=/mnt
 
-hostcache=0
+hostcache=false
-copykeyring=1
+copykeyring=true
-copymirrorlist=1
+copymirrorlist=true
-pacmode=-Sy
+directory=false
+interactive=false
 
 usage() {
-    printf "usage: %s [options] root [packages...]\n" "${0##*/}"
+    echo "usage: ${0##*/} [options] root [packages...]"
-    printf " -C <config>      Use an alternate config file for pacman\n"
+    echo " -C <config>      Use an alternate config file for pacman"
-    printf " -c               Use the package cache on the host, rather than the target\n"
+    echo " -c               Use the package cache on the host, rather than the target"
-    printf " -G               Avoid copying the host's pacman keyring to the target\n"
+    echo " -G               Avoid copying the host's pacman keyring to the target"
-    printf " -i               Avoid auto-confirmation of package selections\n"
+    echo " -i               Avoid auto-confirmation of package selections"
-    printf " -M               Avoid copying the host's mirrorlist to the target\n"
+    echo " -M               Avoid copying the host's mirrorlist to the target"
-    printf ' -U               Use pacman -U to install packages\n'
+    echo " -h               Print this help message"
-    printf " -h               Print this help message\n"
+    echo ''
-    printf '\n'
+    echo ' basestrap installs packages to the specified new root directory.'
-    printf ' basestrap installs packages to the specified new root directory.\n'
+    echo ' If no packages are given, basestrap defaults to the "base" group.'
-    printf ' If no packages are given, basestrap defaults to the "base" group.\n'
+    echo ''
-    printf '\n'
+    echo ''
-    printf '\n'
+    exit $1
-    exit "$1"
 }
 
-opts=':C:cGiMU'
+orig_argv=("$0" "$@")
+
+opts=':C:cGiM'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf=$OPTARG ;;
-        c) hostcache=1 ;;
+        c) hostcache=true ;;
-        i) interactive=1 ;;
+        i) interactive=true ;;
-        G) copykeyring=0 ;;
+        G) copykeyring=false ;;
-        M) copymirrorlist=0 ;;
+        M) copymirrorlist=false ;;
-        U) pacmode=-U ;;
+        :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
-        h|?) usage 0 ;;
+        ?) usage 0 ;;
     esac
 done
 shift $(( OPTIND - 1 ))
@@ -92,13 +88,9 @@ check_root
 newroot=$1; shift
 pacman_args=("${@:-base}")
 
-if (( ! hostcache ));then
+${hostcache} || pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
-    pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
-fi
 
-if (( ! interactive )); then
+${interactive} || pacman_args+=(--noconfirm)
-    pacman_args+=(--noconfirm)
-fi
 
 [[ -n $pacman_conf ]] && pacman_args+=(--config="$pacman_conf")
 
@@ -110,16 +102,15 @@ create_min_fs "$newroot"
 # mount API filesystems
 chroot_api_mount "$newroot" || die "failed to setup API filesystems in new root"
 
-if (( copykeyring ));then
-    copy_keyring "$newroot"
-fi
-
 msg2 'Installing packages to %s' "$newroot"
-if ! unshare --fork --pid pacman -r "$newroot" $pacmode "${pacman_args[@]}"; then
+if ! pacman -r "$newroot" -Sy "${pacman_args[@]}"; then
     die 'Failed to install packages to new root'
 fi
 
+if ${copykeyring};then
+    copy_keyring "$newroot"
+fi
 
-if (( copymirrorlist ));then
+if ${copymirrorlist};then
     copy_mirrorlist "$newroot"
 fi

bin/base/chroot-run.in

@@ -12,68 +12,49 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/base/message.sh)
+chroot_version=0.9
-m4_include(lib/base/mount.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/chroot-version.sh)
 
-# $1: chroot
+. @libdir@/artools/util-base.sh
-kill_chroot_process(){
-    local prefix="$1" flink pid name
-    for root_dir in /proc/*/root; do
-        flink=$(readlink "$root_dir")
-        if [ "x$flink" != "x" ]; then
-            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
-                # this process is in the chroot...
-                pid=$(basename "$(dirname "$root_dir")")
-                name=$(ps -p "$pid" -o comm=)
-                msg2 "Killing chroot process: %s (%s)" "$name" "$pid"
-                kill -9 "$pid"
-            fi
-        fi
-    done
-    sleep 1
-}
-
-# umask might have been changed in /etc/profile
-# ensure that sane default is set again
-umask 0022
 
 working_dir=''
 files=()
-
+nosetarch=false
-mount_args=("-B:/etc/hosts:/etc/hosts")
 
 usage() {
-    printf "Usage: %s [options] working-dir [run arguments]\n" "${0##*/}"
+    echo "Usage: ${0##*/} [options] working-dir [run arguments]"
-    printf "A wrapper around chroot. Provides support for pacman.\n"
+    echo "A wrapper around chroot. Provides support for pacman."
-    printf '\n'
+    echo
-    printf ' options:\n'
+    echo ' options:'
-    printf '    -C <file>     Location of a pacman config file\n'
+    echo '    -C <file>     Location of a pacman config file'
-    printf '    -M <file>     Location of a makepkg config file\n'
+    echo '    -M <file>     Location of a makepkg config file'
-    printf '    -c <dir>      Set pacman cache\n'
+    echo '    -c <dir>      Set pacman cache'
-    printf '    -f <file>     Copy file from the host to the chroot\n'
+    echo '    -f <file>     Copy file from the host to the chroot'
-    printf '    -s            Do not run setarch\n'
+    echo '    -s            Do not run setarch'
-    printf '    -b <list>     Bind mountargs\n'
+    echo '    -r <list>     Bind mountargs ro'
-    printf '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]\n'
+    echo '    -w <list>     Bind mountargs rw'
-    printf '    -h            This message\n'
+    echo '                  List format [src1:target1 ... srcN:targetN]'
+    echo '    -h            This message'
     exit 1
 }
 
-opts='hC:M:c:b:f:s'
+orig_argv=("$0" "$@")
+
+opts='hC:M:c:r:w:f:s'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf="$OPTARG" ;;
         M) makepkg_conf="$OPTARG" ;;
-        c) cache_dirs+=("$OPTARG") ;;
+        c) cache_dir="$OPTARG" ;;
         f) files+=("$OPTARG") ;;
-        s) nosetarch=1 ;;
+        s) nosetarch=true ;;
-        b) bindmounts+=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
+        r) bindmounts_ro=("$OPTARG") ;;
+        w) bindmounts_rw=("$OPTARG") ;;
         h|?) usage ;;
+        *) error "invalid argument '$arg'"; usage ;;
     esac
 done
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
 (( $# < 1 )) && die 'You must specify a directory.'
 
@@ -84,42 +65,23 @@ shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-if (( ${#cache_dirs[@]} == 0 )); then
+if [[ -z $cache_dir ]]; then
-    mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+    cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+else
+    cache_dirs=("$cache_dir")
 fi
 
-# shellcheck disable=2016
+pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-host_mirrors=($(pacman-conf --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
+host_mirrors=($($pacconf_cmd --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
-
+    
-for host_mirror in "${host_mirrors[@]}"; do
-    if [[ $host_mirror == *file://* ]]; then
-        # shellcheck disable=2016
-        host_mirror=$(printf "%s\n" "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
-        in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
-    fi
-done
-
-while read -r line; do
-    # shellcheck disable=2016
-    mapfile -t lines < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
-        --repo "$line" Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
-    for line in "${lines[@]}"; do
-        if [[ $line = file://* ]]; then
-            line=${line#file://}
-            in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
-        fi
-    done
-done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
-
 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
+    cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d"
-    pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
+    
-
     printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
+    
+    [[ -n $pacman_conf ]] && cp $pacman_conf "$1/etc/pacman.conf"
 
-    [[ -n $pacman_conf ]] && cp "$pacman_conf" "${working_dir}/etc/pacman.conf"
+    [[ -n $makepkg_conf ]] && cp $makepkg_conf "$1/etc/makepkg.conf"
-
-    [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "${working_dir}/etc/makepkg.conf"
 
     local file
     for file in "${files[@]}"; do
@@ -127,22 +89,32 @@ copy_hostconf () {
         cp -T "$file" "$working_dir$file"
     done
 
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "${working_dir}/etc/pacman.conf"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$1/etc/pacman.conf"
 }
 
-mount_args+=("-B:${cache_dirs[0]//:/\\:}:${cache_dirs[0]//:/\\:}")
-
-for cache_dir in "${cache_dirs[@]:1}"; do
-    mount_args+=("-Br:${cache_dir//:/\\:}:${cache_dir//:/\\:}")
-done
-
 chroot_extra_mount() {
-    chroot_add_resolv_conf "${working_dir}"
+    chroot_add_resolv_conf "$1"
+    chroot_mount "/etc/hosts" "$1/etc/hosts" -B
+#     chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
+    chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 
-    for arg in "${mount_args[@]}"; do
+    for cache_dir in ${cache_dirs[@]:1}; do
-        local flag=${arg%%:*} dest=${arg##*:} src=${arg%:*}
+        chroot_mount "$cache_dir" "$1${cache_dir}" -Br
-        src=${src#*:}
+    done
-        chroot_mount "${src}" "${working_dir}${dest}" "${flag}"
+
+    for m in ${bindmounts_ro[@]}; do
+        chroot_mount "${m%%:*}" "$1${m##*:}" -Br
+    done
+
+    for m in ${bindmounts_rw[@]}; do
+        chroot_mount "${m%%:*}" "$1${m##*:}" -B
+    done
+    
+    for host_mirror in "${host_mirrors[@]}"; do
+        if [[ $host_mirror == *file://* ]]; then
+            host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+            chroot_mount "$host_mirror_path" "$1$host_mirror_path" -Br
+        fi
     done
 }
 
@@ -151,27 +123,21 @@ 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
 
 chroot_api_mount "${working_dir}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"
 
-chroot_extra_mount
+chroot_extra_mount "${working_dir}"
 
-copy_hostconf
+copy_hostconf "${working_dir}"
 
-eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"
+eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
 
-[[ -z $nosetarch ]] || unset CARCH
+${nosetarch} && unset CARCH
 
-if [[ -f "@datadir@/artools/setarch-aliases.d/${CARCH}" ]]; then
+${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
-	read -r set_arch < "@datadir@/artools/setarch-aliases.d/${CARCH}"
-else
-	set_arch="${CARCH}"
-fi
-
-${CARCH:+setarch "${set_arch}"} chroot "${working_dir}" "$@"
 
 ret=$?
 

bin/base/fstabgen.in

@@ -14,214 +14,10 @@
 
 shopt -s extglob
 
-m4_include(lib/base/message.sh)
+. @libdir@/artools/util-base.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)
@@ -249,7 +45,7 @@ write_source() {
         ;;
     esac
 
-    [[ -n "${comment[*]}" ]] && printf '# %s\n' "${comment[*]}"
+    [[ $comment ]] && printf '# %s\n' "${comment[*]}"
 
     if [[ $spec ]]; then
         printf '%-20s' "$bytag=$(mangle "$spec")"
@@ -259,7 +55,7 @@ write_source() {
 }
 
 optstring_apply_quirks() {
-    local varname="$1" fstype="$2"
+    local varname=$1 fstype=$2
 
     # SELinux displays a 'seclabel' option in /proc/self/mountinfo. We can't know
     # if the system we're generating the fstab for has any support for SELinux (as
@@ -282,7 +78,7 @@ optstring_apply_quirks() {
         ;;
         vfat)
             # Before Linux v3.8, "cp" is prepended to the value of the codepage.
-            if optstring_get_option "$varname" codepage && [[ "$codepage" = cp* ]]; then
+            if optstring_get_option "$varname" codepage && [[ $codepage = cp* ]]; then
                 optstring_remove_option "$varname" codepage
                 optstring_append_option "$varname" "codepage=${codepage#cp}"
             fi
@@ -290,8 +86,6 @@ optstring_apply_quirks() {
     esac
 }
 
-#}}}
-
 usage() {
   cat <<EOF
 usage: ${0##*/} [options] root
@@ -364,19 +158,23 @@ while read -r src target fstype opts fsroot; do
         pass=0
     fi
 
-    if [[ $fsroot != / && $fstype != btrfs ]]; then
+    if [[ $fsroot != / ]]; then
-        # it's a bind mount
+        if [[ $fstype = btrfs ]]; then
-        src=$(findmnt -funcevo TARGET "$src")$fsroot
+            opts+=,subvol=${fsroot#/}
-        if [[ $src -ef $target ]]; then
+        else
-            # hrmm, this is weird. we're probably looking at a file or directory
+            # it's a bind mount
-            # that was bound into a chroot from the host machine. Ignore it,
+            src=$(findmnt -funcevo TARGET "$src")$fsroot
-            # because this won't actually be a valid mount. Worst case, the user
+            if [[ $src -ef $target ]]; then
-            # just re-adds it.
+                # hrmm, this is weird. we're probably looking at a file or directory
-            continue
+                # that was bound into a chroot from the host machine. Ignore it,
+                # because this won't actually be a valid mount. Worst case, the user
+                # just re-adds it.
+                continue
+            fi
+            fstype=none
+            opts+=,bind
+            pass=0
         fi
-        fstype=none
-        opts+=,bind
-        pass=0
     fi
 
     # filesystem quirks
@@ -405,7 +203,7 @@ done
 # handle swaps devices
 {
     # ignore header
-    read -r
+    read
 
     while read -r device type _ _ prio; do
         options=defaults
@@ -417,7 +215,7 @@ done
         [[ $device = *'\040(deleted)' ]] && continue
 
         if [[ $type = file ]]; then
-            printf '%-20s' "${device#${root%/}}"
+            printf '%-20s' "$device"
         elif [[ $device = /dev/dm-+([0-9]) ]]; then
             # device mapper doesn't allow characters we need to worry
             # about being mangled, and it does the escaping of dashes

bin/base/mkchroot.in

@@ -12,66 +12,66 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/base/message.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/chroot-version.sh)
 
 working_dir=''
-umode=''
-
 files=()
-chroot_args=()
+
+nosetarch=false
+copy_mirrorlist=true
+basestrap_args=(-Gc)
 
 usage() {
-    printf "Usage: %s [options] working-dir package-list...\n" "${0##*/}"
+    echo "Usage: ${0##*/} [options] working-dir package-list..."
-    printf ' options:\n'
+    echo ' options:'
-    printf '    -U            Use pacman -U to install packages\n'
+    echo '    -C <file>     Location of a pacman config file'
-    printf '    -C <file>     Location of a pacman config file\n'
+    echo '    -M <file>     Location of a makepkg config file'
-    printf '    -M <file>     Location of a makepkg config file\n'
+    echo '    -c <dir>      Set pacman cache'
-    printf '    -c <dir>      Set pacman cache\n'
+    echo '    -f <file>     Copy file from the host to the chroot'
-    printf '    -f <file>     Copy file from the host to the chroot\n'
+    echo '    -m            Do not copy mirrorlist to the chroot'
-    printf '    -s            Do not run setarch\n'
+    echo '    -s            Do not run setarch'
-    printf '    -h            This message\n'
+    echo '    -h            This message'
     exit 1
 }
 
-opts='hUC:M:c:f:s'
+orig_argv=("$0" "$@")
+
+opts='hC:M:c:f:sm'
 
 while getopts ${opts} arg; do
     case "${arg}" in
-        U) umode=U ;;
         C) pacman_conf="$OPTARG" ;;
         M) makepkg_conf="$OPTARG" ;;
         c) cache_dir="$OPTARG" ;;
         f) files+=("$OPTARG") ;;
-        s) nosetarch=1 ;;
+        s) nosetarch=true ;;
+        m) copy_mirrorlist=false; basestrap_args+=(-M) ;;
         h|?) usage ;;
+        *) error "invalid argument '%s'" "$arg"; usage ;;
     esac
-    if [[ $arg != U ]]; then
-        chroot_args+=("-$arg")
-        [[ -v OPTARG ]] && chroot_args+=("$OPTARG")
-    fi
 done
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
 (( $# < 2 )) && die 'You must specify a directory and one or more packages.'
 
 check_root
 
-working_dir="$(readlink -f "$1")"
+working_dir="$(readlink -f $1)"
 shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-if (( ${#cache_dirs[@]} == 0 )); then
+if [[ -z $cache_dir ]]; then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+    cache_dirs=($(pacman -v $cache_conf 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+else
+    cache_dirs=(${cache_dir})
 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"
 
@@ -90,16 +90,26 @@ for f in "${files[@]}"; do
     cp "$f" "$working_dir$f"
 done
 
-basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
+_env=()
-    "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
+while read -r varname; do
+    _env+=("$varname=${!varname}")
+done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
+env -i "${_env[@]}" \
+basestrap "${basestrap_args[@]}" ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
 
+echo "${CHROOTVERSION}" > "$working_dir/.artools"
+
+if [[ ! -f "$working_dir/etc/locale.gen.orig" ]];then
+    mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.orig"
+fi
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
-printf 'LANG=en_US.UTF-8\n' > "$working_dir/etc/locale.conf"
+echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
-# printf 'KEYMAP=en\n' > "$working_dir/etc/vconsole.conf"
-printf "%s\n" "${CHROOTVERSION}" > "$working_dir/.artools"
 
 dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 
+chroot_args=(${pacman_conf:+-C "$pacman_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${cache_dir:+-c "$cache_dir"})
+${nosetarch} && chroot_args+=(${nosetarch:+-s})
+
 exec chroot-run \
     "${chroot_args[@]}" \
     "$working_dir" locale-gen

bin/base/signfile.in

@@ -0,0 +1,35 @@
+#!/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
+
+load_user_info
+
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+file_to_sign="$1"
+
+if [ ! -e "$1" ]; then
+    error "%s does not exist!" "$file_to_sign"
+    exit 1
+fi
+
+if [[ -n "${BUILDBOT_GPGP}" ]]; then
+    msg2 "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}..."
+    gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
+fi

bin/iso/buildiso.in

@@ -12,258 +12,54 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/util-base.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/util-iso.sh)
+. @libdir@/artools/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)
-
-clean_up_chroot(){
-    local path mnt="$1"
-    msg2 "Cleaning [%s]" "${mnt##*/}"
-
-    path=$mnt/boot
-    if [[ -d "$path" ]]; then
-        find "$path" -name 'initramfs*.img' -delete &> /dev/null
-    fi
-    path=$mnt/var/lib/pacman/sync
-    if [[ -d $path ]];then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/cache/pacman/pkg
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/log
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-    path=$mnt/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-    # shellcheck disable=2035
-    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
-    if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
-        rm "$mnt"/boot/grub/grub.cfg
-    fi
-    if [[ -f "$mnt/etc/machine-id" ]]; then
-        rm "$mnt"/etc/machine-id
-    fi
-}
-
-copy_overlay(){
-    local src="$1" dest="$2"
-    if [[ -e "$src" ]];then
-        msg2 "Copying [%s] ..." "${src##*/}"
-        cp -LR "$src"/* "$dest"
-    fi
-}
-
-make_rootfs() {
-    if [[ ! -e "${work_dir}"/rootfs.lock ]]; then
-        msg "Prepare [Base installation] (rootfs)"
-        local rootfs="${work_dir}/rootfs"
-
-        prepare_dir "${rootfs}"
-
-        basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"
-
-        copy_overlay "${root_overlay}" "${rootfs}"
-
-        [[ -z ${live_list} ]] && configure_chroot "${rootfs}"
-
-        clean_up_chroot "${rootfs}"
-
-        : > "${work_dir}"/rootfs.lock
-
-        msg "Done [Base installation] (rootfs)"
-    fi
-}
-
-make_livefs() {
-    if [[ ! -e ${work_dir}/livefs.lock ]]; then
-        msg "Prepare [Live installation] (livefs)"
-        local livefs="${work_dir}/livefs"
-
-        prepare_dir "${livefs}"
-
-        mount_overlayfs "${livefs}" "${work_dir}"
-
-        basestrap "${basestrap_args[@]}" "${livefs}" "${packages[@]}"
-
-        copy_overlay "${live_overlay}" "${livefs}"
-
-        configure_chroot "${livefs}"
-
-        umount_overlayfs
-
-        clean_up_chroot "${livefs}"
-
-        : > "${work_dir}"/livefs.lock
-
-        msg "Done [Live installation] (livefs)"
-    fi
-}
-
-make_bootfs() {
-    if [[ ! -e ${work_dir}/bootfs.lock ]]; then
-        msg "Prepare [/iso/boot]"
-
-        prepare_dir "${iso_root}/boot"
-
-        cp "${work_dir}"/rootfs/boot/vmlinuz* "${iso_root}"/boot/vmlinuz-"${arch}"
-
-        local bootfs="${work_dir}/bootfs"
-
-        mount_overlayfs "${bootfs}" "${work_dir}"
-
-        if "${use_dracut}"; then
-            prepare_initramfs_dracut "${bootfs}"
-        else
-            prepare_initramfs_mkinitcpio "${bootfs}"
-        fi
-
-        umount_overlayfs
-
-        rm -R "${bootfs}"
-        : > "${work_dir}"/bootfs.lock
-        msg "Done [/iso/boot]"
-    fi
-}
-
-make_grub(){
-    if [[ ! -e ${work_dir}/grub.lock ]]; then
-        msg "Prepare [/iso/boot/grub]"
-
-        local layer=${work_dir}/rootfs
-        [[ -n ${live_list} ]] && layer=${work_dir}/livefs
-
-        prepare_grub "${work_dir}/rootfs" "$layer"
-
-        if ${use_dracut}; then
-            configure_grub_dracut
-        else
-            configure_grub_mkinitcpio
-        fi
-
-        : > "${work_dir}"/grub.lock
-        msg "Done [/iso/boot/grub]"
-    fi
-}
-
-gen_iso_fn(){
-    local vars=("artix") name
-    vars+=("${profile}")
-    vars+=("${INITSYS}")
-    case "${repo}" in
-        'gremlins'|'goblins') vars+=("${repo}") ;;
-    esac
-    vars+=("${ISO_VERSION}")
-    vars+=("${arch}")
-    for n in "${vars[@]}"; do
-        name=${name:-}${name:+-}${n}
-    done
-    printf "%s\n" "$name"
-}
 
 prepare_build(){
-    load_profile
+    timer_start=$(get_timer)
 
-    case "${repo}" in
+    load_profile "${PROFILE}"
-        'gremlins'|'goblins') repo="${repo}" ;;
+
-        *) repo=default ;;
+    local pacman_conf pac_file="pacman-default.conf"
+
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') pac_file="pacman-${REPOSITORY}.conf" ;;
     esac
 
-    get_pacman_conf "${repo}"
+    pacman_conf="${DATADIR}/$pac_file"
+    [[ -f ${USERCONFDIR}/artools/$pac_file ]] && pacman_conf="${USERCONFDIR}/artools/$pac_file"
 
     iso_file=$(gen_iso_fn).iso
 
     iso_label="ARTIX_$(date +%Y%m)"
 
-    basestrap_args+=(-C "${pacman_conf}")
+    mkchroot_args+=(-C ${pacman_conf} -m)
-    work_dir=${chroots_iso}/${profile}/artix
+    work_dir=${CHROOTS_ISO}/${PROFILE}/${ARCH}
 
-    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}"
-    mnt_dir=${chroots_iso}/${profile}/mnt
+    prepare_dir "${iso_dir}"
-
+    prepare_dir "${iso_root}"
-    if [[ -n "${GPG_KEY}" ]]; then
-        ${use_dracut} || export_gpg_publickey
-    fi
 }
 
 display_settings(){
     msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
+    msg2 "PROFILE: %s" "${PROFILE}"
     msg2 "INITSYS: %s" "${INITSYS}"
     [[ -n ${GPG_KEY} ]] && msg2 "GPG_KEY: %s" "${GPG_KEY}"
 
     msg "ISO SETTINGS:"
     msg2 "ISO_VERSION: %s" "${ISO_VERSION}"
-    msg2 "COMPRESSION: %s" "${COMPRESSION}"
-    [[ "${COMPRESSION}" == 'zstd' ]] && msg2 "COMPRESSION_LEVEL: %s" "${COMPRESSION_LEVEL}"
 
     msg "BUILD:"
     show_profile
 }
 
-mk_squash(){
-    make_sfs "${work_dir}/rootfs"
-    if [[ -d "${work_dir}/livefs" ]]; then
-        make_sfs "${work_dir}/livefs"
-    fi
-}
-
-mk_iso(){
-    touch "${iso_root}/.artix"
-    msg "Making bootable image"
-    # Sanity checks
-    [[ ! -d "${iso_root}" ]] && return 1
-    if [[ -f "${iso_dir}/${iso_file}" ]]; then
-        msg2 "Removing existing bootable image..."
-        rm -rf "${iso_dir}/${iso_file}"
-    fi
-    assemble_iso
-    chown -R "${owner}:$(id --group "${owner}")" "${iso_dir}"
-}
-
-mk_boot(){
-    run_safe "make_bootfs"
-    run_safe "make_grub"
-}
-
-mk_chroots(){
-    load_pkgs "${root_list}"
-    run_safe "make_rootfs"
-    if [[ -n ${live_list} ]]; then
-        load_pkgs "${live_list}"
-        run_safe "make_livefs"
-    fi
-}
-
 build(){
-    msg "Start building [%s]" "${profile}"
+    msg "Start building [%s]" "${PROFILE}"
     if ${clean_first};then
         for copy in "${work_dir}"/*; do
             [[ -d $copy ]] || continue
@@ -277,112 +73,96 @@ build(){
         lock_close 9
 
         rm -rf --one-file-system "${work_dir}"
-
+        clean_iso_root "${iso_root}"
-        msg "Deleting isoroot [%s] ..." "${iso_root##*/}"
-        rm -rf --one-file-system "${iso_root}"
     fi
 
-    if ${chroot_only}; then
+    if ${iso_only}; then
-        mk_chroots
+        [[ ! -d ${work_dir} ]] && die "Create images: %s -p %s -x" "${cmd}" "${PROFILE}"
-        warning "Continue squash: %s -p %s -sc ..." "${cmd}" "${profile}"
+        compress_images
         exit 1
-    elif ${boot_only}; then
+    fi
-        mk_boot
+    if ${images_only}; then
-        warning "Continue iso: %s -p %s -zc ..." "${cmd}" "${profile}"
+        prepare_images
+        warning "Continue compress: %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
+        prepare_images
-        mk_boot
+        compress_images
-        mk_squash
-        mk_iso
     fi
-    msg "Finished building [%s]" "${profile}"
+    msg "Finished building [%s]" "${PROFILE}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
 clean_first=true
 pretend=false
-chroot_only=false
+images_only=false
 iso_only=false
+log=false
 persist=false
-use_dracut=false
-squash_only=false
-boot_only=false
 
-basestrap_args=(-GMc)
+mkchroot_args=()
 cmd=${0##*/}
 
-repo=${cmd##*-}
+REPOSITORY=${cmd##*-}
-owner=${SUDO_USER:-$USER}
-profile='base'
-chroots_iso="${CHROOTS_DIR}/buildiso"
-arch=$(uname -m)
 
 usage() {
-    printf 'Usage: %s [options]\n' "${cmd}"
+    echo "Usage: ${cmd} [options]"
-    printf '    -p <profile>       Profile [default: %s]\n' "${profile}"
+    echo "    -p <profile>       Profile [default: ${PROFILE}]"
-    printf '    -r <dir>           Chroots directory\n'
+    echo '    -r <dir>           Chroots directory'
-    printf '                       [default: %s]\n' "${chroots_iso}"
+    echo "                       [default: ${CHROOTS_ISO}]"
-    printf '    -t <dir>           Target directory\n'
+    echo '    -t <dir>           Target directory'
-    printf '                       [default: %s]\n' "${ISO_POOL}"
+    echo "                       [default: ${ISO_POOL}]"
-    printf '    -i <name>          Init system to use\n'
+    echo '    -i <name>          Init system to use'
-    printf '                       [default: %s]\n' "${INITSYS}"
+    echo "                       [default: ${INITSYS}]"
-    printf '    -g <key>           The gpg key for img signing\n'
+    echo '    -g <key>           The gpg key for sfs signing'
-    printf '                       [default: none]\n'
+    echo "                       [default: ${GPG_KEY}]"
-    printf '    -m                 Set SquashFS image mode to persistence\n'
+    echo '    -m                 Set SquashFS image mode to persistence'
-    printf '    -c                 Disable clean work dir\n'
+    echo '    -c                 Disable clean work dir'
-    printf '    -x                 Build chroot only\n'
+    echo '    -x                 Build images only'
-    printf '    -s                 Squash chroot only\n'
+    echo '    -z                 Generate iso only'
-    printf '    -b                 Generate iso boot only\n'
+    echo '                       Requires pre built images (-x)'
-    printf '    -z                 Generate iso only\n'
+    echo '    -l                 Log to file'
-    printf '                       Requires pre built images (-x)\n'
+    echo '    -q                 Query settings and pretend build'
-    printf '    -d                 Use dracut instead of mkinitcpio for iso initramfs\n'
+    echo '    -h                 This help'
-    printf '    -q                 Query settings and pretend build\n'
+    echo ''
-    printf '    -h                 This help\n'
+    echo ''
-    printf '\n'
+    exit $1
-    printf '\n'
-    exit "$1"
 }
 
-opts='p:r:t:i:g:czsbxmdqh'
+orig_argv=("$0" "$@")
+
+opts='p:r:t:i:g:czxmlqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) profile="$OPTARG" ;;
+        p) PROFILE="$OPTARG" ;;
-        r) chroots_iso="$OPTARG" ;;
+        r) CHROOTS_ISO="$OPTARG" ;;
         t) ISO_POOL="$OPTARG" ;;
         i) INITSYS="$OPTARG" ;;
         g) GPG_KEY="$OPTARG" ;;
         c) clean_first=false ;;
-        x) chroot_only=true ;;
+        x) images_only=true ;;
         z) iso_only=true ;;
-        s) squash_only=true ;;
-        b) boot_only=true ;;
         m) persist=true ;;
-        d) use_dracut=true ;;
+        l) log=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
+
+check_root
+
+prepare_traps
 
 prepare_build
 
 ${pretend} && display_settings && exit 1
 
-check_root
-
-prepare_dir "${mnt_dir}"
-prepare_dir "${iso_dir}"
-prepare_dir "${iso_root}"
-
-prepare_traps
-
 build

bin/iso/deployiso.in

@@ -0,0 +1,75 @@
+#!/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
+
+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}"
+}
+
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
+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,114 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-20 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-
-#{{{ functions
-
-batch_move() {
-    local name="${1:-pkg_moves}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local src=${entry%:*}
-        src=${src#*:}
-        local dest=${entry%%:*}
-        if ${runlist}; then
-            "${dest}"pkg -s "${src}" -u -p "${pkg}"
-        else
-            msg "%s" "${dest}pkg -s ${src} -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_create() {
-    local name="${1:-pkg_create}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local group=${entry%:*}
-        group=${group#*:}
-        local team=${entry%%:*}
-        if ${runlist}; then
-            buildtree -n -p "${pkg}" -t "${team}" -g "${group}"
-            buildtree -i -p "${pkg}"
-            commitpkg -p "${pkg}"
-        else
-            msg "%s" "buildtree -n -p ${pkg} -t ${team} -g ${group}"
-            msg2 "%s" "buildtree -i -p ${pkg}"
-            msg2 "%s" "commitpkg -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_update() {
-    local name="${1:-pkg_upgrades}"
-    local pkglist=${TREE_DIR_ARTIX}/$name.list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry#*:}
-        local dest=${entry%:*}
-        if ${runlist}; then
-            buildtree -i -p "${pkg}"
-            "${dest}"pkg -u -p "${pkg}"
-        else
-            msg "buildtree -i -p ${pkg}"
-            msg2 "${dest}pkg -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-#}}}
-
-usage() {
-    printf 'Usage: %s [optional listname]\n' "${0##*/}"
-    printf '    -r                 Run generated commands\n'
-    printf '    -c                 Create subrepos from list\n'
-    printf '    -u                 Update subrepos from list\n'
-    printf '    -h                 This help\n'
-    printf '\n'
-    printf '\n'
-    exit "$1"
-}
-
-runlist=false
-create=false
-update=false
-
-opts='rcuh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) runlist=true ;;
-        c) create=true ;;
-        u) update=true ;;
-        h|?) usage 0 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-listname="$1"; shift
-
-if ${create}; then
-    batch_create "${listname}"
-elif ${update}; then
-    batch_update "${listname}"
-else
-    batch_move "${listname}"
-fi

bin/pkg/buildpkg.in

@@ -12,79 +12,65 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/util-base.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/base/message.sh)
+. @libdir@/artools/util-pkg.sh
-m4_include(lib/base/common.sh)
+
-m4_include(lib/base/chroot.sh)
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
 create_first=false
-rebuild=false
 
 mkchrootpkg_args=(-c -n)
 
 cmd=${0##*/}
 repo=${cmd#*-}
 base_devel=('base-devel')
-chroots_pkg="${CHROOTS_DIR}/buildpkg"
+
-arch=$(uname -m)
+case ${repo} in
+    system|world|galaxy) repo='default' ;;
+    lib32*) base_devel+=('multilib-devel') ;;
+    galaxy-gremlins|galaxy-goblins) repo=${repo#*-} ;;
+esac
+
+pacman_conf="${DATADIR}/pacman-${repo}.conf"
+[[ -f ${USERCONFDIR}/artools/pacman-${repo}.conf ]] && pacman_conf="${USERCONFDIR}/artools/pacman-${repo}.conf"
+
+makepkg_conf="${DATADIR}/makepkg.conf"
+[[ -f ${USERCONFDIR}/artools/makepkg.conf ]] && makepkg_conf="${USERCONFDIR}/artools/makepkg.conf"
 
 usage() {
-    printf 'Usage: %s [options] -- [mkchrootpkg_args]\n' "${0##*/}"
+    echo "Usage: ${0##*/} [options] -- [mkchrootpkg_args]"
-    printf '    -r <dir>           Create chroots in this directory\n'
+    echo "    -r <dir>           Create chroots in this directory"
-    printf '    -d <dir>           Destination repo chroot\n'
+    echo '    -c                 Recreate the chroot before building'
-    printf '    -c                 Recreate the chroot before building\n'
+    echo '    -h                 This help'
-    printf '    -m                 Major rebuild\n'
+    echo ''
-    printf '    -N                 Disable check() function\n'
+    echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
-    printf '    -C                 Run checkpkg after built\n'
+    echo ''
-    printf '    -h                 This help\n'
+    exit $1
-    printf '\n'
-    printf 'Default mkchrootpkg_args args: %s\n' "${mkchrootpkg_args[*]}"
-    printf '\n'
-    exit "$1"
 }
 
-opts='hcCNmr:d:'
+orig_argv=("$0" "$@")
+
+opts='hcr:'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        r) chroots_pkg="$OPTARG" ;;
+        r) CHROOTS_PKG="$OPTARG" ;;
-        d) repo="$OPTARG" ;;
         c) create_first=true ;;
-        m) rebuild=true ;;
-        C) mkchrootpkg_args+=(-C) ;;
-        N) mkchrootpkg_args+=(-N) ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
     esac
 done
 
-if ${rebuild};then
+check_root SOURCE_DATE_EPOCH
-    repo='default'
-else
-    case ${repo} in
-        system|world|galaxy) repo='default' ;;
-        lib32*) base_devel+=('multilib-devel') ;;
-        galaxy-gremlins|galaxy-goblins) repo=${repo#*-} ;;
-    esac
-fi
-
-get_pacman_conf "${repo}"
-
-get_makepkg_conf
-
-if [[ -f "${DATADIR}/setarch-aliases.d/${arch}" ]]; then
-	read -r set_arch < "${DATADIR}/setarch-aliases.d/${arch}"
-else
-	set_arch="${arch}"
-fi
-
-check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
 
 mkchrootpkg_args+=("${@:$OPTIND}")
 
-if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then
+if ${create_first} || [[ ! -d "${CHROOTS_PKG}/${repo}-${ARCH}" ]];then
-    msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}"
+    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}")"
 
@@ -95,20 +81,20 @@ if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then
     done
     lock_close 9
 
-    rm -rf --one-file-system "${chroots_pkg}/${repo}-${arch}"
+    rm -rf --one-file-system "${CHROOTS_PKG}/${repo}-${ARCH}"
-    (umask 0022; mkdir -p "${chroots_pkg}/${repo}-${arch}")
+    mkdir -p "${CHROOTS_PKG}/${repo}-${ARCH}"
-    setarch "${set_arch}" mkchroot \
+    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
+        pacman -Syu --noconfirm || abort
 fi
 
 # Always build official packages reproducibly
@@ -116,5 +102,9 @@ if [[ ! -v SOURCE_DATE_EPOCH ]]; then
     export SOURCE_DATE_EPOCH=$(date +%s)
 fi
 
-msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
+timer_start=$(get_timer)
-exec mkchrootpkg -r "${chroots_pkg}/${repo}-${arch}" "${mkchrootpkg_args[@]}"
+
+msg "Building in chroot for [%s] (%s)..." "${repo}" "${ARCH}"
+exec mkchrootpkg -r "${CHROOTS_PKG}/${repo}-${ARCH}" "${mkchrootpkg_args[@]}"
+
+show_elapsed_time "${FUNCNAME}" "${timer_start}"

bin/pkg/buildtree.in

@@ -12,237 +12,125 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/util-base.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/util-pkg.sh)
+. @libdir@/artools/util-pkg.sh
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/common.sh)
-m4_include(lib/pkg/git.sh)
-m4_include(lib/pkg/gitea.sh)
-m4_include(lib/pkg/repo.sh)
-m4_include(lib/pkg/jenkins.sh)
 
-#{{{ new git repo
+pull_tree_arch(){
-
+    cd ${TREE_DIR_ARCH}
-subrepo_new(){
+    for tree in ${TREE_NAMES_ARCH[@]};do
-    cd "${TREE_DIR_ARTIX}/${group}" || return
+        if [[ -d ${tree} ]];then
-
+            cd ${tree}
-    local org gitname
+            pull_tree "${tree}" "$(get_local_head)" "Arch"
-    org=$(get_pkg_org "${package}")
+            cd ..
-    gitname=$(get_compliant_name "${package}")
-
-    gitearepo -cr "$gitname"
-
-    add_team_to_repo "$gitname" "$org" "${team}"
-
-    msg2 "Subrepo clone [%s] from (%s)" "${package}" "$org/$gitname"
-    git subrepo clone "${GIT_SSH}":"$org/$gitname".git "${package}"
-
-    prepare_dir "${TREE_DIR_ARTIX}/${group}/${package}/trunk"
-
-    commit_jenkins_files "${package}"
-}
-
-#}}}
-
-#{{{ pull
-
-config_tree() {
-    local dist="$1" vars="${2:-false}"
-    case "$dist" in
-        Artix)
-            if "$vars"; then
-                dist_tree=("${ARTIX_TREE[@]}")
-                dist_url="${GIT_SSH}:artixlinux"
-                dist_dir=${TREE_DIR_ARTIX}
-            else
-                git config --bool pull.rebase true
-                git config commit.gpgsign true
-                if [[ -n "${GPGKEY}" ]];then
-                    git config user.signingkey "${GPGKEY}"
-                else
-                    warning "No GPGKEY configured in makepkg.conf!"
-                fi
-            fi
-        ;;
-        Arch)
-            if "$vars"; then
-                dist_tree=("${ARCH_TREE[@]}")
-                dist_url="${HOST_TREE_ARCH}"
-                dist_dir=${TREE_DIR_ARCH}
-            else
-                git config --bool pull.rebase false
-                git config branch.master.mergeoptions --no-edit
-            fi
-        ;;
-    esac
-}
-
-update_tree() {
-    local dist="${1:-Artix}"
-    config_tree "$dist" true
-    cd "$dist_dir" || return
-    for tree in "${dist_tree[@]}"; do
-        if [[ -d "$tree" ]]; then
-            ( cd "$tree" || return
-                config_tree "$dist"
-                msg "Checking (%s) (%s)" "$tree" "$dist"
-                pull_tree "$tree" "$(get_local_head)"
-            )
         else
-            msg "Cloning (%s) (%s) ..." "$tree" "$dist"
+            clone_tree "${HOST_TREE_ARCH}" "${tree}" "Arch"
-            git clone "$dist_url/$tree".git
-            ( cd "$tree" || return
-                config_tree "$dist"
-            )
         fi
     done
 }
 
-#}}}
+pull_tree_artix(){
-
+    cd ${TREE_DIR_ARTIX}
-#{{{ patch
+    for tree in ${TREE_NAMES_ARTIX[@]};do
-
+        if [[ -d ${tree} ]];then
-patch_pkg(){
+            config_tree "${tree}"
-    local pkgpath="$1"
+            cd ${tree}
-    local pkg=${pkgpath%/*}
+            pull_tree "${tree}" "$(get_local_head)"
-    pkg=${pkg##*/}
+            cd ..
-    sed -e 's|arch-meson|artix-meson|' -i "$pkgpath"/PKGBUILD
+        else
-    case $pkg in
+            clone_tree "${HOST_TREE_ARTIX}" "${tree}"
-        glibc)
+            config_tree "${tree}"
-            msg2 "Patching %s" "$pkg"
+        fi
-            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+    done
-                -e '/nscd.service/d' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-        linux|linux-lts)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "$pkgpath"/PKGBUILD
-            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i "$pkgpath"/config
-        ;;
-        bash)
-            msg2 "Patching %s" "$pkg"
-            # shellcheck disable=2016
-            sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
-            -e "s|etc/bash.|etc/bash/|g" \
-            -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
-            -i "$pkgpath"/PKGBUILD
-            ( cd "$pkgpath" || return
-                patch -Np 1 -i "${DATADIR}"/patches/artix-bash.patch
-                updpkgsums
-            )
-        ;;
-        gstreamer|gst-plugins-*|licenses)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
-                -e 's|(Arch Linux)|(Artix Linux)|' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-    esac
 }
 
-#}}}
-
-#{{{ pkgbuild import
-
 sync_pkg(){
     local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
     local src="$1" dest="$2"
-    msg "Sync from Arch [%s] to Artix [%s]" "${src##*archlinux/}" "${dest##*artixlinux/}"
+
-    rsync "${rsync_args[@]}" "$src"/ "$dest"/
+    rsync "${rsync_args[@]}" $src/ $dest/
 }
 
 show_deps(){
-    local src="$1" archver
+    local src="$1" repo="$2"
 
-    # shellcheck disable=1090
+    . $src/PKGBUILD 2>/dev/null
-    . "$src"/PKGBUILD 2>/dev/null
 
-    archver=$(get_full_version)
+    [[ $arch == 'any' ]] && CARCH=any
 
-    # shellcheck disable=2154
+    local archver=$(get_full_version $pkg)
+
+    msg2 "repo: %s" "$repo"
     [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
-    # shellcheck disable=2154
     msg2 "pkgname: %s" "${pkgname[*]}"
-    # shellcheck disable=2154
+    [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
-    [[ -n "${pkgdesc}" ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
-    # shellcheck disable=2154
     msg2 "Arch Version: %s" "$archver"
-    # shellcheck disable=2154
+    msg2 "arch: %s" "$CARCH"
-    msg2 "arch: %s" "$arch"
+
-    # shellcheck disable=2154
+    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
-    [[ -n ${makedepends[*]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
-    # shellcheck disable=2154
+    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
-    [[ -n ${checkdepends[*]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
-    # shellcheck disable=2154
-    [[ -n ${depends[*]} ]] && msg2 "depends: %s" "${depends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${optdepends[*]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
 }
 
 from_arch(){
-    cd "${TREE_DIR_ARTIX}" || return
+    local pkg="$1" src= dest=
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
 
-    local srcpath repo archpath artixpath
+    local package=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
-    srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
+    local repo=$(find_repo "$package")
-    [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${package}"
 
-    repo=$(find_repo "$srcpath")
+    src=$package/repos/$repo
-    msg "repo: %s" "${repo#*/}"
 
-    archpath=$srcpath/$repo
+    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "$pkg")
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
+    local tree_dir=$(get_artix_tree "$pkg" "$git_tree_artix" "$git_tree_arch")
 
-    show_deps "$archpath"
+    dest=${TREE_DIR_ARTIX}/$tree_dir/$pkg/trunk
 
-    if [[ -f "$artixpath"/.gitrepo ]]; then
+    msg "tree: %s" "$tree_dir"
-        artixpath="$artixpath"/trunk
+    show_deps "$src" "$repo"
 
-        if [[ -d "$artixpath" ]];then
+    if [[ -d $dest ]];then
-            sync_pkg "$archpath" "$artixpath"
+
-            patch_pkg "$artixpath"
+        cd ${TREE_DIR_ARTIX}/$git_tree_artix
-        fi
+
+        . $dest/PKGBUILD 2>/dev/null
+        local artixver=$(get_full_version $pkg)
+
+        msg2 "Artix Version: %s" "$artixver"
     else
-        die "Package '%s' does not exist!" "${package}"
+        subrepo_new "$pkg" "$tree_dir" "$git_tree_arch"
     fi
-}
 
-#}}}
+    msg "Sync (%s) from [%s] to [%s]" "$pkg" "$git_tree_arch" "$tree_dir"
+
+    sync_pkg "$src" "$dest"
+    patch_pkg "$pkg"
+}
 
 view_build(){
-    local archpath repo
+    local pkg="$1" src=
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${package}"
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
-    repo=$(find_repo "${archpath}")
-    archpath=$archpath/$repo
-    msg "repo: %s" "${repo#*/}"
-    show_deps "$archpath"
-}
 
-check_tree(){
+    local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
-    local archpath artixpath group
+    local repo=$(find_repo "$pkg_path")
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${package}"
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
-    group=${artixpath%/*}
-    msg "group: %s" "${group##*/}"
 
-    [[ -z $artixpath ]] && msg2 "exists: %s" "no"
+    src=$pkg_path/repos/$repo
-    [[ -n $artixpath ]] && msg2 "exists: %s" "yes"
+
+    show_deps "$src" "$repo"
 }
 
 sync_repos(){
-    ${sync_arch} && update_tree "Arch"
+    ${sync_arch} && pull_tree_arch
-    ${sync_artix} && update_tree
+    ${sync_artix} && pull_tree_artix
 }
 
-load_makepkg_config
+load_user_info
 
-load_valid_names
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-testing=true
+load_vars /etc/makepkg.conf
-staging=true
-unstable=false
 
 sync=false
 sync_arch=true
@@ -250,68 +138,61 @@ sync_artix=true
 import=false
 view=false
 createnew=false
-check=false
+conf=false
 
-package=''
+PACKAGE=''
 
-team='community'
+TEAM=${TREE_NAMES_ARTIX[0]}
-group="${ARTIX_TREE[0]}"
+GROUP=${TREE_NAMES_ARTIX[0]}
 
 usage() {
-    printf "Usage: %s [options]\n" "${0##*/}"
+    echo "Usage: ${0##*/} [options]"
-    printf '    -p <pkg>      Package name\n'
+    echo '    -p <pkg>      Package name'
-    printf '    -t <team>     Team name (only with -n)\n'
+    echo '    -t <team>     Team name (only with -n)'
-    printf '                  Possible values: core,extra,community,multilib\n'
+    echo "                  [default: ${TEAM}]"
-    printf "                  [default: %s]\n" "${team}"
+    echo '    -g <group>    Group name, the superrepo (only with -n)'
-    printf '    -g <group>    Group name, the superrepo (only with -n)\n'
+    echo "                  [default: ${GROUP}]"
-    printf "                  [default: %s]\n" "${group}"
+    echo "    -s            Clone or pull repos"
-    printf "    -s            Clone or pull repos\n"
+    echo "    -z            Don't clone or pull arch repos"
-    printf "    -a            Don't clone or pull arch repos\n"
+    echo "    -y            Don't clone or pull artix repos"
-    printf "    -b            Don't clone or pull artix repos\n"
+    echo '    -i            Import a package from arch repos'
-    printf '    -i            Import a package from arch repos\n'
+    echo '    -n            Make new remote subrepo and clone it'
-    printf '    -n            New remote subrepo and clone it\n'
+    echo '    -v            View package depends'
-    printf '    -v            Check if a package is in the artix tree(s)\n'
+    echo '    -h            This help'
-    printf '    -c            View package depends\n'
+    echo ''
-    printf '    -x            Exclude testing (only with -i)\n'
+    echo ''
-    printf '    -y            Exclude staging (only with -i)\n'
+    exit $1
-    printf '    -z            Include kde & gnome unstable (only with -i)\n'
-    printf '    -h            This help\n'
-    printf '\n'
-    printf '\n'
-    exit "$1"
 }
 
-opts='p:t:g:sinabcvxyzh'
+orig_argv=("$0" "$@")
+
+opts='p:t:g:sinzyvh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) package="$OPTARG" ;;
+        p) PACKAGE="$OPTARG" ;;
-        t) team="$OPTARG" ;;
+        t) TEAM="$OPTARG" ;;
-        g) group="$OPTARG" ;;
+        g) GROUP="$OPTARG" ;;
         s) sync=true ;;
-        a) sync_arch=false ;;
+        z) sync_arch=false ;;
-        b) sync_artix=false ;;
+        y) sync_artix=false ;;
         i) import=true ;;
         n) createnew=true ;;
-        c) check=true ;;
         v) view=true ;;
-        x) testing=false ;;
-        y) staging=false ;;
-        z) unstable=true ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
-set_arch_repos "$testing" "$staging" "$unstable"
+prepare_dir "${TREE_DIR_ARTIX}"
+prepare_dir "${TREE_DIR_ARCH}"
 
 ${sync} && sync_repos
 
-${view} && view_build
+${view} && view_build "${PACKAGE}"
 
-${check} && check_tree
+${import} && from_arch "${PACKAGE}"
 
-${import} && from_arch
+${createnew} && subrepo_new "${PACKAGE}" "${GROUP}" "${TEAM}"
-
-${createnew} && subrepo_new

bin/pkg/checkpkg.in

@@ -1,206 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/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
-        [[ $1 = "$2" ]]
-    else
-        # otherwise, trim any pkgrel and compare the bare version.
-        [[ ${1%%-*} = "${2%%-*}" ]]
-    fi
-}
-
-find_cached_package() {
-    local searchdirs=("$PKGDEST" "$PWD") results=()
-    local targetname=$1 targetver=$2 targetarch=$3
-    local dir pkg pkgbasename name ver rel arch r results
-
-    for dir in "${searchdirs[@]}"; do
-        [[ -d $dir ]] || continue
-
-        for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
-            [[ -f $pkg ]] || continue
-
-            # avoid adding duplicates of the same inode
-            for r in "${results[@]}"; do
-                [[ $r -ef $pkg ]] && continue 2
-            done
-
-            # split apart package filename into parts
-            pkgbasename=${pkg##*/}
-            pkgbasename=${pkgbasename%.pkg.tar*}
-
-            arch=${pkgbasename##*-}
-            pkgbasename=${pkgbasename%-"$arch"}
-
-            rel=${pkgbasename##*-}
-            pkgbasename=${pkgbasename%-"$rel"}
-
-            ver=${pkgbasename##*-}
-            name=${pkgbasename%-"$ver"}
-
-            if [[ $targetname = "$name" && $targetarch = "$arch" ]] &&
-                pkgver_equal "$targetver" "$ver-$rel"; then
-                results+=("$pkg")
-            fi
-        done
-    done
-
-    case ${#results[*]} in
-        0)
-            return 1
-        ;;
-        1)
-            printf '%s\n' "${results[0]}"
-            return 0
-        ;;
-        *)
-            error 'Multiple packages found:'
-            printf '\t%s\n' "${results[@]}" >&2
-            return 1
-        ;;
-    esac
-}
-
-#}}}
-
-usage() {
-    cat <<- _EOF_
-        Usage: ${BASH_SOURCE[0]##*/} [OPTIONS]
-
-        Searches for a locally built package corresponding to the PKGBUILD, and
-        downloads the last version of that package from the Pacman repositories.
-        It then compares the list of .so files provided by each version of the
-        package and outputs if there are soname differences for the new package.
-        A directory is also created using mktemp with files containing a file
-        list for both packages and a library list for both packages.
-
-        OPTIONS
-            -r, --rmdir     Remove the temporary directory
-            -w, --warn      Print a warning in case of differences
-            -h, --help      Show this help text
-_EOF_
-}
-
-RMDIR=0
-WARN=0
-
-OPT_SHORT='rwh'
-OPT_LONG=('rmdir' 'warn' 'help')
-if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
-    exit 1
-fi
-set  -- "${OPTRET[@]}"
-
-while :; do
-    case $1 in
-        -r|--rmdir)
-            RMDIR=1
-            ;;
-        -w|--warn)
-            WARN=1
-            ;;
-        -h|--help)
-            usage
-            exit 0
-            ;;
-        --)
-            shift; break
-            ;;
-    esac
-    shift
-done
-
-if [[ ! -f PKGBUILD ]]; then
-    die 'This must be run in the directory of a built package.'
-fi
-
-# shellcheck source=PKGBUILD.proto
-. ./PKGBUILD
-if [[ ${arch[0]} == 'any' ]]; then
-    CARCH='any'
-fi
-
-STARTDIR=$(pwd)
-(( RMDIR )) && trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
-
-for _pkgname in "${pkgname[@]}"; do
-    comparepkg=$_pkgname
-    pkgurl=
-    target_pkgver=$(get_full_version "$_pkgname")
-    if ! pkgfile=$(find_cached_package "$_pkgname" "$target_pkgver" "$CARCH"); then
-        die 'tarball not found for package: %s' "${_pkgname}-$target_pkgver"
-    fi
-
-    ln -s "$pkgfile" "$TEMPDIR"
-
-    if (( $# )); then
-        case $1 in
-            /*|*/*)
-                pkgurl=file://$(readlink -m "$1") ;;
-            *.pkg.tar*)
-                pkgurl=$1 ;;
-            '')
-                ;;
-            *)
-                comparepkg=$1 ;;
-        esac
-        shift
-    fi
-    [[ -n $pkgurl ]] || pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$comparepkg") ||
-        die "Couldn't download previous package for %s." "$comparepkg"
-
-    oldpkg=${pkgurl##*/}
-
-    if [[ ${oldpkg} = "${pkgfile##*/}" ]]; then
-        die "The built package (%s) is the one in the repo right now!" "$_pkgname"
-    fi
-
-    if [[ $pkgurl = file://* || ( $pkgurl = /* && -f $pkgurl ) ]]; then
-        ln -s "${pkgurl#file://}" "$TEMPDIR/$oldpkg"
-    elif [[ -f "$PKGDEST/$oldpkg" ]]; then
-        ln -s "$PKGDEST/$oldpkg" "$TEMPDIR/$oldpkg"
-    elif [[ -f "$STARTDIR/$oldpkg" ]]; then
-        ln -s "$STARTDIR/$oldpkg" "$TEMPDIR/$oldpkg"
-    else
-        curl -fsLC - --retry 3 --retry-delay 3 -o "$TEMPDIR/$oldpkg" "$pkgurl"
-    fi
-
-    bsdtar tf "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old"
-    bsdtar tf "$pkgfile" | sort > "$TEMPDIR/filelist-$_pkgname"
-
-    sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname"
-
-    find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old"
-    find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"
-    if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
-        message="Sonames differ in $_pkgname!"
-        (( WARN )) && warning "$message" || msg "$message"
-        printf "%s\n" "$diff_output"
-    else
-        msg "No soname differences for %s." "$_pkgname"
-    fi
-done
-
-(( RMDIR )) || msg "Files saved to %s" "$TEMPDIR"

bin/pkg/checkrepo.in

@@ -1,250 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/repo.sh)
-m4_include(lib/pkg/table.sh)
-
-#{{{ db libs
-
-extract_db() {
-    local u="$1" cdir="$2"
-    rm -rf "$cdir"
-    mkdir -p "$cdir"
-    msg2 "%s" "${cdir##*/}"
-    curl -L -s "$u" | bsdtar -xf - -C "$cdir"
-}
-
-update_db_cache(){
-    msg "Updating database cache ..."
-    local cachedir url
-    for repo in "${searchrepos[@]}"; do
-        cachedir=${db_cache_dir}/linksdb/$repo
-        url=${REPOS_MIRROR}/$repo/os/${CARCH}/$repo.${linksdb_ext}
-        extract_db "$url" "$cachedir"
-    done
-    msg "Done"
-}
-
-#}}}
-
-#{{{ sogrep
-
-query_db() {
-    for repo in "${searchrepos[@]}"; do
-        local db
-        db=${db_cache_dir}/linksdb/$repo/
-        if [[ -d ${db} ]]; then
-            while read -rd '' pkg; do
-                read -r match
-                pkg=${pkg#${db}}
-                pkg="${pkg%/*}"
-                msg_row "${tableQ}" "$repo" "$pkg" "${match}"
-            done < <(grep -rZ "$library" "$db") | sort -u
-        fi
-    done
-}
-
-#}}}
-
-#{{{ check db
-
-is_db_entry() {
-    local pkgname="$1" repo="${REPOS[$2]}" entry
-    entry=${db_cache_dir}/linksdb/$repo/$pkgname
-
-    if [[ -d "$entry" ]];then
-        return 0
-    fi
-    return 1
-}
-
-check_db(){
-    local pkgpath="${1}"
-
-    for repo in "${!REPOS[@]}"; do
-
-        local pkgbuild artixver
-        if [[ -f $pkgpath/$repo/PKGBUILD ]]; then
-            pkgbuild=$pkgpath/$repo/PKGBUILD
-
-            # shellcheck disable=1090
-            . "$pkgbuild" 2>/dev/null
-            artixver=$(get_full_version)
-            for name in "${pkgname[@]}"; do
-                if ! is_db_entry "$name-$artixver" "$repo"; then
-                    msg_row_red "${tableU}" "$repo" "$name" "$artixver" "false"
-                else
-                    ${all_db} && msg_row "${tableU}" "$repo" "$name" "$artixver" "true"
-                fi
-            done
-            unset artixver pkgbuild pkgver epoch pkgname pkgbase
-        fi
-    done
-}
-
-#}}}
-
-# {{{ check obsolete
-
-show_obsolete_table() {
-    local arch_mirror='https://mirror.f4st.host/archlinux'
-
-    local arch_repo artix_repo artix_db arch_db url
-    arch_repo="${searchrepos[@]}"
-    artix_repo="${REPOS[$arch_repo]}"
-
-    artix_db="${db_cache_dir}/artixdb/${artix_repo}"
-    arch_db="${db_cache_dir}/archdb/${arch_repo}"
-
-    msg "Updating database cache ..."
-    url=${REPOS_MIRROR}/${artix_repo}/os/$CARCH/${artix_repo}.${db_ext}
-    extract_db "$url" "${artix_db}"
-
-    url=${arch_mirror}/${arch_repo}/os/$CARCH/${arch_repo}.${db_ext}
-    extract_db "$url" "${arch_db}"
-    msg "Done"
-
-    msg_table_header "${tableQ}" "Repo" "Package" "Obsolete"
-    for p in "${artix_db}"/*; do
-        local pkg rel
-        pkg=${p##*/}
-        rel=${pkg##*-}
-        rel=${rel%.*}
-        pkg=${pkg%-*}
-        local p="$pkg-$rel"
-
-        if [[ "$p" != *openrc* ]] && [[ "$p" != *runit* ]] \
-        && [[ "$p" != *s6* ]] && [[ "$p" != *suite66* ]] \
-        && [[ "$p" != *udev* ]] && [[ "$p" != *elogind* ]] \
-        && [[ "$p" != *sysusers* ]] && [[ "$p" != *tmpfiles* ]] \
-        && [[ "$p" != *execline* ]] && [[ "$p" != *skalibs* ]] \
-        && [[ "$p" != *netifrc* ]] && [[ "$p" != *bootlogd* ]] \
-        && [[ "$p" != *pam_rundir* ]] && [[ "$p" != *artools* ]] \
-        && [[ "$p" != *archlinux* ]] && [[ "$p" != *iso-profiles* ]] \
-        && [[ "$p" != *calamares* ]] && [[ "$p" != *iso-initcpio* ]] \
-        && [[ "$p" != *dinit* ]] && [[ "$p" != *artix* ]] && [[ "$p" != *blocaled* ]]; then
-            if [[ ! -d "${arch_db}/$p" ]]; then
-                msg_row "${tableQ}" "${artix_repo}" "$p" "true"
-            fi
-        fi
-    done
-}
-
-#}}}
-
-show_lib_table() {
-    msg_table_header "${tableQ}" "Repo" "Package" "Library"
-    query_db
-}
-
-show_db_table(){
-    msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
-    tree_loop check_db
-}
-
-db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
-
-linksdb_ext="links.tar.${DBEXT}"
-db_ext="db.tar.${DBEXT}"
-
-load_makepkg_config
-
-sync=false
-check=false
-query=false
-all_db=false
-obsolete=false
-
-readonly tableU="%-20s %-35s %-30s %-10s"
-readonly tableQ="%-20s %-55s %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() {
-    printf "Usage: %s [options] (with -q [libname])\n" "${0##*/}"
-    printf '    -r <repo>     Repo name to query\n'
-    printf '                  [default: all]\n'
-    printf "    -s            Sync repo databases\n"
-    printf '    -c            Check repos\n'
-    printf '    -a            Show repo db (-c)\n'
-    printf '    -o            Check for obsolete packages\n'
-    printf "    -q            Query repo databases for so libs\n"
-    printf '    -h            This help\n'
-    printf '\n'
-    printf '\n'
-    exit "$1"
-}
-
-opts='r:qcsaoh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) searchrepos=("$OPTARG") ;;
-        s) sync=true ;;
-        c) check=true ;;
-        a) all_db=true ;;
-        q) query=true ;;
-        o) obsolete=true ;;
-        h|?) usage 0 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-library="$1"; shift
-
-${sync} && update_db_cache
-
-${check} && show_db_table
-
-${query} && show_lib_table
-
-${obsolete} && show_obsolete_table

bin/pkg/commitpkg.in

@@ -12,221 +12,166 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/util-base.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/util-pkg.sh)
+. @libdir@/artools/util-pkg.sh
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/common.sh)
-m4_include(lib/pkg/git.sh)
-m4_include(lib/pkg/gitea.sh)
-m4_include(lib/pkg/repo.sh)
 
-#{{{ functions
+commit_pkg(){
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    if [[ -n ${git_tree} ]];then
 
-push_tree(){
+        cd ${TREE_DIR_ARTIX}/${git_tree}
-    local tree="$1"
-    msg "Update (%s)" "${tree}"
-    git push origin master
-}
 
-subrepo_push(){
+        local head=$(get_local_head)
-    local pkg="$1"
-    msg2 "Subrepo push (%s)" "$pkg"
-    git subrepo push "$pkg" || die "%s push failed" "$pkg"
-}
 
-subrepo_clean(){
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
-    local pkg="$1"
-    msg2 "Subrepo clean (%s)" "$pkg"
-    git subrepo clean "$pkg"
-}
 
-subrepo_pull(){
+        . trunk/PKGBUILD
-    local pkg="$1"
+        [[ $arch == 'any' ]] && CARCH=any
-    msg2 "Subrepo pull (%s)" "$pkg"
+        local ver=$(get_full_version "${PACKAGE}")
-    git subrepo pull "$pkg"
+        local commit_msg=""
-}
 
-check_rebuild(){
+        if ${remove};then
-    if [[ -d "$CARCH"/"${valid_names[10]}" ]] \
+            local action='remove'
-    && [[ "${repo_dest}" == "${valid_names[7]}" ]]; then
+            if [[ "${REPO_SRC}" == 'trunk' ]];then
-        git rm -r "$CARCH"/"${valid_names[10]}"
+                local pkg=${PACKAGE}
-        git commit -m "switch from ${valid_names[10]} to ${valid_names[7]}"
+                git rm -r trunk
-    elif [[ -d "$CARCH"/"${valid_names[7]}" ]] \
+            else
-    && [[ "${repo_dest}" == "${valid_names[10]}" ]]; then
+                local pkg="${PACKAGE}-$ver"
-        git rm -r "$CARCH"/"${valid_names[7]}"
+                git rm -r repos/"${REPO_SRC}-$CARCH"
-        git commit -m "switch from ${valid_names[7]} to ${valid_names[10]}"
+            fi
-    fi
+            commit_msg="[${REPO_SRC}] '$pkg' ${action}"
-}
+            msg "Action: %s" "$commit_msg"
-
-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]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[0]}" && "${repo_dest}" == "${valid_names[2]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[2]}" && "${repo_dest}" == "${valid_names[0]}" ]]; then
-
-        local org gitname
-        org=$(get_pkg_org "${package}")
-        gitname=$(get_compliant_name "${package}")
-        add_team_to_repo "$gitname" "${org}" "${repo_dest}"
-        remove_team_from_repo "$gitname" "${org}" "${repo_src}"
-    fi
-}
-
-path_config() {
-    [[ "${repo_src}" != 'trunk' ]] && pkgbuild="$CARCH/${repo_src}"/PKGBUILD
-
-    # shellcheck disable=1090
-    . "$pkgbuild"
-}
-
-get_repo_commit_msg() {
-    printf "[%s] -> [%s] '%s' %s\n" "${repo_src}" "${repo_dest}" "${package}-$(get_full_version)" "${action}"
-}
-
-get_commit_msg() {
-    printf "[%s] '%s' %s\n" "${repo_src}" "${package}-$(get_full_version)" "${action}"
-}
-
-commit_pkg() {
-    local commit_msg pkg
-    if ${remove}; then
-        action='remove'
-        commit_msg=$(get_commit_msg)
-        msg "Action: %s" "$commit_msg"
-        if [[ "${repo_src}" == 'trunk' ]];then
-            git rm -r trunk
         else
-            git rm -r "$CARCH/${repo_src}"
+            local action='modify'
+            commit_msg="[${REPO_SRC}] '${PACKAGE}-$ver' ${action}"
+            msg "Action: %s" "$commit_msg"
+            git add .
+
         fi
-    else
+        git commit -m "$commit_msg"
-        action='modify'
-        commit_msg=$(get_commit_msg)
-        msg "Action: %s" "$commit_msg"
-        git add .
-    fi
-    git commit -m "$commit_msg"
-}
 
-repo_commit_pkg() {
+        cd ${TREE_DIR_ARTIX}/${git_tree}
-    local commit_msg
 
-    [[ -d "$CARCH/${repo_dest}" ]] && git rm -r "$CARCH/${repo_dest}"
+        ${push} && pull_tree "${git_tree}" "$head"
-    [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-    [[ ! -d "$CARCH/${repo_dest}" ]] && mkdir "$CARCH/${repo_dest}"
 
-    if [[ "${repo_src}" == 'trunk' ]]; then
+        subrepo_pull "${PACKAGE}"
-        action='add'
+        subrepo_push "${PACKAGE}"
-        commit_msg=$(get_repo_commit_msg)
+        subrepo_clean "${PACKAGE}"
-        msg "Action: %s" "$commit_msg"
-        check_rebuild
-        cp trunk/* "$CARCH/${repo_dest}"/
-    else
-        action='move'
-        [[ ! -f $pkgbuild ]] && die "%s does not exist!" "$pkgbuild"
-        commit_msg=$(get_repo_commit_msg)
-        msg "Action: %s" "$commit_msg"
-        cp "$CARCH/${repo_src}"/* "$CARCH/${repo_dest}"/
-        git rm -r "$CARCH/${repo_src}"
-    fi
-    git add .
-    git commit -m "$commit_msg"
-}
 
-run(){
+        ${push} && push_tree "${git_tree}"
-    local artixpath head group
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
-    if [[ -n ${artixpath} ]];then
-        group=${artixpath%/*}
-        cd "${group}" || return
-        head=$(get_local_head)
-
-        cd "${artixpath}" || return
-
-        path_config
-
-        if [[ "${cmd}" == 'commitpkg' ]];then
-            commit_pkg
-        else
-            repo_commit_pkg
-        fi
-
-        cd "${group}" || return
-
-        if ${push}; then
-            msg "Checking (%s) (Artix)" "${group##*/}"
-            pull_tree "${group##*/}" "$head"
-        fi
-
-        subrepo_push "${package}"
-        subrepo_clean "${package}"
-
-        ${push} && push_tree "${group##*/}"
 
         git prune
-
-        [[ "${cmd}" != 'commitpkg' ]] && check_team
     else
-        die "Package '%s' does not exist!" "${package}"
+        error "Package '%s' does not exist!" "${PACKAGE}"
     fi
 }
 
-is_valid_repo(){
+symlink_commit_pkg(){
-    local _valid=trunk
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
-    for repo in "${valid_names[@]}"; do
+    if [[ -n ${git_tree} ]];then
-        _valid=${repo:-}${repo:+|}$_valid
+
-    done
+        cd ${TREE_DIR_ARTIX}/${git_tree}
-    eval "case ${repo_src} in
+
-        ${_valid}) return 0 ;;
+        local head=$(get_local_head)
-        *) return 1 ;;
+
-    esac"
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
+
+        . trunk/PKGBUILD
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${PACKAGE}")
+
+        if [[ ${REPO_SRC} == 'trunk' ]];then
+            local action='add'
+            local dest="${REPO_DEST}-$CARCH"
+
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp trunk/* repos/$dest/
+        else
+            local action='move'
+            local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"
+
+            [[ ! -f repos/$src/PKGBUILD ]] && die "%s does not exist!" "repos/$src/PKGBUILD"
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp repos/$src/* repos/$dest/
+            git rm -r repos/$src
+        fi
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$ver' ${action}"
+        msg "Action: %s" "$commit_msg"
+
+        git add .
+        git commit -m "$commit_msg"
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}
+
+        ${push} && pull_tree "${git_tree}" "$head"
+
+        subrepo_pull "${PACKAGE}"
+        subrepo_push "${PACKAGE}"
+        subrepo_clean "${PACKAGE}"
+
+        ${push} && push_tree "${git_tree}"
+
+        git prune
+    else
+        error "Package '%s' does not exist!" "${PACKAGE}"
+    fi
 }
 
-#}}}
+load_user_info
 
-load_makepkg_config
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
 
-load_valid_names
+REPO_SRC='trunk'
-
+PACKAGE=''
-repo_src='trunk'
-package=''
 remove=false
 push=false
 
-pkgbuild=trunk/PKGBUILD
-
 cmd=${0##*/}
-repo_dest=${cmd%pkg}
+REPO_DEST=${cmd%pkg}
 
 usage() {
-    printf "Usage: %s [options]\n" "${0##*/}"
+    echo "Usage: ${0##*/} [options]"
-    printf "    -s <name>          Source repository [default: %s]\n" "${repo_src}"
+    echo "    -s <name>          Source repository [default:${REPO_SRC}]"
-    printf '    -p <pkg>           Package name\n'
+    echo '    -p <pkg>           Package name'
-    printf '    -r                 Delete from repo (commitpkg only)\n'
+    echo '    -r                 Delete from repo (commitpkg only)'
-    printf '    -u                 Push\n'
+    echo '    -u                 Push'
-    printf '    -h                 This help\n'
+    echo '    -h                 This help'
-    printf '\n'
+    echo ''
-    printf '\n'
+    echo ''
-    exit "$1"
+    exit $1
 }
 
+orig_argv=("$0" "$@")
+
 opts='p:s:urh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        s) repo_src="$OPTARG" ;;
+        s) REPO_SRC="$OPTARG" ;;
-        p) package="$OPTARG" ;;
+        p) PACKAGE="$OPTARG" ;;
         r) remove=true ;;
         u) push=true ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
-if is_valid_repo;then
+if $(is_valid_repo "${REPO_SRC}");then
-    run
+    if [[ "${cmd}" == 'commitpkg' ]];then
+        commit_pkg
+    else
+        symlink_commit_pkg
+    fi
 else
-    die "source repository '%s' is not valid!" "${repo_src}"
+    error "source repository '%s' is not valid!" "${REPO_SRC}"
 fi

bin/pkg/comparepkg.in

@@ -12,195 +12,234 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/util-base.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/util-pkg.sh)
+. @libdir@/artools/util-pkg.sh
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/repo.sh)
-m4_include(lib/pkg/table.sh)
 
+compare(){
+    local pkgpath="$1"
+    local pkg=${pkgpath##*/}
+    local artixrepo=$(find_repo "$package" "${staging}" "${unstable}")
+    local artixshow=${artixrepo%-*}
+    local pkgbuild=$pkgpath/repos/$artixrepo/PKGBUILD
 
-#{{{ upgrades, downgrades, moves
+    if [[ -f $pkgbuild ]];then
 
-remove_list(){
+        . $pkgbuild 2>/dev/null
-    local name="$1"
+        local artixver=$(get_full_version $pkg)
-    [[ -f "${TREE_DIR_ARTIX}"/$name.list ]] && rm "${TREE_DIR_ARTIX}"/"$name".list
-}
 
-write_list(){
+        local archpath=$(get_import_path $pkg)
-    local line="$1" name="$2"
-    printf "%s\n" "$line" >> "${TREE_DIR_ARTIX}"/"$name".list
-}
 
-compare_m(){
+        local archrepo=$(find_repo "$archpath" "${staging}" "${unstable}")
-    case ${artixrepo} in
+
-        *testing*|*staging*|*rebuild)
+        local archshow=${archrepo%-*}
-            if [[ "${a}" == "${b}" ]]; then
+        pkgbuild=$archpath/repos/$archrepo/PKGBUILD
-                msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+
-            elif [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
+        if [[ -f $pkgbuild ]];then
-                msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            . $pkgbuild 2>/dev/null
-            else
+            local archver=$(get_full_version $pkg)
-                msg_row_green "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+        fi
-                if [[ -n "$archrepo" ]]; then
+
-                    write_list "${a}:${b}:$pkg" pkg_moves
+        local result=$(vercmp "$artixver" "$archver")
-                else
+
-                    write_list "@repo@:${b}:$pkg" artix
+        local repomatch=false
+        [[ "$archrepo" == "$artixrepo" ]] && repomatch=true
+
+        if ${move};then
+
+            if [ $result -gt -1 ];then
+                case $artixrepo in
+                    *testing*|*staging*)
+                        if $repomatch;then
+                            msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                        else
+                            msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                        fi
+                    ;;
+                esac
+            fi
+
+        elif ${upgrades};then
+
+            if [ $result -eq -1 ];then
+                msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+            fi
+
+        elif ${downgrades};then
+
+            if [ $result -eq 1 ];then
+                if [[ -n $archver ]] && [[ -n $archrepo ]];then
+                    msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                 fi
             fi
-        ;;
-    esac
-}
 
-compare_u(){
-    if [ "$result" -eq -1 ];then
-#         local arel=${archver##*-} brel=${artixver##*-}
-#         local reldiff
-#         reldiff=$(( $arel-${brel%.*} ))
-        msg_row_red "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        write_list "${a}:$pkg" pkg_upgrades
-    fi
-}
-
-compare_d(){
-    if [ "$result" -eq 1 ];then
-        if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
-            msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
         fi
+        unset pkgver epoch pkgrel artixver archver pkgbuild archpath
+
     fi
 }
 
-get_archpath(){
+is_db_entry() {
-    local pkg="$1" archpath
+    local pkgname="$1" repo="$(arch2artix $2)"
+    if [[ -d ${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/$repo/$pkgname ]];then
+        return 0
+    fi
+    return 1
+}
 
-    for tree in "${ARCH_TREE[@]}"; do
+check_db(){
-        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && archpath=${TREE_DIR_ARCH}/$tree/$pkg
+    local pkgpath="$1"
+    local pkg=${pkgpath##*/}
+    local sarch=(any ${ARCH})
+    local arch_repos=$(arch_repos "${staging}" "${unstable}")
+
+    for repo in ${arch_repos[@]};do
+
+        for a in ${sarch[@]};do
+
+            local pkgbuild=$pkgpath/repos/$repo-$a/PKGBUILD
+
+            if [[ -f $pkgbuild ]];then
+
+                . $pkgbuild 2>/dev/null
+                local artixver=$(get_full_version $pkg)
+                local is_entry=false
+
+                for name in ${pkgname[@]};do
+
+                    if is_db_entry "$name-$artixver" "$repo";then
+                        is_entry=true
+                    fi
+                    if ! $is_entry; then
+                        msg_row "%-20s %-35s %-20s %-10s" "$repo" "$name" "$artixver" "$is_entry"
+                    fi
+                done
+                unset artixver is_entry pkgbuild pkgver epoch pkgname pkgbase
+            fi
+        done
     done
-    printf "%s\n" "$archpath"
 }
 
-pre_compare(){
+update_db_cache(){
-    local func="$1" pkgpath="$2" result group pkg
+    msg "Updating database cache"
-    group="${pkgpath%/*}"
+    for repo in "${searchrepos[@]}"; do
-    group=${group##*/}
+        local cachedir=${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/${repo}
-    pkg=${pkgpath##*/}
+        rm -rf "$cachedir"
+        mkdir -p "$cachedir"
+        msg2 "%s" "$repo"
+        curl -s "${REPOS_MIRROR}/${repo}/os/${ARCH}/${repo}.${LINKSDBEXT}" \
+            | bsdtar -xf - -C "$cachedir"
+    done
+    msg "Done"
+}
 
-    local artixrepo archrepo pkgbuild artixver archver archpath node a b
+query_db() {
-    artixrepo=$(find_repo "$pkgpath")
+    msg_table_header "%-20s %-45s %s" "Repo" "Package" "Library"
-    pkgbuild=$pkgpath/$artixrepo/PKGBUILD
+    for repo in "${searchrepos[@]}"; do
+        local prefix=
+        local db=${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/${repo}/
+        if [[ -d ${db} ]]; then
+            while read -rd '' pkg; do
+                read -r match
+                pkg=${pkg#${db}}
+                pkg="${pkg%/*}"
 
-    if [[ -f $pkgbuild ]]; then
+                msg_row "%-20s %-45s %s" "${repo}" "${pkg}" "${match}"
-        # shellcheck disable=1090
+            done < <(grep -rZ "${library}" "${db}") | sort -u
-        . "$pkgbuild" 2>/dev/null
-        artixver=$(get_full_version)
-        archpath=$(get_archpath "$pkg")
-        archrepo=$(find_repo "${archpath}")
-        pkgbuild=$archpath/$archrepo/PKGBUILD
-        node=${artixrepo%/*}
-        a=${archrepo#*/} b=${artixrepo#*/}
-        a="${a%-*}"
-
-        [[ "$node" != "$CARCH" ]] && b=${b%-*}
-
-        if [[ -f "$pkgbuild" ]]; then
-            # shellcheck disable=1090
-            . "$pkgbuild" 2>/dev/null
-            archver=$(get_full_version)
         fi
+    done
+    exit 0
+}
 
-        result=$(vercmp "$artixver" "$archver")
+show_version_table(){
 
-        "$func"
+    if ${check};then
-
+        ${sync} && update_db_cache
-        unset epoch
+        msg_table_header "%-20s %-35s %-20s %-10s" "Repo" "Package" "Version" "Database"
+    elif ${query};then
+        ${sync} && update_db_cache
+        query_db
+    else
+        msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
     fi
+
+    for tree in ${TREE_NAMES_ARTIX[@]};do
+
+        local git=$(find ${TREE_DIR_ARTIX}/$tree/ -mindepth 1 -maxdepth 1 -type d)
+
+        for package in ${git[@]}; do
+            if ${check};then
+                check_db "$package"
+            else
+                compare "$package"
+            fi
+        done
+    done
 }
 
-compare_upgrades(){
+load_user_info
-    local pkgpath="${1%/*}"
-    pre_compare compare_u "$pkgpath"
-}
 
-compare_downgrades(){
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-    local pkgpath="${1%/*}"
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-    pre_compare compare_d "$pkgpath"
+load_vars /etc/makepkg.conf
-}
 
-compare_move(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_m "$pkgpath"
-}
-
-#}}}
-
-show_compare_header(){
-    msg_table_header "${table}" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version" "Group"
-}
-
-show_upgrades_table(){
-    show_compare_header
-    remove_list pkg_upgrades
-    tree_loop compare_upgrades
-}
-
-show_downgrades_table(){
-    show_compare_header
-    tree_loop compare_downgrades
-}
-
-show_move_table(){
-    show_compare_header
-    remove_list pkg_moves
-    remove_list artix
-    tree_loop compare_move
-}
-
-load_makepkg_config
-
-load_valid_names
-
-testing=true
-staging=true
 unstable=false
-
+staging=true
 upgrades=false
 downgrades=false
 move=false
+check=false
+sync=false
+query=false
 
-readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"
+artix_repos=(
+    'goblins' 'gremlins' 'system' 'world'
+    'galaxy-goblins' 'galaxy-gremlins' 'galaxy'
+    'lib32-goblins' 'lib32-gremlins' 'lib32'
+    'gnome-wobble' 'kde-wobble'
+)
+
+searchrepos=(${artix_repos[@]})
 
 usage() {
-    printf 'Usage: %s [options]\n' "${0##*/}"
+    echo "Usage: ${0##*/} [options] (with -q [libname])"
-    printf '    -u            Show upgrade packages\n'
+    echo '    -u            Show upgrade packages'
-    printf '    -d            Show downgrade packages\n'
+    echo '    -d            Show downgrade packages'
-    printf '    -m            Show packages to move\n'
+    echo '    -m            Show packages to move'
-    printf '    -x            Do not inlcude testing packages\n'
+    echo "    -x            Don't inlcude staging packages"
-    printf '    -y            Do not inlcude staging packages\n'
+    echo '    -y            Include unstable kde and gnome'
-    printf '    -z            Include unstable kde and gnome\n'
+    echo '    -c            Check repos'
-    printf '    -h            This help\n'
+    echo "    -s            Sync repo databases"
-    printf '\n'
+    echo "    -q            Query repo databases for so libs"
-    printf '\n'
+    echo '    -r <repo>     Repo name to query'
-    exit "$1"
+    echo '                  [default: all]'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
 }
 
-opts='udmxyzh'
+orig_argv=("$0" "$@")
+
+opts='r:qcsudmxyh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         u) upgrades=true ;;
         d) downgrades=true ;;
         m) move=true ;;
-        x) testing=false ;;
+        x) staging=false ;;
-        y) staging=false ;;
+        y) unstable=true ;;
-        z) unstable=true ;;
+        c) check=true ;;
+        s) sync=true ;;
+        q) query=true ;;
+        r) searchrepos=("$OPTARG") ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
-set_arch_repos "$testing" "$staging" "$unstable"
+library="$1"; shift
 
-${move} && show_move_table
+show_version_table
-
-${upgrades} && show_upgrades_table
-
-${downgrades} && show_downgrades_table

bin/pkg/deploypkg.in

@@ -12,89 +12,94 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/util-base.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/util-pkg.sh)
+. @libdir@/artools/util-pkg.sh
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/deploy.sh)
 
-#{{{ deploy
+update_repo(){
+    local repo="$1" pkgfile ver
+    local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
 
-add(){
+    . PKGBUILD
-    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
+
-        msg "Found: %s" "${pkgfile}"
+    local pkgsearch=(${pkgname[@]})
-        packages+=("${pkgname}")
+    if check_option "debug" "y"; then
-        action='add'
+        pkgbase=${pkgbase:-${pkgname[@]}}
-        ln -sfv "${pkgfile}"{,.sig} "$repo_path"/
+        pkgsearch+=("${pkgbase}-debug")
     fi
-}
 
-remove(){
+    for name in ${pkgsearch[@]}; do
-    packages+=("$(get_pkgbasename "${pkgname}")")
+        pkgarch=$(get_pkg_arch "$name")
-    action='remove'
+        ver=$(get_full_version "$name")
-    rm -v "$repo_path"/"${pkgname}"{,.sig}
+        if pkgfile=$(find_cached_package "$name" "$ver" "$pkgarch");then
-}
+            local pkg=${pkgfile##*/}
-
+            info "Found: %s" "$pkg"
-repo_action(){
+            if ${add_pkg};then
-    local packages=() action func="$1"
+                local action='add'
-    for pkgname in "${passfiles[@]}"; do
+                packages+=("$pkg")
-        "$func"
+#                 checkpkg "${pkgfile}" || return 2
+                if ${sign_pkg};then
+                    [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
+                    signfile ${pkgfile}
+                fi
+                ln -sf ${pkgfile}{,.sig} $repo_path/
+            elif ${del_pkg};then
+                local action='remove'
+                packages+=("$name")
+                [[ -e $repo_path/$pkg ]] && rm $repo_path/$pkg
+                [[ -e $repo_path/$pkg.sig ]] && rm $repo_path/$pkg.sig
+            fi
+        fi
     done
-    cd "$repo_path" || return
+    cd $repo_path
-    if [[ -n "${action}" ]]; then
+    if [[ -n $action ]]; then
-        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
+        repo-$action -R $repo.${PKGDBEXT} ${packages[@]}
-        ${linksdb} && links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
+        ${linksdb} && links-$action $repo.${LINKSDBEXT} ${packages[@]}
     fi
+
+    return 0
 }
 
-#}}}
+load_user_info
 
-load_makepkg_config
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-pkgdb_ext="db.tar.${DBEXT}"
+load_vars /etc/makepkg.conf
-linksdb_ext="links.tar.${DBEXT}"
 
 add_pkg=false
-rm_pkg=false
+del_pkg=false
+sign_pkg=false
 linksdb=false
 
 cmd=${0##*/}
 dest_repo=${cmd#*-}
 
 usage() {
-    printf "Usage: %s [options]\n" "${cmd}"
+    echo "Usage: ${cmd} [options]"
-    printf '    -d <dest>          Destination repository\n'
+    echo '    -a                 Add package(s) to repository'
-    printf '    -a                 Add package(s) to repository\n'
+    echo '    -r                 Remove package(s) from repository'
-    printf '    -r                 Remove package(s) from repository\n'
+    echo '    -l                 Use links db'
-    printf '    -l                 Use links db\n'
+    echo '    -s                 Sign package(s)'
-    printf '    -h                 This help\n'
+    echo '    -h                 This help'
-    printf '\n'
+    echo ''
-    printf '\n'
+    echo ''
-    exit "$1"
+    exit $1
 }
 
-opts='arlhd:'
+opts='arlsh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        d) dest_repo="$OPTARG" ;;
+        a) add_pkg=true; del_pkg=false ;;
-        a) add_pkg=true; rm_pkg=false ;;
+        r) del_pkg=true; add_pkg=false ;;
-        r) rm_pkg=true; add_pkg=false ;;
         l) linksdb=true ;;
+        s) sign_pkg=true ;;
         h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $(($OPTIND - 1))
 
-passfiles=("$@")
+prepare_dir "${REPOS_ROOT}"
 
-repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
+update_repo "${dest_repo}"
-
-if [[ -n "${passfiles[*]}" ]]; then
-    if ${add_pkg}; then
-        repo_action add
-    fi
-    if ${rm_pkg}; then
-        repo_action remove
-    fi
-fi

bin/pkg/find-libdeps.in

@@ -1,99 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/base/message.sh)
-
-set -e
-shopt -s extglob
-
-IGNORE_INTERNAL=0
-
-if [[ $1 = "--ignore-internal" ]]; then
-    IGNORE_INTERNAL=1
-    shift
-fi
-
-script_mode=${BASH_SOURCE[0]##*/find-lib}
-
-case $script_mode in
-    deps|provides) true;;
-    *) die "Unknown mode %s" "$script_mode" ;;
-esac
-
-if [[ -z $1 ]]; then
-    printf "%s [options] <package file|extracted package dir>\n" "${0##*/}"
-    printf "Options:\n"
-    printf "    --ignore-internal      ignore internal libraries\n"
-    exit 1
-fi
-
-if [[ -d $1 ]]; then
-    pushd "$1" >/dev/null
-else
-    setup_workdir
-
-    case ${script_mode} in
-        deps) bsdtar -C "$WORKDIR" -xf "$1";;
-        provides) bsdtar -C "$WORKDIR" -xf "$1" --include="*.so*";;
-    esac
-
-    pushd "$WORKDIR" >/dev/null
-fi
-
-process_sofile() {
-    # extract the library name: libfoo.so
-    soname="${sofile%.so?(+(.+([0-9])))}".so
-    # extract the major version: 1
-    soversion="${sofile##*\.so\.}"
-    if [[ "$soversion" = "$sofile" ]] && ((IGNORE_INTERNAL)); then
-        return
-    fi
-    if ! in_array "${soname}=${soversion}-${soarch}" "${soobjects[@]}"; then
-        # libfoo.so=1-64
-        printf "%s\n" "${soname}=${soversion}-${soarch}"
-        soobjects+=("${soname}=${soversion}-${soarch}")
-    fi
-}
-
-case $script_mode in
-    deps) find_args=(-perm -u+x);;
-    provides) find_args=(-name '*.so*');;
-esac
-
-find . -type f "${find_args[@]}" | while read -r filename; do
-    if [[ $script_mode = "provides" ]]; then
-        # ignore if we don't have a shared object
-        if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then
-            continue
-        fi
-    fi
-
-    # get architecture of the file; if soarch is empty it's not an ELF binary
-    soarch=$(LC_ALL=C readelf -h "$filename" 2>/dev/null | sed -n 's/.*Class.*ELF\(32\|64\)/\1/p')
-    [[ -n $soarch ]] || continue
-
-    if [[ $script_mode = "provides" ]]; then
-        # get the string binaries link to: libfoo.so.1.2 -> libfoo.so.1
-        sofile=$(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -n 's/.*Library soname: \[\(.*\)\].*/\1/p')
-        [[ -z $sofile ]] && sofile="${filename##*/}"
-        process_sofile
-    elif [[ $script_mode = "deps" ]]; then
-        # process all libraries needed by the binary
-        for sofile in $(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'); do
-            process_sofile
-        done
-    fi
-done
-
-popd >/dev/null

bin/pkg/finddeps.in

@@ -1,50 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/base/message.sh)
-
-match=$1
-
-if [[ -z $match ]]; then
-    printf 'Usage: finddeps <depname>\n'
-    printf '\n'
-    printf 'Find packages that depend on a given depname.\n'
-    printf 'Run this script from the top-level directory of your ABS tree.\n'
-    printf '\n'
-    exit 1
-fi
-
-find . -type d -print0 2>/dev/null| while read -r -d '' d; do
-    if [[ -f "$d/PKGBUILD" ]]; then
-        pkgname=() depends=() makedepends=() optdepends=()
-        # shellcheck source=PKGBUILD.proto
-        . "$d/PKGBUILD"
-        for dep in "${depends[@]}"; do
-            # lose the version comparator, if any
-            depname=${dep%%[<>=]*}
-            [[ $depname = "$match" ]] && msg "$d (depends)"
-        done
-        for dep in "${makedepends[@]}"; do
-            # lose the version comparator, if any
-            depname=${dep%%[<>=]*}
-            [[ $depname = "$match" ]] && msg "$d (makedepends)"
-        done
-        for dep in "${optdepends[@]/:*}"; do
-            # lose the version comaparator, if any
-            depname=${dep%%[<>=]*}
-            [[ $depname = "$match" ]] && msg "$d (optdepends)"
-        done
-    fi
-done
-

bin/pkg/gitearepo.in

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

bin/pkg/lddd.in

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

bin/pkg/links-add.in

@@ -19,8 +19,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-m4_include(lib/base/message.sh)
-
 shopt -s extglob
 
 declare -r REPO_DB_NAME="links"
@@ -36,6 +34,8 @@ REPO_DB_SUFFIX=
 LOCKFILE=
 CLEAN_LOCK=0
 
+. @libdir@/artools/util-base.sh
+
 # ensure we have a sane umask set
 umask 0022
 
@@ -71,12 +71,12 @@ packages to remove can be specified on the command line.\n"
     printf -- "  -k, --key <key>   use the specified key to sign the database\n"
     printf -- "  -v, --verify      verify database's signature before update\n"
     printf -- "\n\
-See %s(8) for more details and descriptions of the available options.\n" "$cmd"
+See %s(8) for more details and descriptions of the available options.\n" $cmd
     printf "\n"
     if [[ $cmd == "links-add" ]] ; then
-        printf -- "Example:  links-add /path/to/repo.links.tar.xz pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
+        printf -- "Example:  links-add /path/to/repo.${LINKSDBEXT} pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
     elif [[ $cmd == "links-remove" ]] ; then
-        printf -- "Example:  links-remove /path/to/repo.links.tar.xz kernel26\n"
+        printf -- "Example:  links-remove /path/to/repo.${LINKSDBEXT} kernel26\n"
     fi
 }
 
@@ -86,8 +86,8 @@ find_pkgentry() {
 
     for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
         name=${pkgentry##*/}
-        if [[ ${name%-*-*} = "$pkgname" ]]; then
+        if [[ ${name%-*-*} = $pkgname ]]; then
-            printf "%s\n" "$pkgentry"
+            echo $pkgentry
             return 0
         fi
     done
@@ -101,8 +101,8 @@ check_gpg() {
     fi
 
     if (( ! VERIFY )); then
-        if ! gpg --list-secret-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then
+        if ! gpg --list-key ${GPGKEY} &>/dev/null; then
-            if [[ -n "$GPGKEY" ]]; then
+            if [[ ! -z $GPGKEY ]]; then
                 error "The key ${GPGKEY} does not exist in your keyring."
             elif (( ! KEY )); then
                 error "There is no key in your keyring."
@@ -119,11 +119,11 @@ create_signature() {
     local ret=0
     msg "Signing database '%s'..." "${dbfile##*/.tmp.}"
 
-    local SIGNWITHKEY=()
+    local SIGNWITHKEY=""
     if [[ -n $GPGKEY ]]; then
-        SIGNWITHKEY=(-u "${GPGKEY}")
+        SIGNWITHKEY="-u ${GPGKEY}"
     fi
-    gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "$dbfile" &>/dev/null || ret=$?
+    gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$?
 
     if (( ! ret )); then
         msg2 "Created signature file '%s'" "${dbfile##*/.tmp.}.sig"
@@ -153,13 +153,21 @@ verify_signature() {
 }
 
 verify_repo_extension() {
-    local junk=()
+    local repofile=$1
-    if [[ $1 = *.links.tar* ]] && get_compression_command "$1" junk; then
-        return 0
-    fi
 
-    error "'%s' does not have a valid database archive extension." "$1"
+    case $repofile in
-    exit 1
+        *.links.tar.gz)  TAR_OPT="z" ;;
+        *.links.tar.bz2) TAR_OPT="j" ;;
+        *.links.tar.xz)  TAR_OPT="J" ;;
+        *.links.tar.zst) TAR_OPT="--zstd" ;;
+        *.links.tar.Z)   TAR_OPT="Z" ;;
+        *.links.tar)     TAR_OPT="" ;;
+        *) error "'%s' does not have a valid database archive extension." \
+                "$repofile"
+            exit 1 ;;
+    esac
+
+    printf '%s' "$TAR_OPT"
 }
 
 # write an entry to the pacman database
@@ -200,7 +208,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"
@@ -210,11 +218,10 @@ db_write_entry() {
     msg2 "Creating '%s' db entry..." "${REPO_DB_NAME}"
 
     local linksentry=$tmpdir/${REPO_DB_NAME}/$pkgname-$pkgver/${REPO_DB_NAME}
-    local files=$(find "$tmppkg" -type f ! -ipath "*/Documentation/*")
 
-    for f in ${files}; do
+    for f in $(find $tmppkg -type f); do
         readelf -d "$f" 2> /dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'
-    done | sort -u > "$linksentry"
+    done | sort -u > $linksentry
 
     popd >/dev/null
     popd >/dev/null
@@ -227,8 +234,7 @@ db_write_entry() {
 db_remove_entry() {
     local pkgname=$1
     local notfound=1
-    local pkgentry
+    local pkgentry=$(find_pkgentry "$pkgname")
-    pkgentry=$(find_pkgentry "$pkgname")
     while [[ -n $pkgentry ]]; do
         notfound=0
 
@@ -237,8 +243,7 @@ db_remove_entry() {
         rm -rf "$pkgentry"
 
         # remove entries in "links" database
-        local linksentry
+        local linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
-        linksentry=$(printf "%s\n" "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
         rm -rf "$linksentry"
 
         pkgentry=$(find_pkgentry "$pkgname")
@@ -258,7 +263,7 @@ prepare_repo_db() {
     fi
 
     # check lock file
-    if ( set -o noclobber; printf "%s\n" "$$" > "$LOCKFILE") 2> /dev/null; then
+    if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then
         CLEAN_LOCK=1
     else
         error "Failed to acquire lockfile: %s." "$LOCKFILE"
@@ -375,6 +380,7 @@ rotate_db() {
 }
 
 create_db() {
+    TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE")
     # $LOCKFILE is already guaranteed to be absolute so this is safe
     dirname=${LOCKFILE%/*}
 
@@ -383,13 +389,13 @@ create_db() {
     tempname=$dirname/.tmp.$filename
 
     pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
-    local files=(*)
+    if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then
-    if [[ ${files[*]} = '*' ]]; then
+        bsdtar -c${TAR_OPT}f "$tempname" *
+    else
         # we have no packages remaining? zip up some emptyness
         warning "No packages remain, creating empty database."
-        files=(-T /dev/null)
+        bsdtar -c${TAR_OPT}f "$tempname" -T /dev/null
     fi
-    bsdtar -cf - "${files[@]}" | compress_as "$filename" > "$tempname"
     popd >/dev/null
 
     create_signature "$tempname"
@@ -399,7 +405,7 @@ trap_exit() {
     # unhook all traps to avoid race conditions
     trap '' EXIT TERM HUP QUIT INT ERR
 
-    printf '\n'
+    echo
     error "$@"
     clean_up 1
 }
@@ -413,7 +419,7 @@ clean_up() {
     [[ -d $tmpdir ]] && rm -rf "$tmpdir"
     (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE"
 
-    exit "$exit_code"
+    exit $exit_code
 }
 
 # PROGRAM START
@@ -470,7 +476,7 @@ else
     LOCKFILE=$PWD/$REPO_DB_FILE.lck
 fi
 
-verify_repo_extension "$REPO_DB_FILE"
+verify_repo_extension "$REPO_DB_FILE" >/dev/null
 
 REPO_DB_PREFIX=${REPO_DB_FILE##*/}
 REPO_DB_PREFIX=${REPO_DB_PREFIX%.links.*}

bin/pkg/mkchrootpkg.in

@@ -12,105 +12,82 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-m4_include(lib/base/message.sh)
+. @libdir@/artools/util-base.sh
-m4_include(lib/base/chroot.sh)
-
-export BUILDTOOL=artools-pkg
-export BUILDTOOLVER=m4_artools_pkg_version
 
 shopt -s nullglob
 
-default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-makepkg_args=("${default_makepkg_args[@]}")
-verifysource_args=()
-chrootdir=
-passeddir=
-makepkg_user=
-declare -a install_pkgs
-declare -i ret=0
-
-keepbuilddir=0
-update_first=0
-clean_first=0
-run_namcap=0
-run_checkpkg=0
-temp_chroot=0
-
-bindmounts=()
-
-copy=$USER
-[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
-[[ -z "$copy" || $copy = root ]] && copy=copy
-src_owner=${SUDO_USER:-$USER}
-
 usage() {
-    printf 'Usage: %s [options] -r <chrootdir> [--] [makepkg args]\n' "${0##*/}"
+    echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
-    printf ' Run this script in a PKGBUILD dir to build a package inside a\n'
+    echo ' Run this script in a PKGBUILD dir to build a package inside a'
-    printf ' clean chroot. Arguments passed to this script after the\n'
+    echo ' clean chroot. Arguments passed to this script after the'
-    printf ' end-of-options marker (--) will be passed to makepkg.\n'
+    echo ' end-of-options marker (--) will be passed to makepkg.'
-    printf '\n'
+    echo ''
-    printf ' The chroot dir consists of the following directories:\n'
+    echo ' The chroot dir consists of the following directories:'
-    printf ' <chrootdir>/{root, copy} but only "root" is required\n'
+    echo ' <chrootdir>/{root, copy} but only "root" is required'
-    printf ' by default. The working copy will be created as needed\n'
+    echo ' by default. The working copy will be created as needed'
-    printf '\n'
+    echo ''
-    printf "The chroot 'root' directory must be created via the following\n"
+    echo 'The chroot "root" directory must be created via the following'
-    printf 'command:\n'
+    echo 'command:'
-    printf '    mkchroot <chrootdir>/root base-devel\n'
+    echo '    mkchroot <chrootdir>/root base-devel'
-    printf '\n'
+    echo ''
-    printf 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER\n'
+    echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER'
-    printf 'from makepkg.conf(5), if those variables are not part of the\n'
+    echo 'from makepkg.conf(5), if those variables are not part of the'
-    printf 'environment.\n'
+    echo 'environment.'
-    printf '\n'
+    echo ''
-    printf 'Default makepkg args: %s\n' "${default_makepkg_args[*]}"
+    echo "Default makepkg args: ${default_makepkg_args[*]}"
-    printf '\n'
+    echo ''
-    printf 'Flags:\n'
+    echo 'Flags:'
-    printf ' -h         This help\n'
+    echo '-h         This help'
-    printf ' -c         Clean the chroot before building\n'
+    echo '-c         Clean the chroot before building'
-    printf ' -d <dir>   Bind directory into build chroot as read-write\n'
+    echo '-d <dir>   Bind directory into build chroot as read-write'
-    printf ' -D <dir>   Bind directory into build chroot as read-only\n'
+    echo '-D <dir>   Bind directory into build chroot as read-only'
-    printf ' -u         Update the working copy of the chroot before building\n'
+    echo '-u         Update the working copy of the chroot before building'
-    printf '           This is useful for rebuilds without dirtying the pristine\n'
+    echo '           This is useful for rebuilds without dirtying the pristine'
-    printf '           chroot\n'
+    echo '           chroot'
-    printf ' -r <dir>   The chroot dir to use\n'
+    echo '-r <dir>   The chroot dir to use'
-    printf ' -I <pkg>   Install a package into the working copy of the chroot\n'
+    echo '-I <pkg>   Install a package into the working copy of the chroot'
-    printf ' -l <copy>  The directory to use as the working copy of the chroot\n'
+    echo '-l <copy>  The directory to use as the working copy of the chroot'
-    printf '            Useful for maintaining multiple copies\n'
+    echo '           Useful for maintaining multiple copies'
-    printf '            Default: %s\n' "$copy"
+    echo "           Default: $copy"
-    printf ' -n         Run namcap on the package\n'
+    echo '-n         Run namcap on the package'
-    printf ' -C         Run checkpkg on the package\n'
+    echo '-T         Build in a temporary directory'
-    printf ' -N         Disable check() function\n'
+    echo '-U         Run makepkg as a specified user'
-    printf ' -T         Build in a temporary directory\n'
-    printf ' -U         Run makepkg as a specified user\n'
     exit 1
 }
 
 # {{{ functions
 
-# Usage: sync_chroot $chrootdir $copydir [$copy]
+# Usage: sync_chroot $rootdir $copydir [$copy]
 sync_chroot() {
-    local chrootdir=$1
+    local rootdir=$1
     local copydir=$2
     local copy=${3:-$2}
 
-    if [[ "$chrootdir/root" -ef "$copydir" ]]; then
+    if [[ "$rootdir" -ef "$copydir" ]]; then
         error 'Cannot sync copy with itself: %s' "$copydir"
         return 1
     fi
 
     # Get a read lock on the root chroot to make
     # sure we don't clone a half-updated chroot
-    slock 8 "$chrootdir/root.lock" \
+    slock 8 "$rootdir.lock" \
-        "Locking clean chroot [%s]" "$chrootdir/root"
+        "Locking clean chroot [%s]" "$rootdir"
 
-    stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copy"
+    stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$rootdir" "$copy"
-    if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
+    if is_subvolume "$rootdir" && is_same_fs "$rootdir" "$(dirname -- "$copydir")" && ! mountpoint -q "$copydir"; then
-        subvolume_delete_recursive "$copydir" ||
+        if is_subvolume "$copydir"; then
-            die "Unable to delete subvolume %s" "$copydir"
+            subvolume_delete_recursive "$copydir" ||
-        btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||
+                die "Unable to delete subvolume %s" "$copydir"
+        else
+            # avoid change of filesystem in case of an umount failure
+            rm --recursive --force --one-file-system "$copydir" ||
+                die "Unable to delete %s" "$copydir"
+        fi
+        btrfs subvolume snapshot "$rootdir" "$copydir" >/dev/null ||
             die "Unable to create subvolume %s" "$copydir"
     else
         mkdir -p "$copydir"
-        rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+        rsync -a --delete -q -W -x "$rootdir/" "$copydir"
     fi
     stat_done
 
@@ -141,7 +118,11 @@ delete_chroot() {
     stat_done
 }
 
+# Usage: install_packages $copydir $pkgs...
 install_packages() {
+    local copydir=$1
+    local install_pkgs=("${@:2}")
+
     local -a pkgnames
     local ret
 
@@ -149,21 +130,31 @@ install_packages() {
 
     cp -- "${install_pkgs[@]}" "$copydir/root/"
     chroot-run \
-        -b "${bindmounts[@]}" \
+        -r "${bindmounts_ro[@]}" \
+        -r "${bindmounts_rw[@]}" \
         "$copydir" \
-        bash -c 'yes y | pacman -U -- "$@"' -bash "${pkgnames[@]/#//root/}"
+        pacman -U --noconfirm -- "${pkgnames[@]/#//root/}"
     ret=$?
     rm -- "${pkgnames[@]/#/$copydir/root/}"
 
     return $ret
 }
 
+# Usage: prepare_chroot $copydir $HOME $keepbuilddir $run_namcap
+# Globals:
+#  - MAKEFLAGS
+#  - PACKAGER
 prepare_chroot() {
-    (( keepbuilddir )) || rm -rf "$copydir/build"
+    local copydir=$1
+    local USER_HOME=$2
+    local keepbuilddir=$3
+    local run_namcap=$4
+
+    [[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
 
     local builduser_uid builduser_gid
-    builduser_uid="$(id -u "$makepkg_user")"
+    builduser_uid="${SUDO_UID:-$UID}"
-    builduser_gid="$(id -g "$makepkg_user")"
+    builduser_gid="$(id -g "$builduser_uid")"
     local install="install -o $builduser_uid -g $builduser_gid"
     local x
 
@@ -182,7 +173,7 @@ prepare_chroot() {
         "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
     do
         grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
-        printf "%s\n" "$x" >>"$copydir/etc/makepkg.conf"
+        echo "$x" >>"$copydir/etc/makepkg.conf"
     done
 
     cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
@@ -196,11 +187,9 @@ EOF
         printf '#!/bin/bash\n'
         declare -f _chrootbuild
         declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
-        declare -p BUILDTOOL 2>/dev/null
-		declare -p BUILDTOOLVER 2>/dev/null
         printf '_chrootbuild "$@" || exit\n'
 
-        if (( run_namcap )); then
+        if [[ $run_namcap = true ]]; then
             declare -f _chrootnamcap
             printf '_chrootnamcap || exit\n'
         fi
@@ -223,10 +212,7 @@ _chrootbuild() {
     # use "$" in arguments to commands with "sudo -i".  ${foo} or
     # ${1} is OK, but $foo or $1 isn't.
     # https://bugzilla.sudo.ws/show_bug.cgi?id=765
-    sudo --preserve-env=SOURCE_DATE_EPOCH \
+    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
-        -preserve-env=BUILDTOOL \
-		--preserve-env=BUILDTOOLVER \
-        -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
     ret=$?
     case $ret in
         0|14)
@@ -239,32 +225,44 @@ _chrootbuild() {
 _chrootnamcap() {
     pacman -S --needed --noconfirm namcap
     for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
-        printf "Checking %s\n" "${pkgfile##*/}"
+        echo "Checking ${pkgfile##*/}"
         sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
     done
 }
 
+# Usage: download_sources $copydir $makepkg_user
+# Globals:
+#  - SRCDEST
 download_sources() {
+    local copydir=$1
+    local makepkg_user=$2
+
+#     local builddir
+#     builddir="$(mktemp -d)"
+#     chown "$makepkg_user:" "$builddir"
+
     setup_workdir
     chown "$makepkg_user:" "$WORKDIR"
 
     # Ensure sources are downloaded
-    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
+    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
         env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
-        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
+        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
         die "Could not download sources."
+
+    # Clean up garbage from verifysource
+#     rm -rf "$builddir"
 }
 
-move_logfiles() {
+# Usage: move_products $copydir $owner
-    local l
+# Globals:
-    for l in "$copydir"/logdest/*; do
+#  - PKGDEST
-        [[ $l == */logpipe.* ]] && continue
+#  - LOGDEST
-        chown "$src_owner" "$l"
+#  - SRCPKGDEST
-        mv "$l" "$LOGDEST"
-    done
-}
-
 move_products() {
+    local copydir=$1
+    local src_owner=$2
+
     local pkgfile
     for pkgfile in "$copydir"/pkgdest/*; do
         chown "$src_owner" "$pkgfile"
@@ -276,7 +274,12 @@ move_products() {
         fi
     done
 
-    move_logfiles
+    local l
+    for l in "$copydir"/logdest/*; do
+        [[ $l == */logpipe.* ]] && continue
+        chown "$src_owner" "$l"
+        mv "$l" "$LOGDEST"
+    done
 
     for s in "$copydir"/srcpkgdest/*; do
         chown "$src_owner" "$s"
@@ -290,143 +293,144 @@ move_products() {
 }
 # }}}
 
-opts='hcur:I:l:nNCTb:U:'
+orig_argv=("$0" "$@")
 
-while getopts "${opts}" arg; do
+main() {
-    case "$arg" in
+    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-        c) clean_first=1 ;;
+    makepkg_args=("${default_makepkg_args[@]}")
-        b) bindmounts+=("$OPTARG") ;;
+    keepbuilddir=false
-        u) update_first=1 ;;
+    update_first=false
-        r) passeddir="$OPTARG" ;;
+    clean_first=false
-        I) install_pkgs+=("$OPTARG") ;;
+    run_namcap=false
-        l) copy="$OPTARG" ;;
+    temp_chroot=false
-        n) run_namcap=1; makepkg_args+=(--install) ;;
+    chrootdir=
-        N) makepkg_args+=(--nocheck) ;;
+    passeddir=
-        C) run_checkpkg=1 ;;
+    makepkg_user=
-        T) temp_chroot=1; copy+="-$$" ;;
+    declare -a install_pkgs
-        U) makepkg_user="$OPTARG" ;;
+    declare -i ret=0
-        h|*) usage ;;
-    esac
-done
 
-[[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
+    bindmounts_ro=()
-[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
+    bindmounts_rw=()
-makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+    copy=$USER
+    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+    [[ -z "$copy" || $copy = root ]] && copy=copy
+    src_owner=${SUDO_USER:-$USER}
 
-# Canonicalize chrootdir, getting rid of trailing /
+    local opts='hcur:I:l:nTD:d:U:'
-chrootdir=$(readlink -e "$passeddir")
-[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
-[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkchroot %s/root base-devel" "$chrootdir"
 
-if [[ ${copy:0:1} = / ]]; then
+    while getopts "${opts}" arg; do
-    copydir=$copy
+        case "$arg" in
-else
+            c) clean_first=true ;;
-    copydir="$chrootdir/$copy"
+            D) bindmounts_ro+=("$OPTARG") ;;
-fi
+            d) bindmounts_rw+=("$OPTARG") ;;
+            u) update_first=true ;;
+            r) passeddir="$OPTARG" ;;
+            I) install_pkgs+=("$OPTARG") ;;
+            l) copy="$OPTARG" ;;
+            n) run_namcap=true; makepkg_args+=(--install) ;;
+            T) temp_chroot=true; copy+="-$$" ;;
+            U) makepkg_user="$OPTARG" ;;
+            h|*) usage ;;
+        esac
+    done
 
-# Pass all arguments after -- right to makepkg
+    [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
-makepkg_args+=("${@:$OPTIND}")
+    [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
+    makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-# See if -R or -e was passed to makepkg
+    check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
-for arg in "${@:$OPTIND}"; do
-    case ${arg%%=*} in
-        --skip*|--holdver) verifysource_args+=("$arg") ;;
-        --repackage|--noextract) keepbuilddir=1 ;;
-        --*) ;;
-        -*R*|-*e*) keepbuilddir=1 ;;
-    esac
-done
 
-umask 0022
+    # Canonicalize chrootdir, getting rid of trailing /
+    chrootdir=$(readlink -e "$passeddir")
+    [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
+    [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkchroot %s/root base-devel" "$chrootdir"
 
-ORIG_HOME=$HOME
+    if [[ ${copy:0:1} = / ]]; then
-IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
+        copydir=$copy
-load_makepkg_config
-HOME=$ORIG_HOME
-
-# Use PKGBUILD directory if these don't exist
-[[ -d $PKGDEST ]]    || PKGDEST=$PWD
-[[ -d $SRCDEST ]]    || SRCDEST=$PWD
-[[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD
-[[ -d $LOGDEST ]]    || LOGDEST=$PWD
-
-# Lock the chroot we want to use. We'll keep this lock until we exit.
-lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
-
-if [[ ! -d $copydir ]] || (( clean_first )); then
-    sync_chroot "$chrootdir" "$copydir" "$copy"
-fi
-
-bindmounts+=("-B:${PWD}:/startdir" "-B:${SRCDEST}:/srcdest")
-
-(( update_first )) && chroot-run \
-        -b "${bindmounts[*]}" \
-        "$copydir" \
-        pacman -Syuu --noconfirm
-
-if [[ -n ${install_pkgs[*]:-} ]]; then
-    install_packages
-    ret=$?
-    # If there is no PKGBUILD we are done
-    [[ -f PKGBUILD ]] || exit $ret
-fi
-
-if [[ "$(id -u "$makepkg_user")" == 0 ]]; then
-    error "Running makepkg as root is not allowed."
-    exit 1
-fi
-
-download_sources
-
-prepare_chroot
-
-if chroot-run \
-    -b "${bindmounts[*]}" \
-    "$copydir" \
-    /chrootbuild "${makepkg_args[@]}"
-then
-    mapfile -t pkgnames < <(sudo -u "$makepkg_user" bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
-    move_products
-else
-    (( ret += 1 ))
-    move_logfiles
-fi
-
-(( temp_chroot )) && delete_chroot "$copydir" "$copy"
-
-if (( ret != 0 )); then
-    if (( temp_chroot )); then
-        die "Build failed"
     else
-        die "Build failed, check %s/build" "$copydir"
+        copydir="$chrootdir/$copy"
     fi
-else
-    if (( run_checkpkg )); then
-        msg "Running checkpkg"
 
-        mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
+    # Pass all arguments after -- right to makepkg
-            --dbpath "$copydir"/var/lib/pacman \
+    makepkg_args+=("${@:$OPTIND}")
-            -Sddp "${pkgnames[@]}")
 
-        if ! wait $!; then
+    # See if -R or -e was passed to makepkg
-            warning "Skipped checkpkg due to missing repo packages"
+    for arg in "${makepkg_args[@]}"; do
-            exit 0
+        case ${arg%%=*} in
+            --repackage|--noextract) keepbuilddir=true; break ;;
+            --repackage|--noextract) keepbuilddir=true; break ;;
+            --*) ;;
+            -*R*|-*e*) keepbuilddir=true; break ;;
+        esac
+    done
+
+    load_user_info
+
+    umask 0022
+
+    load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+    load_vars /etc/makepkg.conf
+
+    # Use PKGBUILD directory if these don't exist
+    [[ -d $PKGDEST ]]    || PKGDEST=$PWD
+    [[ -d $SRCDEST ]]    || SRCDEST=$PWD
+    [[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD
+    [[ -d $LOGDEST ]]    || LOGDEST=$PWD
+
+    # Lock the chroot we want to use. We'll keep this lock until we exit.
+    lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
+
+    if [[ ! -d $copydir ]] || $clean_first; then
+        sync_chroot "$chrootdir/root" "$copydir" "$copy"
+    fi
+
+    bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
+
+    $update_first && chroot-run \
+            -r "${bindmounts_ro[*]}" \
+            -w "${bindmounts_rw[*]}" \
+            "$copydir" \
+            pacman -Syu --noconfirm
+
+    if [[ -n ${install_pkgs[*]:-} ]]; then
+        install_packages "$copydir" "${install_pkgs[@]}"
+        ret=$?
+        # If there is no PKGBUILD we have done
+        [[ -f PKGBUILD ]] || return $ret
+    fi
+
+    if [[ "$(id -u "$makepkg_user")" == 0 ]]; then
+        error "Running makepkg as root is not allowed."
+        exit 1
+    fi
+
+    download_sources "$copydir" "$makepkg_user"
+
+    prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
+
+    if chroot-run \
+        -r "${bindmounts_ro[*]}" \
+        -w "${bindmounts_rw[*]}" \
+        "$copydir" \
+        /chrootbuild "${makepkg_args[@]}"
+    then
+        move_products "$copydir" "$src_owner"
+    else
+        (( ret += 1 ))
+    fi
+
+    $temp_chroot && delete_chroot "$copydir" "$copy"
+
+    if (( ret != 0 )); then
+        if $temp_chroot; then
+            die "Build failed"
+        else
+            die "Build failed, check %s/build" "$copydir"
         fi
-        # download package files if any non-local location exists
+    else
-        for remotepkg in "${remotepkgs[@]}"; do
+        true
-            if [[ $remotepkg != file://* ]]; then
-                msg2 "Downloading current versions"
-                chroot-run "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
-                mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
-                    --dbpath "$copydir"/var/lib/pacman \
-                    -Sddp "${pkgnames[@]}")
-                break
-            fi
-        done
-        msg2 "Checking packages"
-        sudo -u "$makepkg_user" checkpkg --rmdir --warn "${remotepkgs[@]/#file:\/\//}"
     fi
-    true
+}
-fi
+
+main "$@"

bin/pkg/pkg2yaml.in

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

bin/pkg/signpkg.in

@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/deploy.sh)
-
-load_makepkg_config
-
-passfiles=("$@")
-
-sign_pkg(){
-    local file_to_sign="$1"
-
-    if [ ! -e "$file_to_sign" ]; then
-        error "%s does not exist!" "$file_to_sign"
-        exit 1
-    fi
-
-    if [[ -n "${BUILDBOT_GPGP}" ]]; then
-        msg "Signing [%s]" "${file_to_sign##*/}"
-        gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
-    else
-        msg "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
-        gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
-    fi
-}
-
-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
-        sign_pkg "${pkgfile}"
-    fi
-done

bin/pkg/tidyarch.in

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

data/artools.conf

@@ -0,0 +1,64 @@
+#############################################
+################ artools-base ###############
+#############################################
+
+# build dir where buildpkg or buildiso chroots are created
+# CHROOTS_DIR=/var/lib/artools
+
+# the workspace directory
+# WORKSPACE_DIR="/home/${OWNER}/artools-workspace"
+
+#############################################
+################ artools-pkg ################
+#############################################
+
+# gitea user access token
+# GIT_TOKEN=''
+
+# HOST_TREE_ARTIX='gitea@gitea.artixlinux.org:artix'
+
+# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
+
+# TREE_NAMES_ARTIX=(
+#         packages
+#         community
+#         packages-kernel
+#         packages-openrc
+#         packages-runit
+#         packages-xorg
+#         packages-python
+#         packages-perl
+#         packages-qt5
+#         packages-ruby
+# )
+
+# HOST_TREE_ARCH=git://git.archlinux.org/svntogit
+
+# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
+
+# TREE_NAMES_ARCH=(packages community)
+
+# default repos root
+# REPOS_ROOT=${WORKSPACE_DIR}/repos
+
+# default mirror for sogrep
+# REPOS_MIRROR="http://mirror1.artixlinux.org/repos"
+
+#############################################
+################ artools-iso ################
+#############################################
+
+# the iso storage directory
+# ISO_POOL="${WORKSPACE_DIR}/iso"
+
+# the dist release; default: auto
+# ISO_VERSION=$(date +%Y%m%d)
+
+# possible values: openrc, runit (s6 not yet supported)
+# INITSYS="openrc"
+
+# set upload bandwidth limit in kB/s
+# UPLIMIT=1000
+
+# the server user
+# ACCOUNT=[SetUser]

data/base/pacman-default.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -85,8 +84,39 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-gnome-wobble.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -94,8 +93,54 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-goblins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[gnome-unstable]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-goblins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,9 +69,6 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[kde-wobble]
-Include = /etc/pacman.d/mirrorlist
-
 [goblins]
 Include = /etc/pacman.d/mirrorlist
 
@@ -94,8 +90,51 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-goblins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-gremlins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -85,8 +84,39 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-kde-wobble.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -70,6 +69,9 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
+[kde-wobble]
+Include = /etc/pacman.d/mirrorlist
+
 [goblins]
 Include = /etc/pacman.d/mirrorlist
 
@@ -91,8 +93,54 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-goblins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[kde-unstable]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-lib32-goblins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -108,3 +107,34 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-lib32-gremlins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -99,3 +98,25 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-lib32.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,11 +32,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
-# We cannot check disk space from within a chroot environment
+CheckSpace
-#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -45,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -99,3 +98,25 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/conf/artools-base.conf

@@ -1,9 +0,0 @@
-#############################################
-################ artools-base ###############
-#############################################
-
-# build dir where buildpkg or buildiso chroots are created
-# CHROOTS_DIR=/var/lib/artools
-
-# the workspace directory
-# WORKSPACE_DIR="${USER_HOME}/artools-workspace"

data/conf/artools-iso.conf

@@ -1,21 +0,0 @@
-#############################################
-################ artools-iso ################
-#############################################
-
-# the iso storage directory
-# ISO_POOL="${WORKSPACE_DIR}/iso"
-
-# the dist release; default: auto
-# ISO_VERSION=$(date +%Y%m%d)
-
-# possible values: openrc, runit, s6, suite66, dinit
-# INITSYS="openrc"
-
-# gpg key; leave empty or commented to skip img signing
-# GPG_KEY=""
-
-# possible values: zstd (default), xz
-# COMPRESSION="zstd"
-
-# zstd only: range 1..22
-# COMPRESSION_LEVEL=15

data/conf/artools-pkg.conf

@@ -1,65 +0,0 @@
-#############################################
-################ artools-pkg ################
-#############################################
-
-# gitea user access token for buildtree
-# GIT_TOKEN=''
-
-# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
-
-# customize buildtree; uncomment to include
-# TREE_NAMES_ARTIX=(
-#         packages-kernel
-#         packages-llvm
-#         packages-openrc
-#         packages-runit
-#         packages-s6
-#         packages-suite66
-#         packages-dinit
-#         packages-perl
-#         packages-java
-#         packages-ruby
-#         packages-gtk
-#         packages-qt5
-#         packages-qt6
-#         packages-xorg
-#         packages-plasma
-#         kde-utils
-#         kde-devel
-#         kde-media
-#         kde-games
-#         kde-edu
-#         kde-net
-#         kde-pim
-#         packages-gnome
-#         packages-cinnamon
-#         packages-lxqt
-#         packages-lxde
-#         packages-mate
-#         packages-xfce
-#         packages-wm
-#         packages-devel
-#         packages-qt6
-#         packages-office
-#         packages-misc
-#         python-world
-#         python-galaxy
-#         python-galaxy-groups
-#         python-misc
-#         packages-python
-#         packages-lib32
-# )
-
-# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
-
-# default repos root for deploypkg
-# REPOS_ROOT=${WORKSPACE_DIR}/repos
-
-# default mirror for checkrepo
-# REPOS_MIRROR="http://mirror1.artixlinux.org/repos"
-
-# enable if trouble with default github arch mirror
-# ARCH_TREE=(packages community)
-
-# enable if trouble with default github arch mirror
-# HOST_TREE_ARCH='https://git.archlinux.org/svntogit'

data/pacman/pacman-docker.conf

@@ -1,99 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-NoExtract  = usr/share/help/* !usr/share/help/en*
-NoExtract  = usr/share/gtk-doc/html/* usr/share/doc/*
-NoExtract  = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
-NoExtract   = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
-NoExtract   = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
-NoExtract   = !usr/share/*locales/trans*
-NoExtract  = usr/share/man/* usr/share/info/*
-NoExtract  = usr/share/vim/vim*/lang/*
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

data/pkg/makepkg.conf

@@ -11,10 +11,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
-          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -26,7 +26,6 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
 VCSCLIENTS=('bzr::bzr'
-            'fossil::fossil'
             'git::git'
             'hg::mercurial'
             'svn::subversion')
@@ -39,25 +38,21 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
-#CPPFLAGS=""
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-        -fstack-clash-protection -fcf-protection"
-CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
-DEBUG_CFLAGS="-g"
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -80,7 +75,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -91,12 +86,11 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
-#-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(sha256)
+INTEGRITY_CHECK=(md5)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
 #-- Options to be used when stripping shared libraries. See `man strip' for details.
@@ -138,24 +132,18 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
-COMPRESSZST=(zstd -c -T0 --ultra -20 -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
-COMPRESSLZ4=(lz4 -q)
-COMPRESSLZ=(lzip -c -f)
 
 #########################################################################
 # EXTENSION DEFAULTS
 #########################################################################
 #
-PKGEXT='.pkg.tar.zst'
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
 
-#########################################################################
-# OTHER
-#########################################################################
-#
-#-- Command used to run pacman as root, instead of trying sudo and su
-#PACMAN_AUTH=()
 # vim: set ft=sh ts=2 sw=2 et:

data/pkglists/freedesktop.list

@@ -0,0 +1,63 @@
+accountsservice
+cairo
+colord
+cppunit
+dbus
+dbus-glib
+dbus-python
+desktop-file-utils
+fontconfig
+geoclue2
+glu
+gst-plugins-bad
+gst-plugins-base
+gst-plugins-good
+gst-plugins-ugly
+gstreamer
+harfbuzz
+hicolor-icon-theme
+libatasmart
+libbsd
+libdrm
+libevdev
+libinput
+libmbim
+libnice
+libqmi
+libvdpau
+libxcb
+libxft
+libxi
+media-player-info
+mesa
+modemmanager
+networkmanager
+orc
+p11-kit
+polkit
+poppler
+poppler-data
+pulseaudio
+pyxdg
+r
+sdl
+shared-mime-info
+sound-theme-freedesktop
+startup-notification
+systemdcompat
+telepathy-glib
+ttf-dejavu
+udisks2
+upower
+wayland
+wayland-protocols
+webrtc-audio-processing
+xcb-proto
+xcb-util
+xcb-util-cursor
+xcb-util-image
+xcb-util-keysyms
+xcb-util-renderutil
+xcb-util-wm
+xdg-user-dirs
+xdg-utils

data/pkglists/gnome.list

@@ -0,0 +1,63 @@
+adwaita-icon-theme
+atk
+at-spi2-atk
+at-spi2-core
+babl
+cantarell-fonts
+cogl
+dconf
+flatpak
+gamin
+gcab
+gconf
+gcr
+gdk-pixbuf2
+gegl02
+git
+glade
+glib2
+glib-networking
+gnome-common
+gnome-keyring
+gobject-introspection
+gsettings-desktop-schemas
+gssdp
+gtk2
+gtk3
+gtk-doc
+gtksourceview3
+gupnp
+gupnp-igd
+gvfs
+json-glib
+libcloudproviders
+libcroco
+libgee
+libglade
+libgnome-keyring
+libgudev
+libnotify
+librsvg
+libsecret
+libsoup
+libxml2
+libxslt
+meld
+mobile-broadband-provider-info
+modemmanager
+networkmanager
+network-manager-applet
+orca
+ostree
+pango
+pyatspi
+pygobject
+pygobject2
+pygtk
+rest
+ttf-bitstream-vera
+vala
+vte
+vte3
+yelp-tools
+yelp-xsl

data/pkglists/kde.list

@@ -0,0 +1,4 @@
+phonon-gstreamer
+polkit-qt
+extra-cmake-modules
+phonon

data/pkglists/kernel.list

@@ -0,0 +1,17 @@
+linux
+nvidia
+nvidia-utils
+acpi_call
+bbswitch
+broadcom-wl
+tp_smapi
+r8168
+virtualbox-modules-artix
+linux-lts
+nvidia-lts
+acpi_call-lts
+bbswitch-lts
+broadcom-wl-lts
+tp_smapi-lts
+r8168-lts
+linux-firmware

data/pkglists/lxqt.list

@@ -0,0 +1,31 @@
+lxqt-about
+lxqt-admin
+lxqt-config
+lxqt-globalkeys
+lxqt-notificationd
+lxqt-openssh-askpass
+lxqt-panel
+lxqt-policykit
+lxqt-powermanagement
+lxqt-qtplugin
+lxqt-runner
+lxqt-session
+lxqt-sudo
+lxqt-themes
+lxqt-build-tools
+
+compton-conf
+lximage-qt
+obconf-qt
+openbox
+pcmanfm-qt
+qterminal
+liblxqt
+libqtxdg
+lxmenu-data
+libfm-qt
+libfm
+qtermwidget
+libsysstat
+libstatgrab
+qps

data/pkglists/xorg.list

@@ -0,0 +1,37 @@
+libdmx
+libfontenc
+libice
+libpciaccess
+libsm
+libx11
+libxau
+libxaw
+libxcomposite
+libxcursor
+libxdamage
+libxdmcp
+libxext
+libxfixes
+libxfont2
+libxi|libxft
+libxinerama
+libxkbfile
+libxkbui
+libxmu
+libxpm
+libxrandr
+libxrender
+libxres
+libxshmfence
+libxss
+libxt
+libxtst
+libxv
+libxvmc
+libxxf86vm
+pixman
+xbitmaps
+xkeyboard-config
+xorgproto
+xterm
+xtrans

data/valid-names.conf

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

lib/base/chroot-version.sh

@@ -1,3 +0,0 @@
-#!/hint/bash
-
-CHROOTVERSION=0.10

lib/base/chroot.sh

@@ -1,20 +1,16 @@
-#!/hint/bash
+#!/bin/bash
-
+#
-#{{{ chroot
+# Copyright (C) 2018-19 artoo@artixlinux.org
-
+# Copyright (C) 2018 Artix Linux Developers
-orig_argv=("$0" "$@")
+#
-check_root() {
+# This program is free software; you can redistribute it and/or modify
-    local keepenv="$1"
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation; version 2 of the License.
-    (( EUID == 0 )) && return
+#
-    if type -P sudo >/dev/null; then
+# This program is distributed in the hope that it will be useful,
-        # shellcheck disable=2154
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-        exec sudo --preserve-env="$keepenv" -- "${orig_argv[@]}"
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    else
+# GNU General Public License for more details.
-        # shellcheck disable=2154
-        exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
-    fi
-}
 
 is_btrfs() {
     [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
@@ -24,9 +20,9 @@ is_subvolume() {
     [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs && "$(stat -c %i "$1")" == 256 ]]
 }
 
-# is_same_fs() {
+is_same_fs() {
-#     [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]]
+    [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]]
-# }
+}
 
 subvolume_delete_recursive() {
     local subvol
@@ -46,4 +42,19 @@ subvolume_delete_recursive() {
     return 0
 }
 
-# }}}
+# $1: chroot
+kill_chroot_process(){
+    local prefix="$1" flink pid name
+    for root_dir in /proc/*/root; do
+        flink=$(readlink $root_dir)
+        if [ "x$flink" != "x" ]; then
+            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
+                # this process is in the chroot...
+                pid=$(basename $(dirname "$root_dir"))
+                name=$(ps -p $pid -o comm=)
+                info "Killing chroot process: %s (%s)" "$name" "$pid"
+                kill -9 "$pid"
+            fi
+        fi
+    done
+}

lib/base/common.sh

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

lib/base/fstab.sh

@@ -0,0 +1,213 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+declare -A pseudofs_types=([anon_inodefs]=1
+                        [autofs]=1
+                        [bdev]=1
+                        [bpf]=1
+                        [binfmt_misc]=1
+                        [cgroup]=1
+                        [cgroup2]=1
+                        [configfs]=1
+                        [cpuset]=1
+                        [debugfs]=1
+                        [devfs]=1
+                        [devpts]=1
+                        [devtmpfs]=1
+                        [dlmfs]=1
+                        [efivarfs]=1
+                        [fuse.gvfs-fuse-daemon]=1
+                        [fusectl]=1
+                        [hugetlbfs]=1
+                        [mqueue]=1
+                        [nfsd]=1
+                        [none]=1
+                        [pipefs]=1
+                        [proc]=1
+                        [pstore]=1
+                        [ramfs]=1
+                        [rootfs]=1
+                        [rpc_pipefs]=1
+                        [securityfs]=1
+                        [sockfs]=1
+                        [spufs]=1
+                        [sysfs]=1
+                        [tmpfs]=1)
+
+declare -A fsck_types=([cramfs]=1
+                    [exfat]=1
+                    [ext2]=1
+                    [ext3]=1
+                    [ext4]=1
+                    [ext4dev]=1
+                    [jfs]=1
+                    [minix]=1
+                    [msdos]=1
+                    [reiserfs]=1
+                    [vfat]=1
+                    [xfs]=1)
+
+fstype_is_pseudofs() {
+    (( pseudofs_types["$1"] ))
+}
+
+fstype_has_fsck() {
+    (( fsck_types["$1"] ))
+}
+
+valid_number_of_base() {
+    local base=$1 len=${#2} i=
+
+    for (( i = 0; i < len; i++ )); do
+        { _=$(( $base#${2:i:1} )) || return 1; } 2>/dev/null
+    done
+
+    return 0
+}
+
+mangle() {
+    local i= chr= out=
+
+    local {a..f}= {A..F}=
+
+    for (( i = 0; i < ${#1}; i++ )); do
+        chr=${1:i:1}
+        case $chr in
+            [[:space:]\\])
+                printf -v chr '%03o' "'$chr"
+                out+=\\
+            ;;
+        esac
+        out+=$chr
+    done
+
+    printf '%s' "$out"
+}
+
+unmangle() {
+    local i= chr= out= len=$(( ${#1} - 4 ))
+
+    local {a..f}= {A..F}=
+
+    for (( i = 0; i < len; i++ )); do
+        chr=${1:i:1}
+        case $chr in
+            \\)
+                if valid_number_of_base 8 "${1:i+1:3}" ||
+                    valid_number_of_base 16 "${1:i+1:3}"; then
+                    printf -v chr '%b' "${1:i:4}"
+                    (( i += 3 ))
+                fi
+            ;;
+        esac
+        out+=$chr
+    done
+
+    printf '%s' "$out${1:i}"
+}
+
+dm_name_for_devnode() {
+    read dm_name <"/sys/class/block/${1#/dev/}/dm/name"
+    if [[ $dm_name ]]; then
+        printf '/dev/mapper/%s' "$dm_name"
+    else
+        # don't leave the caller hanging, just print the original name
+        # along with the failure.
+        print '%s' "$1"
+        error 'Failed to resolve device mapper name for: %s' "$1"
+    fi
+}
+
+optstring_match_option() {
+    local candidate pat patterns
+
+    IFS=, read -ra patterns <<<"$1"
+    for pat in "${patterns[@]}"; do
+        if [[ $pat = *=* ]]; then
+            # "key=val" will only ever match "key=val"
+            candidate=$2
+        else
+            # "key" will match "key", but also "key=anyval"
+            candidate=${2%%=*}
+        fi
+
+        [[ $pat = "$candidate" ]] && return 0
+    done
+
+    return 1
+}
+
+optstring_remove_option() {
+    local o options_ remove=$2 IFS=,
+
+    read -ra options_ <<<"${!1}"
+
+    for o in "${!options_[@]}"; do
+        optstring_match_option "$remove" "${options_[o]}" && unset 'options_[o]'
+    done
+
+    declare -g "$1=${options_[*]}"
+}
+
+optstring_normalize() {
+    local o options_ norm IFS=,
+
+    read -ra options_ <<<"${!1}"
+
+    # remove empty fields
+    for o in "${options_[@]}"; do
+        [[ $o ]] && norm+=("$o")
+    done
+
+    # avoid empty strings, reset to "defaults"
+    declare -g "$1=${norm[*]:-defaults}"
+}
+
+optstring_append_option() {
+    if ! optstring_has_option "$1" "$2"; then
+        declare -g "$1=${!1},$2"
+    fi
+
+    optstring_normalize "$1"
+}
+
+optstring_prepend_option() {
+    local options_=$1
+
+    if ! optstring_has_option "$1" "$2"; then
+        declare -g "$1=$2,${!1}"
+    fi
+
+    optstring_normalize "$1"
+}
+
+optstring_get_option() {
+    local opts o
+
+    IFS=, read -ra opts <<<"${!1}"
+    for o in "${opts[@]}"; do
+        if optstring_match_option "$2" "$o"; then
+            declare -g "$o"
+            return 0
+        fi
+    done
+
+    return 1
+}
+
+optstring_has_option() {
+    local "${2%%=*}"
+
+    optstring_get_option "$1" "$2"
+}

lib/base/message.sh

@@ -1,31 +1,37 @@
-#!/hint/bash
+#!/bin/bash
-
+#
-#{{{ message
+# Copyright (C) 2018-19 artoo@artixlinux.org
-
+# Copyright (C) 2018 Artix Linux Developers
-#set +u +o posix
+#
-
+# This program is free software; you can redistribute it and/or modify
-# shellcheck disable=1091
+# it under the terms of the GNU General Public License as published by
-. /usr/share/makepkg/util.sh
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
+# export LC_MESSAGES=C
 export LANG=C
 
-shopt -s extglob
+if [[ -t 2 ]]; then
-
-if [[ -t 2 && "$TERM" != dumb ]]; then
     colorize
 else
-    # shellcheck disable=2034
     declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi
 
+info() {
+    local mesg=$1; shift
+    printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
 stat_busy() {
     local mesg=$1; shift
-    # shellcheck disable=2059
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
 stat_done() {
-    # shellcheck disable=2059
     printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
@@ -39,9 +45,9 @@ lock() {
         mkdir -p -- "$(dirname -- "$2")"
         eval "exec $1>"'"$2"'
     fi
-    if ! flock -n "$1"; then
+    if ! flock -n $1; then
         stat_busy "$3"
-        flock "$1"
+        flock $1
         stat_done
     fi
 }
@@ -51,9 +57,9 @@ slock() {
         mkdir -p -- "$(dirname -- "$2")"
         eval "exec $1>"'"$2"'
     fi
-    if ! flock -sn "$1"; then
+    if ! flock -sn $1; then
         stat_busy "$3"
-        flock -s "$1"
+        flock -s $1
         stat_done
     fi
 }
@@ -94,4 +100,28 @@ 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,19 +1,54 @@
-#!/hint/bash
+#!/bin/bash
-
+#
-#{{{ mount
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
 ignore_error() {
     "$@" 2>/dev/null
     return 0
 }
 
+parse_fstab(){
+    echo $(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' $1/etc/fstab)
+# 	perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^/dev#;' $1/etc/fstab
+# 	perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^LABEL=#;' $1/etc/fstab
+}
+
+detect(){
+    local detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
+    echo ${detected}
+}
+
+# $1: os-prober array
+get_os_name(){
+    local str=$1
+    str="${str#*:}"
+    str="${str#*:}"
+    str="${str%:*}"
+    echo "$str"
+}
+
+chroot_part_mount() {
+    info "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
+}
+
 trap_setup(){
     [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
     trap "$1" EXIT
 }
 
 chroot_mount() {
-#     msg2 "mount: [%s]" "$2"
+#     info "mount: [%s]" "$2"
     mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
 }
 
@@ -53,8 +88,8 @@ chroot_mount_conditional() {
 }
 
 chroot_setup(){
-    local mnt="$1" os="$2" args='-t tmpfs -o nosuid,nodev,mode=0755'
+    local mnt="$1" os="$2" run_args='-t tmpfs -o nosuid,nodev,mode=0755'
-    $os && args='--bind'
+    $os && run_args='--bind'
     chroot_mount_conditional "! mountpoint -q '$mnt'" "$mnt" "$mnt" --bind &&
     chroot_mount proc "$mnt/proc" -t proc -o nosuid,noexec,nodev &&
     chroot_mount sys "$mnt/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
@@ -63,10 +98,33 @@ chroot_setup(){
     chroot_mount udev "$mnt/dev" -t devtmpfs -o mode=0755,nosuid &&
     chroot_mount devpts "$mnt/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
     chroot_mount shm "$mnt/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount /run "$mnt/run" ${args} &&
+    chroot_mount /run "$mnt/run" ${run_args} &&
     chroot_mount tmp "$mnt/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
 }
 
+mount_os(){
+    CHROOT_ACTIVE_PART_MOUNTS=()
+    CHROOT_ACTIVE_MOUNTS=()
+
+    trap_setup chroot_part_umount
+
+    chroot_part_mount "$2" "$1"
+
+    local mounts=$(parse_fstab "$1")
+
+    for entry in ${mounts[@]}; do
+        entry=${entry//UUID=}
+        local dev=${entry%:*} mp=${entry#*:}
+        case "${entry#*:}" in
+            '/'|'swap'|'none') continue ;;
+            *) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
+        esac
+    done
+
+    chroot_setup "$1" true
+    chroot_add_resolv_conf "$1"
+}
+
 chroot_api_mount() {
     CHROOT_ACTIVE_MOUNTS=()
     trap_setup chroot_api_umount
@@ -75,10 +133,16 @@ chroot_api_mount() {
 
 chroot_api_umount() {
     if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
-#         msg2 "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+#         info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
         umount "${CHROOT_ACTIVE_MOUNTS[@]}"
     fi
     unset CHROOT_ACTIVE_MOUNTS
 }
 
-#}}}
+chroot_part_umount() {
+    chroot_api_umount
+    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    unset CHROOT_ACTIVE_PART_MOUNTS
+}
+

lib/base/util.sh

@@ -0,0 +1,190 @@
+#!/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)"
+}
+
+load_vars() {
+    local var
+
+    [[ -f $1 ]] || return 1
+
+    for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER CARCH GPGKEY; do
+        [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$1")"
+    done
+
+    return 0
+}
+
+prepare_dir(){
+    [[ ! -d $1 ]] && mkdir -p $1
+}
+
+get_disturl(){
+    . /usr/lib/os-release
+    echo "${HOME_URL}"
+}
+
+get_osname(){
+    . /usr/lib/os-release
+    echo "${NAME}"
+}
+
+init_artools_base(){
+
+    ARCH=$(uname -m)
+
+    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
+
+    WORKSPACE_DIR=${WORKSPACE_DIR:-"/home/${OWNER}/artools-workspace"}
+
+    prepare_dir "${WORKSPACE_DIR}"
+}
+
+init_artools_pkg(){
+
+    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"}
+
+    [[ -z ${TREE_NAMES_ARTIX[@]} ]] && \
+    TREE_NAMES_ARTIX=(
+        packages
+        community
+        packages-kernel
+        packages-openrc
+        packages-runit
+        packages-xorg
+        packages-python
+        packages-perl
+        packages-qt5
+        packages-ruby
+#         packages-desktop
+#         packages-kde
+#         packages-gnome
+    )
+
+    HOST_TREE_ARTIX=${HOST_TREE_ARTIX:-"gitea@${GIT_DOMAIN}:artixlinux"}
+
+    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
+
+    TREE_NAMES_ARCH=(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}"}
+}
+
+init_artools_iso(){
+    CHROOTS_ISO="${CHROOTS_DIR}/buildiso"
+
+    ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
+
+    prepare_dir "${ISO_POOL}"
+
+    PROFILE='base'
+
+    ISO_VERSION=${ISO_VERSION:-"$(date +%Y%m%d)"}
+
+    INITSYS=${INITSYS:-'openrc'}
+
+    UPLIMIT=${UPLIMIT:-1000}
+
+    FILE_HOST="download.${DOMAIN}"
+
+    FILE_HOME=${FILE_HOME:-'/srv/iso'}
+
+    FILE_PORT=${FILE_PORT:-65432}
+
+    ACCOUNT=${ACCOUNT:-'naughtyISOuploader'}
+}
+
+load_config(){
+
+    local conf="$1"
+
+    [[ -f "$conf" ]] || return 1
+
+    [[ -r "$conf" ]] && . "$conf"
+
+    init_artools_base
+
+    init_artools_pkg
+
+    init_artools_iso
+
+    return 0
+}
+
+user_own(){
+    local flag=$2
+    chown ${flag} "${OWNER}:$(id --group ${OWNER})" "$1"
+}
+
+user_run(){
+    su ${OWNER} -c "$@"
+}
+
+load_user_info(){
+    OWNER=${SUDO_USER:-$USER}
+
+    if [[ -n $SUDO_USER ]]; then
+        eval "USER_HOME=~$SUDO_USER"
+    else
+        USER_HOME=$HOME
+    fi
+
+    USERCONFDIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}"
+    prepare_dir "${USERCONFDIR}"
+
+    USERCACHEDIR="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
+}
+
+# orig_argv=("$0" "$@")
+check_root() {
+    local keepenv=$1
+
+    (( EUID == 0 )) && return
+    if type -P sudo >/dev/null; then
+        exec sudo --preserve-env=$keepenv -- "${orig_argv[@]}"
+    else
+        exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
+    fi
+}

lib/base/yaml.sh

@@ -1,13 +1,23 @@
-#!/hint/bash
+#!/bin/bash
-
+#
-#{{{ yaml
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
 write_yaml_header(){
-    printf '%s\n' '---'
+    printf '%s' '---'
 }
 
 write_empty_line(){
-    printf '\n'
+    printf '\n%s\n' ' '
 }
 
 write_yaml_map(){
@@ -24,5 +34,3 @@ write_yaml_seq_map(){
     local ident="$1" key="$2" val="$3"
     printf "\n%${ident}s- %s: %s\n" '' "$key" "$val"
 }
-
-#}}}

lib/iso/calamares.sh

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

lib/iso/chrootcfg.sh

@@ -0,0 +1,172 @@
+#!/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_rc(){
+    local mnt="$1" name="$2" rlvl="$3"
+    if [[ -f $mnt/etc/init.d/$name ]];then
+        msg2 "Setting %s ..." "$name"
+        chroot $mnt rc-update add $name $rlvl &>/dev/null
+    fi
+}
+
+add_svc_runit(){
+    local mnt="$1" name="$2"
+    if [[ -d $mnt/etc/runit/sv/$name ]]; then
+        msg2 "Setting %s ..." "$name"
+        chroot $mnt ln -s /etc/runit/sv/$name /etc/runit/runsvdir/default &>/dev/null
+    fi
+}
+
+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]" "${INITSYS}"
+    case ${INITSYS} in
+        'openrc')
+            for svc in ${SERVICES[@]}; do
+                [[ $svc == "xdm" ]] && set_xdm "$mnt"
+                add_svc_rc "$mnt" "$svc" "default"
+            done
+            for svc in ${SERVICES_LIVE[@]}; do
+                add_svc_rc "$mnt" "$svc" "default"
+            done
+        ;;
+        'runit')
+            for svc in ${SERVICES[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+            for svc in ${SERVICES_LIVE[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+        ;;
+    esac
+    info "Done configuring [%s]" "${INITSYS}"
+}
+
+configure_system(){
+    local mnt="$1"
+    case ${INITSYS} in
+        'openrc' | 'runit')
+            configure_logind "$mnt" "elogind"
+        ;;
+    esac
+    echo ${HOST_NAME} > $mnt/etc/hostname
+}
+
+write_users_conf(){
+    local yaml=$(write_yaml_header)
+    yaml+=$(write_empty_line)
+    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_servicescfg_conf(){
+    local yaml=$(write_yaml_header)
+    yaml+=$(write_empty_line)
+    case "${INITSYS}" in
+        'runit')
+            yaml+=$(write_yaml_map 0 'svDir' '/etc/runit/sv')
+            yaml+=$(write_yaml_map 0 'runsvDir' '/etc/runit/runsvdir')
+            yaml+=$(write_yaml_map 0 'services')
+            yaml+=$(write_yaml_map 2 'enabled')
+            for svc in ${SERVICES[@]};do
+                yaml+=$(write_yaml_seq_map 4 'name' "$svc")
+                yaml+=$(write_yaml_map 6 'runlevel' 'default')
+            done
+        ;;
+        'openrc')
+            yaml+=$(write_yaml_map 0 'initdDir' '/etc/init.d')
+            yaml+=$(write_yaml_map 0 'runlevelsDir' '/etc/runlevels')
+            yaml+=$(write_yaml_map 0 'services')
+            for svc in ${SERVICES[@]};do
+                yaml+=$(write_yaml_seq_map 2 'name' "$svc")
+                yaml+=$(write_yaml_map 4 'runlevel' 'default')
+            done
+        ;;
+    esac
+    yaml+=$(write_empty_line)
+    printf '%s' "${yaml}"
+}
+
+write_unpackfs_conf(){
+    local yaml=$(write_yaml_header)
+    yaml+=$(write_empty_line)
+    yaml+=$(write_yaml_map 0 'unpack')
+    yaml+=$(write_yaml_seq_map 2 'source' "/run/artix/bootmnt/artix/x86_64/rootfs.sfs")
+    yaml+=$(write_yaml_map 4 'sourcefs' 'squashfs')
+    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_servicescfg_conf > "$mods"/services-"${INITSYS}".conf
+        write_unpackfs_conf > "$mods"/unpackfs.conf
+        sed -e "s|openrc|${INITSYS}|" -i "$mods"/postcfg.conf
+        sed -e "s|services-openrc|services-${INITSYS}|" -i "$1"/etc/calamares/settings.conf
+    fi
+}
+
+configure_live_image(){
+    local fs="$1"
+    msg "Configuring [livefs]"
+    configure_hosts "$fs"
+    configure_system "$fs"
+    configure_services "$fs"
+    configure_calamares "$fs"
+    [[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
+    write_live_session_conf > "$fs/etc/artools/live.conf"
+    msg "Done configuring [livefs]"
+}

lib/iso/config.sh

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

lib/iso/dracut.sh

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

lib/iso/firmware.sh

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

lib/iso/grub.sh

@@ -1,61 +1,100 @@
-#!/hint/bash
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-#{{{ grub
+prepare_initramfs(){
+    local src="$1" dest="$2"
+    local kver=$(cat $src/usr/lib/modules/extramodules-ARTIX/version)
+
+    dracut -fqM $dest/initramfs-${ARCH}.img $kver
+}
+
+prepare_boot_extras(){
+    local src="$1" dest="$2"
+
+    for u in intel amd;do
+        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+    done
+
+    cp $src/boot/memtest86+/memtest.bin $dest/memtest
+    cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
+}
+
+configure_grub(){
+    local conf="$1/boot/grub/kernels.cfg"
+    sed -e "s|@iso_label@|${iso_label}|" -i $conf
+
+#     rd.vconsole.keymap=
+#     rd.live.overlay.size=
+#     root=live:<URL>
+#     rd.live.ram=1
+#     rd.live.overlay.readonly
+#     rd.live.overlay=none
+#     rd.writable.fsimg=1
+#      rd.live.dir=<path>
+#       rd.live.squashimg=<filename of SquashFS image>
+#       rd.live.overlay.overlayfs=1
+}
 
 prepare_grub(){
-    local platform=i386-pc img='core.img' prefix=/boot/grub
+    local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
-    local lib="$1"/usr/lib/grub
+        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub
-    local theme="$1"/usr/share/grub
-    local livecfg="$2"/usr/share/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 ${theme}/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 ${efi}
-    prepare_dir "${grub}/${platform}"
+    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 "${theme}"/themes/artix "${grub}"/themes
+    cp -r ${theme}/{locales,tz} ${grub}
-    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"
+    local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
-    truncate -s "${size}" "${efi_img}"
+    truncate -s ${size} "${efi_img}"
     mkfs.fat -n ARTIX_EFI "${efi_img}" &>/dev/null
     prepare_dir "${mnt}"
     mount_img "${efi_img}" "${mnt}"
-    prepare_dir "${mnt}"/efi/boot
+    prepare_dir ${mnt}/efi/boot
     msg2 "Building %s ..." "${img}"
-    grub-mkimage -d "${grub}/${platform}" -o "${mnt}"/efi/boot/"${img}" -O "${platform}" -p "${prefix}" iso9660
+    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660
     umount_img "${mnt}"
 }
-
-#}}}

lib/iso/initcpio.sh

@@ -1,72 +0,0 @@
-#!/hint/bash
-
-#{{{ initcpio
-
-make_checksum(){
-    local file="$1"
-    msg2 "Creating md5sum ..."
-    cd "${iso_root}${live_dir}"
-    md5sum "$file" > "$file".md5
-    cd "${OLDPWD}"
-}
-
-make_sig () {
-    local file="$1"
-    msg2 "Creating signature file..."
-    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
-    su "${owner}" -c "gpg --detach-sign --output $file.sig --default-key ${GPG_KEY} $file"
-    chown "root:root" "${iso_root}${live_dir}"
-}
-
-export_gpg_publickey() {
-    key_export=${WORKSPACE_DIR}/pubkey.gpg
-    if [[ ! -e "${key_export}" ]]; then
-        gpg --batch --output "${key_export}" --export "${GPG_KEY}"
-    fi
-}
-
-prepare_initramfs_mkinitcpio() {
-    local mnt="$1" packages=() mkinitcpio_conf k
-
-    mkinitcpio_conf=mkinitcpio-default.conf
-    [[ "${profile}" == 'base' ]] && mkinitcpio_conf=mkinitcpio-pxe.conf
-    k=$(<"$mnt"/usr/src/linux/version)
-
-    read_from_list "${common_dir}/Packages-boot"
-    basestrap "${basestrap_args[@]}" "$mnt" "${packages[@]}"
-
-    if [[ -n "${GPG_KEY}" ]]; then
-        exec {ARTIX_GNUPG_FD}<>"${key_export}"
-        export ARTIX_GNUPG_FD
-    fi
-
-    artix-chroot "$mnt" mkinitcpio -k "$k" \
-        -c /etc/"$mkinitcpio_conf" \
-        -g /boot/initramfs.img
-
-    if [[ -n "${GPG_KEY}" ]]; then
-        exec {ARTIX_GNUPG_FD}<&-
-        unset ARTIX_GNUPG_FD
-    fi
-    if [[ -f "${key_export}" ]]; then
-        rm "${key_export}"
-    fi
-    cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img
-    prepare_boot_extras "$mnt"
-}
-
-configure_grub_mkinitcpio() {
-    msg "Configuring grub kernel options ..."
-    local ro_opts=()
-    local rw_opts=()
-    local kopts=("label=${iso_label}")
-
-    [[ "${profile}" != 'base' ]] && kopts+=('overlay=livefs')
-
-    sed -e "s|@kopts@|${kopts[*]}|" \
-        -e "s|@ro_opts@|${ro_opts[*]}|" \
-        -e "s|@rw_opts@|${rw_opts[*]}|" \
-        -i "${iso_root}"/boot/grub/kernels.cfg
-}
-
-#}}}

lib/iso/iso.sh

@@ -1,50 +1,124 @@
-#!/hint/bash
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-#{{{ iso
+gen_iso_fn(){
-
+    local vars=("artix") name
-get_disturl(){
+    vars+=("${PROFILE}")
-    # shellcheck disable=1091
+    vars+=("${INITSYS}")
-    . /usr/lib/os-release
+    case "${REPOSITORY}" in
-    printf "%s\n" "${HOME_URL}"
+        'gremlins'|'goblins') vars+=("${REPOSITORY}") ;;
+    esac
+    vars+=("${ISO_VERSION}")
+    vars+=("${ARCH}")
+    for n in ${vars[@]};do
+        name=${name:-}${name:+-}${n}
+    done
+    echo $name
 }
 
-get_osname(){
+clean_iso_root(){
-    # shellcheck disable=1091
+    local dest="$1"
-    . /usr/lib/os-release
+    msg "Deleting isoroot [%s] ..." "${dest##*/}"
-    printf "%s\n" "${NAME}"
+    rm -rf --one-file-system "$dest"
+}
+
+# $1: image path
+make_sfs() {
+    local src="$1"
+    if [[ ! -e "${src}" ]]; then
+        error "The path %s does not exist" "${src}"
+        retrun 1
+    fi
+    local timer=$(get_timer) dest=${iso_root}/artix/${ARCH}
+    local name=${1##*/}
+    local sfs="${dest}/${name}.sfs"
+    mkdir -p ${dest}
+    msg "Generating SquashFS image for %s" "${src}"
+    if [[ -f "${sfs}" ]]; then
+        local has_changed_dir=$(find ${src} -newer ${sfs})
+        msg2 "Possible changes for %s ..." "${src}"  >> /tmp/buildiso.debug
+        msg2 "%s" "${has_changed_dir}" >> /tmp/buildiso.debug
+        if [[ -n "${has_changed_dir}" ]]; then
+            msg2 "SquashFS image %s is not up to date, rebuilding..." "${sfs}"
+            rm "${sfs}"
+        else
+            msg2 "SquashFS image %s is up to date, skipping." "${sfs}"
+            return
+        fi
+    fi
+
+    if ${persist};then
+        local size=32G
+        local mnt="${mnt_dir}/${name}"
+        msg2 "Creating ext4 image of %s ..." "${size}"
+        truncate -s ${size} "${src}.img"
+        local ext4_args=()
+        ext4_args+=(-O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0)
+        mkfs.ext4 ${ext4_args[@]} -F "${src}.img" &>/dev/null
+        tune2fs -c 0 -i 0 "${src}.img" &> /dev/null
+        mount_img "${work_dir}/${name}.img" "${mnt}"
+        msg2 "Copying %s ..." "${src}/"
+        cp -aT "${src}/" "${mnt}/"
+        umount_img "${mnt}"
+
+    fi
+
+    msg2 "Creating SquashFS image, this may take some time..."
+    local mksfs_args=()
+    if ${persist};then
+        mksfs_args+=(${work_dir}/${name}.img)
+    else
+        mksfs_args+=(${src})
+    fi
+
+    mksfs_args+=(${sfs} -noappend)
+
+    local highcomp="-b 256K -Xbcj x86" comp='xz'
+
+    mksfs_args+=(-comp ${comp} ${highcomp})
+
+    mksquashfs "${mksfs_args[@]}"
+
+    ${persist} && rm "${src}.img"
+
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
 assemble_iso(){
     msg "Creating ISO image..."
-    local mod_date
+    local mod_date=$(date -u +%Y-%m-%d-%H-%M-%S-00  | sed -e s/-//g)
-    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}" \
+        -appid "$(get_osname) Live/Rescue CD" \
-        -publisher "${publisher}" \
+        -publisher "$(get_osname) <$(get_disturl)>" \
         -preparer "Prepared by artools/${0##*/}" \
         -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}/efi.img \
         -e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
         -no-emul-boot \
         -iso-level 3 \
-        -o "${iso_dir}/${iso_file}" \
+        -o ${iso_dir}/${iso_file} \
-        "${iso_root}"/
+        ${iso_root}/
 }
-
-#}}}

lib/iso/mount.sh

@@ -1,9 +1,19 @@
-#!/hint/bash
+#!/bin/bash
-
+#
-#{{{ mount
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
 track_img() {
-    msg2 "mount: [%s]" "$2"
+    info "mount: [%s]" "$2"
     mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
 }
 
@@ -14,8 +24,8 @@ mount_img() {
 }
 
 umount_img() {
-    if [[ -n "${IMG_ACTIVE_MOUNTS[*]}" ]];then
+    if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
-        msg2 "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
+        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
         umount "${IMG_ACTIVE_MOUNTS[@]}"
         unset IMG_ACTIVE_MOUNTS
         rm -r "$1"
@@ -23,33 +33,29 @@ umount_img() {
 }
 
 track_fs() {
-    msg2 "overlayfs mount: [%s]" "$5"
+    info "overlayfs mount: [%s]" "$5"
     mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
 }
 
-mount_overlayfs(){
+mount_overlay(){
     FS_ACTIVE_MOUNTS=()
-    local lower upper="$1" work="$2"
+    local lower= upper="$1" work="$2"
+    local fs=${upper##*/}
+    local rootfs="$work/rootfs" livefs="$work/livefs"
     mkdir -p "${mnt_dir}/work"
     mkdir -p "$upper"
-    case $upper in
+    case $fs in
-        */livefs) lower="$work/rootfs" ;;
+        livefs) lower="$rootfs" ;;
-        */bootfs)
+        bootfs) lower="$livefs":"$rootfs" ;;
-            lower="$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(){
+umount_overlay(){
-    if [[ -n "${FS_ACTIVE_MOUNTS[*]}" ]];then
+    if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
-        msg2 "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
+        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
         umount "${FS_ACTIVE_MOUNTS[@]}"
         unset FS_ACTIVE_MOUNTS
         rm -rf "${mnt_dir}/work"
     fi
 }
-
-#}}}

lib/iso/profile.sh

@@ -1,86 +1,116 @@
-#!/hint/bash
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-#{{{ profile
+init_profile(){
+    local profdir="$1" prof="$2"
+
+    ROOT_LIST="$profdir/base/Packages-Root"
+    ROOT_OVERLAY="$profdir/base/root-overlay"
+    LIVE_LIST="$profdir/base/Packages-Live"
+    LIVE_OVERLAY="$profdir/base/live-overlay"
+
+    [[ -f "$profdir/$prof/Packages-Root" ]] && ROOT_LIST="$profdir/$prof/Packages-Root"
+    [[ -d "$profdir/$prof/root-overlay" ]] && ROOT_OVERLAY="$profdir/$prof/root-overlay"
+
+    [[ -f "$profdir/$prof/Packages-Live" ]] && LIVE_LIST="$profdir/$prof/Packages-Live"
+    [[ -d "$profdir/$prof/live-overlay" ]] && LIVE_OVERLAY="$profdir/$prof/live-overlay"
+}
 
 show_profile(){
     msg2 "iso_file: %s" "${iso_file}"
     msg2 "AUTOLOGIN: %s" "${AUTOLOGIN}"
+    msg2 "HOST_NAME: %s" "${HOST_NAME}"
+    msg2 "USER_NAME: %s" "${USER_NAME}"
     msg2 "PASSWORD: %s" "${PASSWORD}"
+    msg2 "ADDGROUPS: %s" "${ADDGROUPS}"
+    msg2 "SERVICES_LIVE: %s" "${SERVICES_LIVE[*]}"
     msg2 "SERVICES: %s" "${SERVICES[*]}"
 }
 
 load_profile(){
-    local profile_dir="${DATADIR}/iso-profiles"
+    local prof="$1"
-    [[ -d "${WORKSPACE_DIR}"/iso-profiles ]] && profile_dir="${WORKSPACE_DIR}"/iso-profiles
+    local profdir="${DATADIR}/iso-profiles"
+    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profdir=${WORKSPACE_DIR}/iso-profiles
 
-    root_list="$profile_dir/${profile}/Packages-Root"
+    init_profile "$profdir" "$prof"
-    root_overlay="$profile_dir/${profile}/root-overlay"
 
-    [[ -f "$profile_dir/${profile}/Packages-Live" ]] && live_list="$profile_dir/${profile}/Packages-Live"
+    [[ -f $profdir/$prof/profile.conf ]] || return 1
-    [[ -d "$profile_dir/${profile}/live-overlay" ]] && live_overlay="$profile_dir/${profile}/live-overlay"
 
-    common_dir="${DATADIR}/iso-profiles/common"
+    [[ -r $profdir/$prof/profile.conf ]] && . $profdir/$prof/profile.conf
-    [[ -d "$profile_dir"/common ]] && common_dir="${profile_dir}"/common
 
-    [[ -f $profile_dir/${profile}/profile.conf ]] || return 1
+    DISPLAYMANAGER=${DISPLAYMANAGER:-'none'}
 
-    # shellcheck disable=1090
+    AUTOLOGIN=${AUTOLOGIN:-"true"}
-    [[ -r "$profile_dir/${profile}"/profile.conf ]] && . "$profile_dir/${profile}"/profile.conf
+    [[ ${DISPLAYMANAGER} == 'none' ]] && AUTOLOGIN="false"
 
-    AUTOLOGIN=${AUTOLOGIN:-true}
+    HOST_NAME=${HOST_NAME:-'artix'}
+
+    USER_NAME=${USER_NAME:-'artix'}
 
     PASSWORD=${PASSWORD:-'artix'}
 
-    if [[ -z "${SERVICES[*]}" ]];then
+    ADDGROUPS=${ADDGROUPS:-"video,power,optical,network,lp,scanner,wheel,users,log"}
-        SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+
+    if [[ -z ${SERVICES[@]} ]];then
+        SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+    fi
+
+    if [[ ${DISPLAYMANAGER} != "none" ]];then
+        case "${INITSYS}" in
+            'openrc') SERVICES+=('xdm') ;;
+            'runit') SERVICES+=("${DISPLAYMANAGER}") ;;
+        esac
+    fi
+
+    if [[ -z ${SERVICES_LIVE[@]} ]];then
+        SERVICES_LIVE=('artix-live' 'pacman-init')
     fi
 
     return 0
 }
 
-read_from_list() {
+write_live_session_conf(){
-    local list="$1"
+    msg2 "Writing live.conf"
-    local _space="s| ||g"
+    local conf=''
-    local _clean=':a;N;$!ba;s/\n/ /g'
+    conf+=$(printf '%s\n' '# live session configuration')
-    local _com_rm="s|#.*||g"
+    conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
-
+    conf+=$(printf "\nUSER_NAME=%s\n" "${USER_NAME}")
-    local _init="s|@initsys@|${INITSYS}|g"
+    conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
-
+    conf+=$(printf "\nADDGROUPS='%s'\n" "${ADDGROUPS}")
-    msg2 "Loading Packages: [%s] ..." "${list##*/}"
+    printf '%s' "$conf"
-    packages+=($(sed "$_com_rm" "$list" \
-            | sed "$_space" \
-            | sed "$_init" \
-            | sed "$_clean"))
-}
-
-read_from_services() {
-    for svc in "${SERVICES[@]}"; do
-        case "$svc" in
-            sddm|gdm|lightdm|mdm|greetd|lxdm|xdm)
-                packages+=("$svc-${INITSYS}"); display_manager="$svc" ;;
-            NetworkManager) packages+=("networkmanager-${INITSYS}") ;;
-            connmand) packages+=("connman-${INITSYS}") ;;
-            cupsd) packages+=("cups-${INITSYS}") ;;
-            bluetoothd) packages+=("bluez-${INITSYS}") ;;
-            syslog-ng|metalog) packages+=("$svc-${INITSYS}") ;;
-        esac
-    done
 }
 
 load_pkgs(){
-    local pkglist="$1"
+    local pkglist="$1" init="$2"
-    packages=()
+    info "Loading Packages: [%s] ..." "${pkglist##*/}"
 
-    if [[ "${pkglist##*/}" == "Packages-Root" ]]; then
+    local _init="s|@$init||g"
-        read_from_list "${common_dir}/Packages-base"
+    case "$init" in
-        read_from_list "${common_dir}/Packages-apps"
+        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6*||g" ;;
-        read_from_list "${common_dir}/Packages-${INITSYS}"
+        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
-        [[ -n "${live_list}" ]] && read_from_list "${common_dir}/Packages-xorg"
+        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
-        read_from_list "$pkglist"
+    esac
-        read_from_services
+
-    else
+    local _space="s| ||g" \
-        read_from_list "$pkglist"
+        _clean=':a;N;$!ba;s/\n/ /g' \
-    fi
+        _com_rm="s|#.*||g"
+
+    packages=($(sed "$_com_rm" "$pkglist" \
+            | sed "$_space" \
+            | sed "$_purge" \
+            | sed "$_init" \
+            | sed "$_init_rm1" \
+            | sed "$_init_rm2" \
+            | sed "$_clean"))
 }
-
-#}}}

lib/iso/services.sh

@@ -1,68 +0,0 @@
-#!/hint/bash
-
-#{{{ services
-
-add_svc_openrc(){
-    local mnt="$1" names="$2" rlvl="${3:-default}"
-    for svc in $names; do
-        if [[ -f $mnt/etc/init.d/$svc ]];then
-            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" rc-update add "$svc" "$rlvl" &>/dev/null
-        fi
-    done
-}
-
-add_svc_runit(){
-    local mnt="$1" names="$2" rlvl="${3:-default}"
-    for svc in $names; do
-        if [[ -d $mnt/etc/runit/sv/$svc ]]; then
-            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" ln -s /etc/runit/sv/"$svc" /etc/runit/runsvdir/"$rlvl" &>/dev/null
-        fi
-    done
-}
-
-add_svc_s6(){
-    local mnt="$1" names="$2" rlvl="${3:-default}" dep
-    dep="$mnt"/etc/s6/sv/"$display_manager"-srv/dependencies.d
-    for svc in $names; do
-        msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-        chroot "$mnt" s6-service add "$rlvl" "$svc"
-        if [[ "$svc" == "$display_manager" ]]; then
-            if [[ -d "$dep" ]]; then
-                touch "$dep"/artix-live
-            fi
-        fi
-    done
-
-    chroot "$mnt" s6-db-reload -r
-
-    local src=/etc/s6/current skel=/etc/s6/skel getty='/usr/bin/agetty -L -8 tty7 115200'
-    # rebuild s6-linux-init binaries
-    chroot "$mnt" rm -r "$src"
-    chroot "$mnt" s6-linux-init-maker -1 -N -f "$skel" -G "$getty" -c "$src" "$src"
-    chroot "$mnt" mv "$src"/bin/init "$src"/bin/s6-init
-    chroot "$mnt" cp -a "$src"/bin /usr
-}
-
-add_svc_suite66(){
-    local mnt="$1" names="$2"
-    for svc in $names; do
-        if [[ -f "$mnt"/etc/66/service/"$svc" ]]; then
-            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" 66-enable -t default "$svc" &>/dev/null
-        fi
-    done
-}
-
-add_svc_dinit(){
-    local mnt="$1" names="$2"
-    for svc in $names; do
-        if [[ -d $mnt/etc/dinit.d/boot.d ]]; then
-            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" ln -s ../"$svc" /etc/dinit.d/boot.d/"$svc" &>/dev/null
-        fi
-    done
-}
-
-#}}}

lib/iso/squash.sh

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

lib/iso/trap.sh

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

lib/iso/util.sh

@@ -0,0 +1,257 @@
+#!/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() {
+    if [[ -p $logpipe ]]; then
+        rm "$logpipe"
+    fi
+    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_overlay
+    umount_img
+    exit 2
+}
+
+# $1: function
+run_log(){
+    local func="$1" log_dir='/var/log/artools'
+    [[ ! -d $log_dir ]] && mkdir -p $log_dir
+    local logfile=${log_dir}/$(gen_iso_fn).$func.log
+    logpipe=$(mktemp -u "/tmp/$func.pipe.XXXXXXXX")
+    mkfifo "$logpipe"
+    tee "$logfile" < "$logpipe" &
+    local teepid=$!
+    $func &> "$logpipe"
+    wait $teepid
+    rm "$logpipe"
+}
+
+run_safe() {
+    local restoretrap func="$1"
+    set -e
+    set -E
+    restoretrap=$(trap -p ERR)
+    trap 'error_function $func' ERR
+
+    if ${log};then
+        run_log "$func"
+    else
+        "$func"
+    fi
+
+    eval $restoretrap
+    set +E
+    set +e
+}
+
+trap_exit() {
+    local sig=$1; shift
+    error "$@"
+    umount_overlay
+    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
+}
+
+# Build ISO
+make_iso() {
+    msg "Start [Build ISO]"
+    touch "${iso_root}/.artix"
+    for sfs_dir in $(find "${work_dir}" -maxdepth 1 -type d); do
+        if [[ "${sfs_dir}" != "${work_dir}" ]]; then
+            make_sfs "${sfs_dir}"
+        fi
+    done
+
+    msg "Making bootable image"
+    # Sanity checks
+    [[ ! -d "${iso_root}" ]] && return 1
+    if [[ -f "${iso_dir}/${iso_file}" ]]; then
+        msg2 "Removing existing bootable image..."
+        rm -rf "${iso_dir}/${iso_file}"
+    fi
+    assemble_iso
+    msg "Done [Build ISO]"
+}
+
+install_packages(){
+    local fs="$1"
+    setarch "${ARCH}" mkchroot \
+        "${mkchroot_args[@]}" "${fs}" "${packages[@]}"
+}
+
+copy_overlay(){
+    local src="$1" dest="$2"
+    if [[ -e "$src" ]];then
+        msg2 "Copying [%s] ..." "${src##*/}"
+        cp -LR "$src"/* "$dest"
+    fi
+}
+
+clean_up_image(){
+    local path mnt="$1"
+    msg2 "Cleaning [%s]" "${mnt##*/}"
+
+    if [[ -f "$mnt/etc/locale.gen.orig" ]];then
+        mv "$mnt/etc/locale.gen.orig" "$mnt/etc/locale.gen"
+        rm "$mnt/etc/locale.conf"
+    fi
+    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
+
+    if [[ ${mnt##*/} == 'livefs' ]];then
+        rm -rf "$mnt/etc/pacman.d/gnupg"
+    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
+}
+
+make_rootfs() {
+    if [[ ! -e ${work_dir}/rootfs.lock ]]; then
+        msg "Prepare [Base installation] (rootfs)"
+        local rootfs="${work_dir}/rootfs"
+
+        prepare_dir "${rootfs}"
+
+        install_packages "${rootfs}"
+
+        copy_overlay "${ROOT_OVERLAY}" "${rootfs}"
+
+        clean_up_image "${rootfs}"
+
+        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_overlay "${livefs}" "${work_dir}"
+
+        install_packages "${livefs}"
+
+        copy_overlay "${LIVE_OVERLAY}" "${livefs}"
+
+        configure_live_image "${livefs}"
+
+        umount_overlay
+
+        clean_up_image "${livefs}"
+
+        msg "Done [Live installation] (livefs)"
+    fi
+}
+
+make_bootfs() {
+    if [[ ! -e ${work_dir}/bootfs.lock ]]; then
+        msg "Prepare [/iso/boot]"
+        local boot="${iso_root}/boot"
+
+        prepare_dir "${boot}"
+
+        cp ${work_dir}/rootfs/boot/vmlinuz* ${boot}/vmlinuz-${ARCH}
+
+        local bootfs="${work_dir}/bootfs"
+
+        mount_overlay "${bootfs}" "${work_dir}"
+
+        prepare_initramfs "${bootfs}" "${boot}"
+
+#         cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${ARCH}.img
+        prepare_boot_extras "${bootfs}" "${boot}"
+
+        umount_overlay
+
+        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]"
+
+        prepare_grub "${work_dir}/rootfs" "${work_dir}/livefs" "${iso_root}"
+
+        configure_grub "${iso_root}"
+
+        : > ${work_dir}/grub.lock
+        msg "Done [/iso/boot/grub]"
+    fi
+}
+
+compress_images(){
+    local timer=$(get_timer)
+    run_safe "make_iso"
+    user_own "${iso_dir}" "-R"
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+prepare_images(){
+    local timer=$(get_timer)
+    load_pkgs "${ROOT_LIST}" "${INITSYS}"
+    run_safe "make_rootfs"
+    if [[ -f ${LIVE_LIST} ]]; then
+        load_pkgs "${LIVE_LIST}" "${INITSYS}"
+        run_safe "make_livefs"
+    fi
+    run_safe "make_bootfs"
+    run_safe "make_grub"
+
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}

lib/pkg/common.sh

@@ -1,36 +0,0 @@
-#!/hint/bash
-
-#{{{ common functions
-
-get_compliant_name(){
-    local gitname="$1"
-    case "$gitname" in
-        *+) gitname=${gitname//+/plus}
-    esac
-    printf "%s\n" "$gitname"
-}
-
-get_pkg_org(){
-    local pkg="$1" org sub
-    case ${pkg} in
-        ruby-*) org="packagesRuby" ;;
-        perl-*) org="packagesPerl" ;;
-        python-*|python2-*) org="packagesPython" ;;
-        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
-    esac
-    printf "%s\n" "$org"
-}
-
-api_put() {
-    curl -s -X PUT "$@"
-}
-
-api_delete() {
-    curl -s -X DELETE "$@"
-}
-
-api_post() {
-    curl -s -X POST "$@"
-}
-
-#}}}

lib/pkg/deploy.sh

@@ -1,37 +0,0 @@
-#!/hint/bash
-
-#{{{ functions
-
-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
-}
-
-get_pkgbasename() {
-    local name="$1"
-    local rm_pkg=${name%.pkg.tar*}
-    rm_pkg=${rm_pkg%-*}
-    rm_pkg=${rm_pkg%-*}
-    rm_pkg=${rm_pkg%-*}
-    printf "%s\n" "$rm_pkg"
-}
-
-#}}}

lib/pkg/git.sh

@@ -1,32 +0,0 @@
-#!/hint/bash
-
-#{{{ git
-
-get_local_head(){
-    git log --pretty=%H ...refs/heads/master^ | head -n 1
-}
-
-get_remote_head(){
-    git ls-remote origin -h refs/heads/master | cut -f1
-}
-
-has_changeset(){
-    local head_l="$1" head_r="$2"
-    if [[ "$head_l" == "$head_r" ]]; then
-        msg2 "remote changes: no"
-        return 1
-    else
-        msg2 "remote changes: yes"
-        return 0
-    fi
-}
-
-pull_tree(){
-    local tree="$1" lh="$2" rh
-    rh=$(get_remote_head)
-    if has_changeset "${lh}" "${rh}";then
-        git pull origin master
-    fi
-}
-
-#}}}

lib/pkg/gitea.sh

@@ -1,31 +1,62 @@
-#!/hint/bash
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-#{{{ gitea api
+create_repo(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    local json="{ \"auto_init\": true, \"name\":\"$gitname\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
 
-add_team_to_repo() {
+    msg2 "Create package repo [%s] in org (%s)" "${pkg}" "${org}"
-    local name="$1"
-    local org="$2"
-    local team="$3"
-    local url
 
-    url="${GIT_URL}/api/v1/repos/$org/$name/teams/$team?access_token=${GIT_TOKEN}"
+    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"
 
-    msg2 "Adding team (%s) to package repo [%s]" "$team" "$name"
+    echo
-
-    api_put "$url" -H  "accept: application/json"
 }
 
-remove_team_from_repo() {
+delete_repo(){
-    local name="$1"
+    local pkg="$1" org="$2"
-    local org="$2"
+    local gitname=$(get_compliant_name "$pkg")
-    local team="$3"
-    local url
 
-    url="${GIT_URL}/api/v1/repos/$org/$name/teams/$team?access_token=${GIT_TOKEN}"
+    msg2 "Delete package repo [%s] in org (%s)" "${pkg}" "${org}"
 
-    msg2 "Removing team (%s) from package repo [%s]" "$team" "$name"
+    curl -s -X DELETE "${GIT_URL}/api/v1/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
-
+        -H  "accept: application/json"
-    api_delete "$url" -H  "accept: application/json"
 }
 
-#}}}
+load_team_id(){
+    local org="$1" team="$2" id=0
+
+    local ids=($(curl -s -X GET "${GIT_URL}/api/v1/orgs/$org/teams?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json" | jshon -a -e id))
+
+    case $team in
+        packages) id="${ids[2]}" ;;
+        community) id="${ids[1]}" ;;
+    esac
+
+    echo $id
+}
+
+add_repo_to_team(){
+    local pkg="$1" org="$2" team="$3"
+    local id=$(load_team_id "$org" "$team")
+
+    msg2 "Adding package repo [%s] to team (%s)" "$pkg" "$team"
+
+    curl -s -X PUT "${GIT_URL}/api/v1/teams/$id/repos/$org/$pkg?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json"
+}

lib/pkg/jenkins.sh

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

lib/pkg/repo.sh

@@ -1,51 +0,0 @@
-#!/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
-    printf "%s\n" "$repo"
-}
-
-find_pkg(){
-    local searchdir="$1" pkg="$2" result
-    result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    printf "%s\n" "$result"
-}
-
-tree_loop(){
-    local func="$1" pkgs
-    for tree in "${ARTIX_TREE[@]}"; do
-        mapfile -t pkgs < <(find "${TREE_DIR_ARTIX}/$tree" -name "$CARCH" | sort)
-        for _package in "${pkgs[@]}"; do
-            "$func" "$_package"
-        done
-    done
-}
-
-#}}}

lib/pkg/subrepo.sh

@@ -0,0 +1,162 @@
+#!/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_local_head(){
+    echo $(git log --pretty=%H ...refs/heads/master^ | head -n 1)
+}
+
+get_remote_head(){
+    echo $(git ls-remote origin -h refs/heads/master | cut -f1)
+}
+
+get_pkg_org(){
+    local pkg="$1" org= sub=
+    case ${pkg} in
+        ruby-*) org=${pkg:0:6}; sub="${org:5}"; echo "packagesRuby" ;;
+        perl-*) org=${pkg:0:6}; sub="${org:5}"; echo "packagesPerl" ;;
+        python-*) org=${pkg:0:8}; sub="${org:7}"; echo "packagesPython" ;;
+        python2-*) org=${pkg:0:9}; sub="${org:8}"; echo "packagesPython" ;;
+        lib32*) org=${pkg:0:7}; sub="${org:6}"; echo "packagesL" ;; #"packages${sub^^}" ;;
+#         lib*) org=${pkg:0:4}; sub="${org:3}"; echo "packagesLib${sub^^}" ;;
+        *) org=${pkg:0:1}; echo "packages${org^^}" ;;
+    esac
+}
+
+subrepo_push(){
+    local pkg="$1"
+    msg2 "Push (%s)" "$pkg"
+    git subrepo push "$pkg"
+}
+
+subrepo_clean(){
+    local pkg="$1"
+    msg2 "Clean (%s)" "$pkg"
+    git subrepo clean "$pkg"
+}
+
+subrepo_pull(){
+    local pkg="$1"
+    msg2 "Pull (%s)" "$pkg"
+    git subrepo pull "$pkg"
+}
+
+subrepo_clone(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    msg2 "Clone [%s] from (%s)" "$pkg" "$org/$gitname"
+    git subrepo clone gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git "$pkg"
+}
+
+clone_tree(){
+    local timer=$(get_timer) url="$1" tree="$2" os="${3:-$(get_osname)}"
+
+    msg "Cloning %s (%s) ..." "$tree" "$os"
+
+    git clone $url/$tree.git
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+has_changes(){
+    local head_l="$1" head_r="$2"
+    if [[ "$head_l" == "$head_r" ]]; then
+        msg2 "remote changes: no"
+        return 1
+    else
+        msg2 "remote changes: yes"
+        return 0
+    fi
+}
+
+pull_tree(){
+    local tree="$1" local_head="$2" os="${3:-$(get_osname)}"
+    local remote_head=$(get_remote_head)
+
+    msg "Checking %s (%s)" "${tree}" "$os"
+    if $(has_changes "${local_head}" "${remote_head}");then
+        git pull origin master
+    fi
+}
+
+push_tree(){
+    local tree="$1"
+    msg "Update (%s)" "${tree}"
+    git push origin master
+}
+
+write_jenkinsfile(){
+    local pkg="$1"
+    local jenkins=$pkg/Jenkinsfile
+
+    echo "@Library('artix-ci') import org.artixlinux.RepoPackage" > $jenkins
+    echo '' >> $jenkins
+    echo 'PackagePipeline(new RepoPackage(this))' >> $jenkins
+    echo '' >> $jenkins
+
+    git add $jenkins
+}
+
+write_agentyaml(){
+    local pkg="$1"
+    local agent=$pkg/.artixlinux/agent.yaml label='master'
+    [[ -d $pkg/.artixlinux ]] || mkdir $pkg/.artixlinux
+
+    echo '%YAML 1.2' > $agent
+    echo '---' >> $agent
+    echo '' >> $agent
+    echo "label: $label" >> $agent
+    echo '' >> $agent
+
+    git add $agent
+}
+
+commit_jenkins_files(){
+    local pkg="$1"
+
+    write_jenkinsfile "$pkg"
+    write_agentyaml "$pkg"
+
+    git commit -m "add jenkinsfile & .artixlinux/agent.yaml"
+}
+
+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 ..
+}
+
+subrepo_new(){
+    local pkg="$1" tree="$2" team="${3:-$2}"
+    local dest=${TREE_DIR_ARTIX}/$tree/$pkg/trunk
+
+    cd ${TREE_DIR_ARTIX}/$tree
+
+    local org=$(get_pkg_org "$pkg")
+
+    create_repo "$pkg" "$org"
+
+    add_repo_to_team "$pkg" "$org" "$team"
+
+    subrepo_clone "$pkg" "$org"
+
+    prepare_dir "$dest"
+
+    commit_jenkins_files "$pkg"
+}

lib/pkg/table.sh

@@ -1,35 +0,0 @@
-#!/hint/bash
-
-#{{{ table
-
-msg_table_header(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@"
-}
-
-msg_row_yellow(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg_row_green(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg_row(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg_row_red(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@"
-}
-
-#}}}

lib/pkg/util.sh

@@ -0,0 +1,232 @@
+#!/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_compliant_name(){
+    local gitname="$1"
+    case $gitname in
+        *+) gitname=${gitname//+/plus}
+    esac
+    echo $gitname
+}
+
+patch_pkg(){
+    local pkg="$1"
+    case $pkg in
+        'glibc')
+            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+                -e '/nscd.service/d' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'tp_smapi'|'acpi_call'|'r8168'|'bbswitch'|'broadcom-wl')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+        ;;
+        'nvidia')
+            sed -e 's|-ARCH|-ARTIX|g'  -e 's|for Arch kernel|for Artix kernel|g' \
+                -e 's|for LTS Arch kernel|for LTS Artix kernel|g' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'linux')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
+                -e 's|CONFIG_CRYPTO_SPECK=.*|CONFIG_CRYPTO_SPECK=n|' \
+                -i $pkg/trunk/config
+            cd $pkg/trunk
+                updpkgsums
+            cd ../..
+
+        ;;
+        'licenses')
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' -i $pkg/trunk/PKGBUILD
+        ;;
+        'bash')
+            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 $pkg/trunk/PKGBUILD
+
+
+            cd $pkg/trunk
+                patch -Np 1 -i ${DATADIR}/patches/artix-bash.patch
+                updpkgsums
+            cd ../..
+        ;;
+        gstreamer|gst-plugins-*)
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
+                -e 's|(Arch Linux)|(Artix Linux)|' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+    esac
+}
+
+arch2artix(){
+    local repo="$1" artix=none
+    case "$repo" in
+        core) artix=system ;;
+        extra) artix=world ;;
+        community) artix=galaxy ;;
+        multilib) artix=lib32 ;;
+        staging) artix=goblins ;;
+        testing) artix=gremlins ;;
+        community-staging) artix=galaxy-goblins ;;
+        community-testing) artix=galaxy-gremlins ;;
+        multilib-staging) artix=lib32-goblins ;;
+        multilib-testing) artix=lib32-gremlins ;;
+        kde-unstable) artix=kde-wobble ;;
+        gnome-unstable) artix=gnome-wobble ;;
+    esac
+    echo $artix
+}
+
+find_tree(){
+    local tree="$1" pkg="$2"
+    local result=$(find $tree -mindepth 2 -maxdepth 2 -type d -name "$pkg")
+    result=${result%/*}
+    echo ${result##*/}
+}
+
+arch_repos(){
+    local stag="$1" unst="$2"
+    local repos=(core extra testing community community-testing multilib multilib-testing)
+
+    $stag && repos+=(staging community-staging multilib-staging)
+    $unst && repos+=(gnome-unstable kde-unstable)
+
+    echo ${repos[@]}
+}
+
+find_repo(){
+    local pkg="$1" stag="$2" unst="$3" repo=
+
+    for r in $(arch_repos "$stag" "$unst");do
+        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
+    done
+    echo $repo
+}
+
+is_valid_repo(){
+    local src="$1" cases=
+    for r in $(arch_repos true true);do
+        cases=${cases:-}${cases:+|}${r}
+    done
+    eval "case $src in
+        ${cases}|trunk) return 0 ;;
+        *) return 1 ;;
+    esac"
+}
+
+get_cases(){
+    local pkglist="${DATADIR}/pkglists/$1.list"
+    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
+
+    local pkgs=($(sed "$_com_rm" "$pkglist" | sed "$_space" | sed "$_clean"))
+
+    local cases=
+    for p in ${pkgs[@]};do
+        cases=${cases:-}${cases:+|}${p}
+    done
+    echo $cases
+}
+
+get_artix_tree(){
+    local pkg="$1" artix_tree="${2:-$3}" tree
+    eval "case $pkg in
+        $(get_cases kernel)) tree=packages-kernel ;;
+        python-*|python2-*) tree=packages-python ;;
+        perl-*) tree=packages-perl ;;
+        ruby-*) tree=packages-ruby ;;
+        xorg*|xf86*|$(get_cases xorg)) tree=packages-xorg ;;
+        *-openrc) tree=packages-openrc ;;
+        *-runit) tree=packages-runit ;;
+        qt5-*) tree=packages-qt5 ;;
+        lxqt*|$(get_cases lxqt)) tree=packages-lxqt ;;
+        *) tree=$artix_tree
+    esac"
+    echo $tree
+
+#         $(get_cases freedesktop)) tree=packages-desktop ;;
+#         $(get_cases kde)) tree=packages-kde ;;
+#         $(get_cases gnome)) tree=packages-gnome ;;
+
+}
+
+get_import_path(){
+    local pkg="$1" import_path=
+    for tree in ${TREE_NAMES_ARCH[@]};do
+        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && import_path=${TREE_DIR_ARCH}/$tree/$pkg
+    done
+    echo $import_path
+}
+
+pkgver_equal() {
+    if [[ $1 = *-* && $2 = *-* ]]; then
+        # if both versions have a pkgrel, then they must be an exact match
+        [[ $1 = "$2" ]]
+    else
+        # otherwise, trim any pkgrel and compare the bare version.
+        [[ ${1%%-*} = "${2%%-*}" ]]
+    fi
+}
+
+find_cached_package() {
+    local searchdirs=("$PKGDEST" "$PWD") results=()
+    local targetname=$1 targetver=$2 targetarch=$3
+    local dir pkg pkgbasename name ver rel arch r results
+
+    for dir in "${searchdirs[@]}"; do
+        [[ -d $dir ]] || continue
+
+        for pkg in "$dir"/*.pkg.tar.?z; do
+            [[ -f $pkg ]] || continue
+
+            # avoid adding duplicates of the same inode
+            for r in "${results[@]}"; do
+                [[ $r -ef $pkg ]] && continue 2
+            done
+
+            # split apart package filename into parts
+            pkgbasename=${pkg##*/}
+            pkgbasename=${pkgbasename%.pkg.tar.?z}
+
+            arch=${pkgbasename##*-}
+            pkgbasename=${pkgbasename%-"$arch"}
+
+            rel=${pkgbasename##*-}
+            pkgbasename=${pkgbasename%-"$rel"}
+
+            ver=${pkgbasename##*-}
+            name=${pkgbasename%-"$ver"}
+
+            if [[ $targetname = "$name" && $targetarch = "$arch" ]] &&
+                pkgver_equal "$targetver" "$ver-$rel"; then
+                results+=("$pkg")
+            fi
+        done
+    done
+
+    case ${#results[*]} in
+        0)
+            return 1
+        ;;
+        1)
+            printf '%s\n' "${results[0]}"
+            return 0
+        ;;
+        *)
+            error 'Multiple packages found:'
+            printf '\t%s\n' "${results[@]}" >&2
+            return 1
+        ;;
+    esac
+}

lib/util-base.sh

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

@@ -0,0 +1,25 @@
+#!/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'}
+
+for baselib in ${LIBDIR}/base/*.sh; do
+    . $baselib
+done

lib/util-iso.sh

@@ -1,41 +0,0 @@
-#!/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:-''}
-
-    COMPRESSION="${COMPRESSION:-zstd}"
-
-    COMPRESSION_LEVEL="${COMPRESSION_LEVEL:-15}"
-
-    if [[ -z "${COMPRESSION_ARGS[*]}" ]]; then
-        COMPRESSION_ARGS=(-Xcompression-level "${COMPRESSION_LEVEL}")
-    fi
-
-    if [[ "${COMPRESSION}" == 'xz' ]]; then
-        COMPRESSION_ARGS=(-Xbcj x86)
-    fi
-
-    return 0
-}
-
-#}}}
-
-load_iso_config "${USER_CONF_DIR}" || load_iso_config "${SYSCONFDIR}"
-
-prepare_dir "${ISO_POOL}"

lib/util-iso.sh.in

@@ -0,0 +1,17 @@
+#!/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.
+
+for isolib in ${LIBDIR}/iso/*.sh; do
+    . $isolib
+done

lib/util-pkg.sh

@@ -1,76 +0,0 @@
-#!/hint/bash
-
-#{{{ pkg conf
-
-load_pkg_config(){
-
-    local conf="$1/artools-pkg.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    # shellcheck source=/etc/artools/artools-pkg.conf
-    [[ -r "$conf" ]] && . "$conf"
-
-    local git_domain="gitea.artixlinux.org"
-
-    GIT_URL=${GIT_URL:-"https://${git_domain}"}
-
-    GIT_SSH=${GIT_SSH:-"gitea@${git_domain}"}
-
-    GIT_TOKEN=${GIT_TOKEN:-''}
-
-    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
-
-    ARTIX_TREE=(
-        packages community
-        packages-{llvm,gfx,media,net}
-    )
-
-    local dev_tree=(
-        packages-{python,perl,java,ruby,misc}
-        python-{world,galaxy,galaxy-groups,misc}
-    )
-
-    local init_tree=(packages-{openrc,runit,s6,suite66,dinit})
-
-    local desktop_tree=(
-        packages-{xorg,gtk,qt5,qt6,kf5,plasma}
-        kde-{utils,devel,net,pim,media,edu,games}
-        packages-{lxqt,gnome,cinnamon,mate,xfce,wm,lxde}
-    )
-
-    [[ -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"}
-
-    [[ -z ${ARCH_TREE[*]} ]] && \
-    ARCH_TREE=(svntogit-{packages,community})
-
-    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
-
-    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
-
-    HOST_TREE_ARCH=${HOST_TREE_ARCH:-'https://github.com/archlinux'}
-
-    DBEXT=${DBEXT:-'gz'}
-
-    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

@@ -0,0 +1,17 @@
+#!/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.
+
+for pkglib in ${LIBDIR}/pkg/*.sh; do
+    . $pkglib
+done