subrepo.sh: clean up get_pkg_org()

* makechrootpkg: keep *DEST, MAKEFLAGS & PACKAGER
* chroot-run: get all mirrors from host

Makefile

@@ -1,72 +1,46 @@
-VERSION=0.9
+VERSION=0.14
 
-CHROOT_VERSION=0.8
+CHROOT_VERSION=0.9
 
 TOOLS = artools
-ifdef PREFIX
-PREFIX = /usr/local
-endif
+PREFIX ?= /usr
 SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
-
-DIRMODE = -dm0755
-FILEMODE = -m0644
-MODE =  -m0755
-
-LN = ln -sf
-RM = rm -f
-RMD = rm -fr --one-file-system
-M4 = m4 -P
-CHMODAW = chmod a-w
-CHMODX = chmod +x
-
 CPIODIR = $(SYSCONFDIR)/initcpio
 
-SYSCONF = \
+CONF = \
 	data/artools.conf
 
-BIN_BASE = \
-	bin/mkchroot \
-	bin/basestrap \
-	bin/artools-chroot \
-	bin/fstabgen \
-	bin/signfile \
-	bin/chroot-run
+BASE_BIN = \
+	bin/base/signfile \
+	bin/base/chroot-run \
+	bin/base/mkchroot \
+	bin/base/basestrap \
+	bin/base/artools-chroot \
+	bin/base/fstabgen
 
-LIBS_BASE = \
-	lib/util.sh \
-	lib/util-msg.sh \
-	lib/util-mount.sh \
-	lib/util-chroot.sh \
-	lib/util-fstab.sh
+BASE_LIBS = \
+	$(wildcard lib/base/*.sh)
 
-SHARED_BASE = \
-	$(wildcard data/pacman*.conf)
+BASE_UTIL = lib/util-base.sh
 
-BIN_PKG = \
-	bin/checkpkg \
-	bin/lddd \
-	bin/finddeps \
-	bin/find-libdeps \
-	bin/mkchrootpkg \
-	bin/buildpkg \
-	bin/buildtree \
-	bin/deploypkg \
-	bin/commitpkg \
-	bin/mkpkgclean
+BASE_DATA = \
+	$(wildcard data/base/pacman*.conf)
 
-LIBS_PKG = \
-	$(wildcard lib/util-pkg*.sh)
+PKG_BIN = \
+	bin/pkg/buildpkg \
+	bin/pkg/deploypkg \
+	bin/pkg/commitpkg \
+	bin/pkg/comparepkg \
+	bin/pkg/mkchrootpkg \
+	bin/pkg/pkg2yaml \
+	bin/pkg/buildtree \
+	bin/pkg/lddd \
+	bin/pkg/links-add
 
-SHARED_PKG = \
-	data/makepkg.conf
-
-PATCHES = \
-	$(wildcard data/patches/*.patch)
-
-COMMITPKG_SYMS = \
+LN_COMMITPKG = \
 	extrapkg \
 	corepkg \
 	testingpkg \
@@ -76,84 +50,152 @@ COMMITPKG_SYMS = \
 	community-stagingpkg \
 	multilibpkg \
 	multilib-testingpkg \
-	multilib-stagingpkg
+	multilib-stagingpkg \
+	kde-unstablepkg \
+	gnome-unstablepkg
 
-BIN_ISO = \
-	bin/buildiso \
-	bin/deployiso
+LN_BUILDPKG = \
+	buildpkg-system \
+	buildpkg-world \
+	buildpkg-gremlins \
+	buildpkg-goblins \
+	buildpkg-galaxy \
+	buildpkg-galaxy-gremlins \
+	buildpkg-galaxy-goblins \
+	buildpkg-lib32 \
+	buildpkg-lib32-gremlins \
+	buildpkg-lib32-goblins \
+	buildpkg-kde-wobble \
+	buildpkg-gnome-wobble
 
-BIN_ISO_SYMS = \
+LN_DEPLOYPKG = \
+	deploypkg-system \
+	deploypkg-world \
+	deploypkg-gremlins \
+	deploypkg-goblins \
+	deploypkg-galaxy \
+	deploypkg-galaxy-gremlins \
+	deploypkg-galaxy-goblins \
+	deploypkg-lib32 \
+	deploypkg-lib32-gremlins \
+	deploypkg-lib32-goblins \
+	deploypkg-kde-wobble \
+	deploypkg-gnome-wobble
+
+PKG_LIBS = \
+	$(wildcard lib/pkg/*)
+
+PKG_UTIL = lib/util-pkg.sh
+
+PKG_DATA = \
+	data/pkg/makepkg.conf
+
+PATCHES = \
+	$(wildcard data/patches/*.patch)
+
+ISO_BIN = \
+	bin/iso/buildiso \
+	bin/iso/deployiso
+
+LN_BUILDISO = \
 	buildiso-gremlins \
 	buildiso-goblins
 
-LIBS_ISO = \
-	$(wildcard lib/util-iso*.sh)
+ISO_LIBS = \
+	$(wildcard lib/iso/*.sh)
 
-SHARED_ISO = \
-	data/mkinitcpio.conf
+ISO_UTIL = lib/util-iso.sh
 
-all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
+ISO_DATA = \
+	data/iso/mkinitcpio.conf
 
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
-	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
-	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g" \
-	-e "s|@version@|$(VERSION)|" \
+DIRMODE = -dm0755
+FILEMODE = -m0644
+MODE =  -m0755
+LN = ln -sf
+RM = rm -f
+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) $(UTIL)
+
+EDIT_UTIL = sed -e "s|@datadir[@]|$(DATADIR)|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
 	-e "s|@chroot_version@|$(CHROOT_VERSION)|"
 
-%: %.in Makefile
+EDIT_BIN = sed -e "s|@libdir[@]|$(LIBDIR)|g"
+
+$(UTIL): %: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@$(M4) $@.in | $(EDIT) >$@
+	@$(M4) $@.in | $(EDIT_UTIL) >$@
+	@$(CHMODAW) "$@"
+
+$(BIN): %: %.in Makefile
+	@echo "GEN $@"
+	@$(RM) "$@"
+	@$(M4) $@.in | $(EDIT_BIN) >$@
 	@$(CHMODAW) "$@"
 	@$(CHMODX) "$@"
 
 clean:
-	$(RM) $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
+	$(RM) $(BIN) $(UTIL)
 
 install_base:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(SYSCONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install $(FILEMODE) $(CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
-	install $(MODE) $(BIN_BASE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	install $(FILEMODE) $(LIBS_BASE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	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) $(SHARED_BASE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
-	install $(MODE) $(BIN_PKG) $(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 $(COMMITPKG_SYMS); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
+	for l in $(LN_COMMITPKG); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
+	for l in $(LN_BUILDPKG); do $(LN) buildpkg $(DESTDIR)$(BINDIR)/$$l; done
+	for l in $(LN_DEPLOYPKG); do $(LN) deploypkg $(DESTDIR)$(BINDIR)/$$l; done
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	install $(FILEMODE) $(LIBS_PKG) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	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) $(SHARED_PKG) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
+
 install_cpio:
 	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
 
 install_iso: install_cpio
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
-	install $(MODE) $(BIN_ISO) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(ISO_BIN) $(DESTDIR)$(BINDIR)
 
-	for l in $(BIN_ISO_SYMS); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
+	for l in $(LN_BUILDISO); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	install $(FILEMODE) $(LIBS_ISO) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+	install $(FILEMODE) $(ISO_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(ISO_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
 
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install $(FILEMODE) $(SHARED_ISO) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(ISO_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install: install_base install_pkg install_iso
 
-.PHONY: all clean install
+.PHONY: all clean install install_base install_pkg install_iso

README.md

@@ -4,7 +4,7 @@ artools
 #### Make flags
 
 
-* PREFIX=/usr/local (default if defined)
+* PREFIX=/usr
 * SYSCONFDIR=/etc
 
 #### Dependencies
@@ -28,13 +28,13 @@ artools
 - pkg:
   * namcap
   * git-subrepo
+  * jshon
 
 - iso:
   * dosfstools
   * libisoburn
   * squashfs-tools
   * mkinitcpio
-  * mktorrent
   * grub
 
 #### Configuration

bin/base/artools-chroot.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,40 +12,49 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
 shopt -s extglob
 
-LIBDIR='@libdir@'
-SYSCONFDIR='@sysconfdir@'
+. @libdir@/artools/util-base.sh
 
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-mount.sh
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "ARGS:"
-    msg2 "automount: %s" "${automount}"
-    msg2 "run_args: %s" "${run_args[*]}"
-
-    msg "PATHS:"
-    msg2 "chrootdir: %s" "${chrootdir}"
+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 "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
 automount=false
-pretend=false
 
 usage() {
     echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
     echo '    -a             Automount detected linux system'
-    echo '    -q             Query settings and pretend'
     echo '    -h             Print this help message'
     echo ''
     echo "    If 'command' is unspecified, ${0##*/} will launch /bin/sh."
@@ -56,12 +68,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts=':haq'
+opts=':ha'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         a) automount=true ;;
-        q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument ${arg}"; usage 1 ;;
     esac
@@ -74,8 +85,6 @@ if ${automount};then
     chrootdir=/mnt
     run_args=/bin/bash
 
-    ${pretend} && display_settings && exit 1
-
     select_os "${chrootdir}"
 else
     chrootdir=$1
@@ -84,8 +93,6 @@ else
 
     [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
 
-    ${pretend} && display_settings && exit 1
-
     chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
     chroot_add_resolv_conf "${chrootdir}"
 fi

bin/base/basestrap.in

@@ -1,4 +1,16 @@
 #!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
 #
 # Assumptions:
@@ -8,17 +20,9 @@
 #  4) A valid mirror appears in /etc/pacman.d/mirrorlist
 #
 
-version=@version@
-
 shopt -s extglob
 
-DATADIR='@datadir@'
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-mount.sh
-import ${LIBDIR}/util-chroot.sh
+. @libdir@/artools/util-base.sh
 
 copy_mirrorlist(){
     cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
@@ -35,9 +39,6 @@ create_min_fs(){
     mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
     mkdir -m 1777 -p $1/{tmp,run}
     mkdir -m 0555 -p $1/{sys,proc}
-#     if [[ ! -f $1/etc/machine-id ]];then
-#         touch $1/etc/machine-id
-#     fi
 }
 
 newroot=/mnt

bin/base/chroot-run.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,20 +12,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+chroot_version=0.9
 
-chroot_version=@chroot_version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-chroot.sh
-import ${LIBDIR}/util-mount.sh
+. @libdir@/artools/util-base.sh
 
 working_dir=''
 files=()
-keep_mirrors=false
 nosetarch=false
 
 usage() {
@@ -76,9 +71,14 @@ else
     cache_dirs=("$cache_dir")
 fi
 
+pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
+host_mirrors=($($pacconf_cmd --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
+    
 copy_hostconf () {
     cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d"
-
+    
+    printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
+    
     [[ -n $pacman_conf ]] && cp $pacman_conf "$1/etc/pacman.conf"
 
     [[ -n $makepkg_conf ]] && cp $makepkg_conf "$1/etc/makepkg.conf"
@@ -109,6 +109,13 @@ chroot_extra_mount() {
     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
 }
 
 umask 0022
@@ -116,8 +123,8 @@ 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") != $chroot_version ]]; then
-    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$chroot_version"
+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}"

bin/base/fstabgen.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,14 +12,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
 shopt -s extglob
 
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util-fstab.sh
+. @libdir@/artools/util-base.sh
 
 write_source() {
     local src=$1 spec= label= uuid= comment=()
@@ -73,17 +71,17 @@ optstring_apply_quirks() {
 
     case $fstype in
         f2fs)
-        # These are Kconfig options for f2fs. Kernels supporting the options will
-        # only provide the negative versions of these (e.g. noacl), and vice versa
-        # for kernels without support.
-        optstring_remove_option "$varname" noacl,acl,nouser_xattr,user_xattr
+            # These are Kconfig options for f2fs. Kernels supporting the options will
+            # only provide the negative versions of these (e.g. noacl), and vice versa
+            # for kernels without support.
+            optstring_remove_option "$varname" noacl,acl,nouser_xattr,user_xattr
         ;;
         vfat)
-        # Before Linux v3.8, "cp" is prepended to the value of the codepage.
-        if optstring_get_option "$varname" codepage && [[ $codepage = cp* ]]; then
-            optstring_remove_option "$varname" codepage
-            optstring_append_option "$varname" "codepage=${codepage#cp}"
-        fi
+            # Before Linux v3.8, "cp" is prepended to the value of the codepage.
+            if optstring_get_option "$varname" codepage && [[ $codepage = cp* ]]; then
+                optstring_remove_option "$varname" codepage
+                optstring_append_option "$varname" "codepage=${codepage#cp}"
+            fi
         ;;
     esac
 }
@@ -109,8 +107,8 @@ EOF
 }
 
 if [[ -z $1 || $1 = @(-h|--help) ]]; then
-  usage
-  exit $(( $# ? 0 : 1 ))
+    usage
+    exit $(( $# ? 0 : 1 ))
 fi
 
 while getopts ':f:LPpt:U' flag; do
@@ -162,20 +160,20 @@ while read -r src target fstype opts fsroot; do
 
     if [[ $fsroot != / ]]; then
         if [[ $fstype = btrfs ]]; then
-        opts+=,subvol=${fsroot#/}
+            opts+=,subvol=${fsroot#/}
         else
-        # it's a bind mount
-        src=$(findmnt -funcevo TARGET "$src")$fsroot
-        if [[ $src -ef $target ]]; then
-            # hrmm, this is weird. we're probably looking at a file or directory
-            # that was bound into a chroot from the host machine. Ignore it,
-            # because this won't actually be a valid mount. Worst case, the user
-            # just re-adds it.
-            continue
-        fi
-        fstype=none
-        opts+=,bind
-        pass=0
+            # it's a bind mount
+            src=$(findmnt -funcevo TARGET "$src")$fsroot
+            if [[ $src -ef $target ]]; then
+                # hrmm, this is weird. we're probably looking at a file or directory
+                # that was bound into a chroot from the host machine. Ignore it,
+                # because this won't actually be a valid mount. Worst case, the user
+                # just re-adds it.
+                continue
+            fi
+            fstype=none
+            opts+=,bind
+            pass=0
         fi
     fi
 
@@ -209,22 +207,22 @@ done
 
     while read -r device type _ _ prio; do
         options=defaults
-        if [[ $prio != -1 ]]; then
-        options+=,pri=$prio
+        if (( prio >= 0 )); then
+            options+=,pri=$prio
         fi
 
         # skip files marked deleted by the kernel
         [[ $device = *'\040(deleted)' ]] && continue
 
         if [[ $type = file ]]; then
-        printf '%-20s' "$device"
+            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
-        # for us in sysfs.
-        write_source "$(dm_name_for_devnode "$device")"
+            # device mapper doesn't allow characters we need to worry
+            # about being mangled, and it does the escaping of dashes
+            # for us in sysfs.
+            write_source "$(dm_name_for_devnode "$device")"
         else
-        write_source "$(unmangle "$device")"
+            write_source "$(unmangle "$device")"
         fi
 
         printf '\t%-10s\t%-10s\t%-10s\t0 0\n\n' 'none' 'swap' "$options"

bin/base/mkchroot.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,29 +12,23 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
-chroot_version=@chroot_version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-chroot.sh
+. @libdir@/artools/util-base.sh
 
 working_dir=''
 files=()
 
 nosetarch=false
+copy_mirrorlist=true
+basestrap_args=(-Gc)
 
 usage() {
     echo "Usage: ${0##*/} [options] working-dir package-list..."
     echo ' options:'
     echo '    -C <file>     Location of a pacman config file'
     echo '    -M <file>     Location of a makepkg config file'
-    echo '    -U <url>      Set a specific mirror'
     echo '    -c <dir>      Set pacman cache'
     echo '    -f <file>     Copy file from the host to the chroot'
+    echo '    -m            Do not copy mirrorlist to the chroot'
     echo '    -s            Do not run setarch'
     echo '    -h            This message'
     exit 1
@@ -39,16 +36,16 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='hC:M:U:c:f:s'
+opts='hC:M:c:f:sm'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf="$OPTARG" ;;
         M) makepkg_conf="$OPTARG" ;;
-        U) mirror="$OPTARG" ;;
         c) cache_dir="$OPTARG" ;;
         f) files+=("$OPTARG") ;;
         s) nosetarch=true ;;
+        m) copy_mirrorlist=false; basestrap_args+=(-M) ;;
         h|?) usage ;;
         *) error "invalid argument '%s'" "$arg"; usage ;;
     esac
@@ -98,9 +95,9 @@ while read -r varname; do
     _env+=("$varname=${!varname}")
 done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
 env -i "${_env[@]}" \
-basestrap -Gc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
+basestrap "${basestrap_args[@]}" ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
 
-echo "$chroot_version" > "$working_dir/.artools"
+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"

bin/base/signfile.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,16 +12,11 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
+. @libdir@/artools/util-base.sh
 
 load_user_info
 
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf
 
 file_to_sign="$1"
@@ -28,9 +26,10 @@ if [ ! -e "$1" ]; then
     exit 1
 fi
 
-msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
 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/buildpkg.in

@@ -1,150 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-shopt -s nullglob
-
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-chroot.sh
-
-show_pkg(){
-    source PKGBUILD
-    for n in ${pkgname[@]}; do
-        msg2 "%s" "$n"
-    done
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "chroots_pkg: %s" "${chroots_pkg}"
-    msg2 "repository: %s" "${repository}"
-
-    msg "ARGS:"
-    msg2 "create_first: %s" "${create_first}"
-    msg2 "makepkg_args: %s" "${makepkg_args[*]}"
-    msg2 "mkchrootpkg_args: %s" "${mkchrootpkg_args[*]}"
-    
-    msg "BUILD:"
-    show_pkg
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-create_first=false
-pretend=false
-
-mkchroot_args=()
-mkchrootpkg_args=(-c -n)
-
-repository='default'
-    
-prepare_build(){
-    local pac_file= mp_file='makepkg.conf'    
-            
-    base_devel=('base-devel')
-    
-    case ${repository} in
-        'system'|'world'|'galaxy') repository='default' ;;
-        lib32*) base_devel+=('multilib-devel') ;;
-        galaxy-gremlins|galaxy-goblins) repository=${repository#*-} ;;
-    esac
-    local pac_file="pacman-${repository}.conf"
-
-    local pacman_conf="${DATADIR}/$pac_file"
-    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
-
-    work_dir="${chroots_pkg}/${repository}-${target_arch}"
-
-    local makepkg_conf="${DATADIR}/$mp_file"
-    [[ -f $AT_USERCONFDIR/$mp_file ]] && makepkg_conf="$AT_USERCONFDIR/$mp_file"
-
-    mkchroot_args+=(-C "${pacman_conf}" -M "${makepkg_conf}" "${work_dir}/root")
-
-    mkchrootpkg_args+=(-r "${work_dir}" "${makepkg_args[@]}")
-}
-
-build(){
-    local timer_start=$(get_timer) 
-
-    exec mkchrootpkg "${mkchrootpkg_args[@]}"
-    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-}
-
-usage() {
-    echo "Usage: ${0##*/} [options] -- [makepkg_args]"
-    echo "    -r <dir>           Repository [default: ${repository}]"
-    echo '    -c                 Create root chroot'
-    echo '    -q                 Query settings and pretend build'
-    echo '    -h                 This help'
-    echo ''
-    echo "Default makepkg_args args: ${makepkg_args[*]}"
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='r:cqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) repository="$OPTARG" ;;
-        c) create_first=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
-    esac
-done
-
-makepkg_args+=("${@:$OPTIND}")
-
-check_root
-
-prepare_build
-
-${pretend} && display_settings && exit
-
-if ${create_first} || [[ ! -d ${work_dir}/root ]];then
-    msg "Creating chroot for [%s] (%s)..." "${repository}" "${target_arch}"
-
-    for copy in "${work_dir}"/*; do
-        [[ -d $copy ]] || continue
-        msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
-
-        lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
-
-        subvolume_delete_recursive "${copy}"
-        rm -rf --one-file-system "${copy}"
-    done
-    lock_close 9
-
-    rm -rf --one-file-system "${work_dir}"
-    mkdir -p "${work_dir}"
-    setarch "${target_arch}" mkchroot \
-        "${mkchroot_args[@]}"  "${base_devel[@]}" || abort
-else
-    lock 9 "${work_dir}/root.lock" "Locking clean chroot"
-    chroot-run "${mkchroot_args[@]}" \
-        pacman -Syu --noconfirm || abort
-fi
-
-build

bin/buildtree.in

@@ -1,308 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-LIBDIR='@libdir@'
-SYSCONFDIR='@sysconfdir@'
-DATADIR='@datadir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg.sh
-import ${LIBDIR}/util-pkg-gitea.sh
-import ${LIBDIR}/util-pkg-subrepo.sh
-
-pull_tree_arch(){
-    cd ${tree_dir_arch}
-    for tree in packages community;do
-        if [[ -d ${tree} ]];then
-            cd ${tree}
-            msg "Checking (%s)" "${tree}"
-            pull_tree
-            cd ..
-        else
-            msg "Cloning (%s) ..." "$tree"
-            clone_tree "${host_tree_arch}/${tree}"
-        fi
-    done
-}
-
-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 ..
-}
-
-pull_tree_artix(){
-    cd ${tree_dir_artix}
-    for tree in packages packages-galaxy;do
-        if [[ -d ${tree} ]];then
-            config_tree "${tree}"
-            cd ${tree}
-            msg "Checking (%s)" "${tree}"
-            pull_tree
-            cd ..
-        else
-            msg "Cloning (%s) ..." "$tree"
-            clone_tree "${host_tree_artix}/${tree}"
-            config_tree "${tree}"
-        fi
-    done
-}
-
-show_version_table(){
-    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
-    for tree in packages packages-galaxy;do
-        local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
-        for pkg_path in ${git[@]}; do
-            local artixrepo=$(find_repo "$pkg_path" "${unstable}" "${staging}")
-            if [[ -d $pkg_path/repos/$artixrepo ]];then
-                source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
-                local pkg=${pkg_path##*/}
-                local artixver=$(get_full_version $pkg)
-                local src=$(get_import_path "$tree" "$pkg")
-                local archrepo=$(find_repo "$src/$pkg" "${unstable}" "${staging}")
-                if [[ -d $src/$pkg/repos/$archrepo ]];then
-                    source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
-                    local archver=$(get_full_version $pkg)
-                fi
-                if ${artix};then
-                    if [ $(vercmp "$artixver" "$archver") -eq 0 ] || [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
-                        case $ar in
-                            *goblins)
-                                if [[ "$archrepo" == "$artixrepo" ]];then
-                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                                else
-                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                                fi
-                            ;;
-                            *gremlins)
-                                if [[ "$archrepo" == "$artixrepo" ]];then
-                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                                else
-                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                                fi
-                            ;;
-                        esac
-                    fi
-                else
-                    if [ $(vercmp "$artixver" "$archver") -lt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
-                        ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                    fi
-                    if [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
-                        if [[ -n $archver ]] && [[ -n $archrepo ]];then
-                            ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                        fi
-                    fi
-                fi
-                unset pkgver epoch pkgrel artixver archver _package
-            fi
-        done
-    done
-}
-
-show_deps(){
-    local src="$1" repo="$2"
-    source $src/PKGBUILD 2>/dev/null
-    [[ $arch == 'any' ]] && CARCH=any
-    local archver=$(get_full_version $pkg)
-    msg "git tree: %s" "$git_tree_arch"
-    msg2 "repo: %s" "$repo"
-    msg2 "Package Name: %s" "$pkg"
-    msg2 "Arch Version: %s" "$archver"
-    msg2 "arch: %s" "$CARCH"
-    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
-    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
-    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
-    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
-}
-
-from_arch(){
-    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 pkg_path=${tree_dir_arch}/$git_tree_arch/$pkg
-    local repo=$(find_repo "$pkg_path" "${unstable}")
-
-    src=$pkg_path/repos/$repo
-    $trunk && src=$pkg_path/trunk
-
-    local git_tree_artix=$(find_tree "${tree_dir_artix}" "$pkg")
-    dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
-
-    cd ${tree_dir_arch}/$git_tree_arch
-
-    show_deps "$src" "$repo"
-
-    if [[ -d $dest ]];then
-        cd ${tree_dir_artix}/$git_tree_artix
-
-        source $dest/PKGBUILD 2>/dev/null
-        local artixver=$(get_full_version $pkg)
-
-        msg2 "Artix Version: %s" "$artixver"
-        info "Update from archlinux (%s)" "$git_tree_arch"
-        rsync "${rsync_args[@]}" $src/ $dest/
-        patch_pkg "$pkg" "$tree"
-    else
-        [[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
-        [[ $git_tree_arch == 'community' ]] && git_tree_artix='packages-galaxy'
-
-        cd ${tree_dir_artix}/$git_tree_artix
-
-        dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
-
-        create_repo "$pkg"
-        add_repo_to_team "$pkg" "$pkg_path"
-        subrepo_clone "$pkg"
-
-        info "Import from archlinux (%s)" "$git_tree_arch"
-        rsync "${rsync_args[@]}" $src/ $dest/
-        patch_pkg "$pkg" "$tree"
-    fi
-}
-
-view_build(){
-    local pkg="$1" src=
-    local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
-    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
-
-    local pkg_path=${tree_dir_arch}/$git_tree_arch/$pkg
-    local repo=$(find_repo "$pkg_path" "${unstable}")
-
-    src=$pkg_path/repos/$repo
-
-    show_deps "$src" "$repo"
-}
-
-sync_repos(){
-    ${sync_arch} && pull_tree_arch
-    pull_tree_artix
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "package: %s" "${package}"
-
-    msg "ARGS:"
-    msg2 "sync: %s" "${sync}"
-    msg2 "sync_arch: %s" "${sync_arch}"
-    msg2 "compare: %s" "${compare}"
-    msg2 "upgrades: %s" "${upgrades}"
-    msg2 "downgrades: %s" "${downgrades}"
-    msg2 "artix: %s" "${artix}"
-    msg2 "staging: %s" "${staging}"
-    msg2 "unstable: %s" "${unstable}"
-    msg2 "import: %s" "${import}"
-    msg2 "view: %s" "${view}"
-    msg2 "trunk: %s" "${trunk}"
-
-    msg "PATHS:"
-    msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
-    msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-load_vars /etc/makepkg.conf
-
-pretend=false
-sync=false
-sync_arch=true
-compare=false
-unstable=false
-staging=true
-upgrades=false
-downgrades=false
-artix=false
-import=false
-view=false
-trunk=false
-package=''
-
-rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo '    -p <pkg>      Package name'
-    echo "    -s            Clone or pull repos"
-    echo "    -z            Don't clone or pull arch repos"
-    echo '    -c            Compare packages'
-    echo '    -u            Show upgrade packages'
-    echo '    -d            Show downgrade packages'
-    echo '    -a            Show testing packages'
-    echo "    -y            Don't inlcude staging packages"
-    echo '    -x            Include unstable kde and gnome'
-    echo '    -i            Import a package from arch repos'
-    echo '    -t            Import from arch trunk'
-    echo '    -v            View package depends'
-    echo '    -q            Query settings'
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:csudayiztxvqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) package="$OPTARG" ;;
-        s) sync=true ;;
-        z) sync_arch=false ;;
-        c) compare=true ;;
-        u) upgrades=true ;;
-        d) downgrades=true ;;
-        a) artix=true ;;
-        y) staging=false ;;
-        i) import=true ;;
-        t) trunk=true ;;
-        v) view=true ;;
-        x) unstable=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-prepare_dir "${tree_dir_artix}"
-prepare_dir "${tree_dir_arch}"
-
-${pretend} && display_settings && exit 1
-
-${sync} && sync_repos
-
-${view} && view_build "${package}"
-
-${compare} && show_version_table
-
-${import} && from_arch "${package}"

bin/checkpkg.in

@@ -1,82 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg.sh
-
-shopt -s extglob
-
-load_user_info
-
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-load_vars /etc/makepkg.conf
-
-if [[ ! -f PKGBUILD ]]; then
-    die 'This must be run in the directory of a built package.'
-fi
-
-. ./PKGBUILD
-if [[ $arch == 'any' ]]; then
-    CARCH='any'
-fi
-
-STARTDIR=$(pwd)
-TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
-
-for _pkgname in "${pkgname[@]}"; do
-    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"
-
-    pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$_pkgname")
-
-    if [[ $? -ne 0 ]]; then
-        die "Couldn't download previous package for %s." "$_pkgname"
-    fi
-
-    oldpkg=${pkgurl##*://*/}
-
-    if [[ ${oldpkg##*/} = ${pkgfile##*/} ]]; then
-        die "The built package (%s) is the one in the repo right now!" "$_pkgname"
-    fi
-
-    if [[ $pkgurl = file://* ]]; 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
-        msg "Sonames differ in %s!" "$_pkgname"
-        echo "$diff_output"
-    else
-        msg "No soname differences for %s" "$_pkgname."
-    fi
-done

bin/commitpkg.in

@@ -1,188 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-LIBDIR='@libdir@'
-SYSCONFDIR='@sysconfdir@'
-DATADIR='@datadir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg.sh
-import ${LIBDIR}/util-pkg-subrepo.sh
-
-commit_pkg(){
-    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
-    if [[ -n ${git_tree} ]];then
-        cd ${tree_dir_artix}/${git_tree}/${package}
-
-        source trunk/PKGBUILD
-        [[ $arch == 'any' ]] && CARCH=any
-        local ver=$(get_full_version "${package}")
-        local commit_msg=""
-
-        if ${remove};then
-            local action='remove'
-            if [[ "${source_repo}" == 'trunk' ]];then
-                local pkg=${package}
-                git rm -r trunk
-            else
-                local pkg="${package}-$ver"
-                git rm -r repos/"${source_repo}-$CARCH"
-            fi
-            commit_msg="[${source_repo}] '$pkg' ${action}"
-            msg "Action: %s" "$commit_msg"
-        else
-            local action='modify'
-            commit_msg="[${source_repo}] '${package}-$ver' ${action}"
-            msg "Action: %s" "$commit_msg"
-            git add .
-
-        fi
-        git commit -m "$commit_msg"
-
-        cd ${tree_dir_artix}/${git_tree}
-
-        if ${push};then
-            msg "Checking (%s)" "${git_tree}"
-            git pull origin master
-            subrepo_push "${package}"
-            sleep 1
-            git push origin master
-        fi
-        git prune
-    else
-        error "Package '%s' does not exist!" "${package}"
-    fi
-}
-
-symlink_commit_pkg(){
-    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
-    if [[ -n ${git_tree} ]];then
-        cd ${tree_dir_artix}/${git_tree}/${package}
-
-        source trunk/PKGBUILD
-        [[ $arch == 'any' ]] && CARCH=any
-        local ver=$(get_full_version "${package}")
-
-        if [[ ${source_repo} == 'trunk' ]];then
-            local action='add'
-            local dest="${target_repo}-$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="${source_repo}-$CARCH" dest="${target_repo}-$CARCH"
-
-            [[ -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="[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
-        msg "Action: %s" "$commit_msg"
-
-        git add .
-        git commit -m "$commit_msg"
-
-        cd ${tree_dir_artix}/${git_tree}
-
-        if ${push};then
-            msg "Checking (%s)" "${git_tree}"
-            git pull origin master
-            subrepo_push "${package}"
-            sleep 1
-            git push origin master
-        fi
-        git prune
-    else
-        error "Package '%s' does not exist!" "${package}"
-    fi
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "source_repo: %s" "${source_repo}"
-    msg2 "target_repo: %s" "${target_repo}"
-    msg2 "package: %s" "${package}"
-
-    msg "ARGS:"
-    msg2 "remove: %s" "${remove}"
-    msg2 "push: %s" "${push}"
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-load_vars /etc/makepkg.conf
-
-source_repo='trunk'
-package=''
-remove=false
-push=false
-pretend=false
-
-cmd=${0##*/}
-target_repo=${cmd%pkg}
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -s <name>          Source repository [default:${source_repo}]"
-    echo '    -p <pkg>           Package name'
-    echo '    -r                 Delete from repo (commitpkg only)'
-    echo '    -u                 Push'
-    echo '    -q                 Query settings and pretend'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:s:urqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        s) source_repo="$OPTARG" ;;
-        p) package="$OPTARG" ;;
-        r) remove=true ;;
-        u) push=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-${pretend} && display_settings && exit 1
-
-if $(is_valid_repo "${source_repo}");then
-    if [[ "${cmd}" == 'commitpkg' ]];then
-        commit_pkg
-    else
-        symlink_commit_pkg
-    fi
-else
-    error "source repository '%s' is not valid!" "${source_repo}"
-fi

bin/deployiso.in

@@ -1,101 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-LIBDIR='@libdir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-iso-publish.sh
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "uplimit: %s kB/s" "${uplimit}"
-
-    msg "ARGS:"
-    msg2 "update: %s" "${update}"
-    msg2 "verbose: %s" "${verbose}"
-    msg2 "torrent: %s" "${torrent}"
-
-    if ${torrent};then
-        msg2 "tracker_url: %s" "${tracker_url}"
-        msg2 "piece_size: %s" "${piece_size}"
-        msg2 "host_mirrors: %s" "${host_mirrors[*]}"
-        msg2 "torrent_meta: %s" "${torrent_meta}"
-    fi
-
-    msg "REMOTE:"
-    msg2 "account: %s" "${account}"
-    msg2 "file_host: %s" "${file_host}"
-    msg2 "project: %s" "${project}"
-
-    msg "UPLOAD:"
-    msg2 "src_dir: ${src_dir}"
-    msg2 "target_dir: ${target_dir}"
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-pretend=false
-update=false
-verbose=false
-torrent=false
-
-rsync_args=(-aP --progress -e ssh)
-
-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 '    -t                 Create iso torrent'
-    echo '    -q                 Query settings and pretend upload'
-    echo '    -v                 Verbose output'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-opts='p:l:uvtqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) profile="$OPTARG" ;;
-        l) uplimit="$OPTARG" ;;
-        u) update=true; rsync_args+=(-u) ;;
-        t) torrent=true ;;
-        v) verbose=true; rsync_args+=(-v --stats) ;;
-        q) pretend=true; rsync_args+=(-n) ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-timer_start=$(get_timer)
-
-rsync_args+=(--bwlimit=${uplimit})
-
-prepare_transfer
-
-${pretend} && display_settings #&& exit 1
-
-sync_dir

bin/find-libdeps.in

@@ -1,86 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util-pkg.sh
-
-set -e
-shopt -s extglob
-
-IGNORE_INTERNAL=0
-
-if [[ $1 = "--ignore-internal" ]]; then
-    IGNORE_INTERNAL=1
-    shift
-fi
-
-script_mode=${0##*/find-lib}
-
-case $script_mode in
-    deps|provides) true;;
-    *) die "Unknown mode %s" "$script_mode" ;;
-esac
-
-if [[ -z $1 ]]; then
-    echo "${0##*/} [options] <package file|extracted package dir>"
-    echo "Options:"
-    echo "    --ignore-internal      ignore internal libraries"
-    exit 1
-fi
-
-if [[ -d $1 ]]; then
-    pushd $1 >/dev/null
-else
-    WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")
-
-    case ${script_mode} in
-        deps) bsdtar -C "$WORKDIR" -xf "$1";;
-        provides) bsdtar -C "$WORKDIR" -xf "$1" --include="*.so*";;
-    esac
-
-    pushd "$WORKDIR" >/dev/null
-fi
-
-case $script_mode in
-    deps) find_args=(-perm -u+x);;
-    provides) find_args=(-name *.so*);;
-esac
-
-find $PWD -type f "${find_args[@]}" | while read 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 "${sofile}" "${soarch}"
-    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 "${sofile}" "${soarch}"
-        done
-    fi
-done
-
-popd >/dev/null

bin/finddeps.in

@@ -1,48 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-match=$1
-
-if [[ -z $match ]]; then
-    echo 'Usage: finddeps <depname>'
-    echo ''
-    echo 'Find packages that depend on a given depname.'
-    echo 'Run this script from the top-level directory of your ABS tree.'
-    echo ''
-    exit 1
-fi
-
-find $PWD -type d | while read d; do
-    if [[ -f "$d/PKGBUILD" ]]; then
-        unset pkgname depends makedepends optdepends
-        . "$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/iso/buildiso.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,83 +12,54 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-iso.sh
+. @libdir@/artools/util-base.sh
+. @libdir@/artools/util-iso.sh
 
 prepare_build(){
     timer_start=$(get_timer)
 
-    load_profile "${profile}"
+    load_profile "${PROFILE}"
 
     local pacman_conf pac_file="pacman-default.conf"
 
-    case "${stablility}" in
-        'gremlins'|'goblins') pac_file="pacman-${stablility}.conf" ;;
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') pac_file="pacman-${REPOSITORY}.conf" ;;
     esac
 
     pacman_conf="${DATADIR}/$pac_file"
-    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
+    [[ -f ${USERCONFDIR}/artools/$pac_file ]] && pacman_conf="${USERCONFDIR}/artools/$pac_file"
 
     iso_file=$(gen_iso_fn).iso
 
-    mkchroot_args+=(-C ${pacman_conf})
-    work_dir=${chroots_iso}/${profile}/${target_arch}
+    iso_label="ARTIX_$(date +%Y%m)"
 
-    iso_dir="${iso_pool}/${profile}"
+    mkchroot_args+=(-C ${pacman_conf} -m)
+    work_dir=${CHROOTS_ISO}/${PROFILE}/${ARCH}
 
-    iso_root=${chroots_iso}/${profile}/iso
-    mnt_dir=${chroots_iso}/${profile}/mnt
+    iso_dir="${ISO_POOL}/${PROFILE}"
+
+    iso_root=${CHROOTS_ISO}/${PROFILE}/iso
+    mnt_dir=${CHROOTS_ISO}/${PROFILE}/mnt
     prepare_dir "${mnt_dir}"
     prepare_dir "${iso_dir}"
-}
-
-show_profile(){
-    msg2 "iso_file: %s" "${iso_file}"
-    if ${verbose};then
-        msg2 "autologin: %s" "${autologin}"
-
-        msg2 "hostname: %s" "${hostname}"
-        msg2 "username: %s" "${username}"
-        msg2 "password: %s" "${password}"
-        msg2 "addgroups: %s" "${addgroups}"
-
-        msg2 "services_live: %s" "${services_live[*]}"
-        msg2 "services: %s" "${services[*]}"
-    fi
+    prepare_dir "${iso_root}"
 }
 
 display_settings(){
-    show_version
-    show_config
-
     msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "initsys: %s" "${initsys}"
-    [[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
-    msg2 "stablility: %s" "${stablility}"
-
-    msg "ARGS:"
-    msg2 "clean_first: %s" "${clean_first}"
-    msg2 "images_only: %s" "${images_only}"
-    msg2 "iso_only: %s" "${iso_only}"
-    msg2 "persist: %s" "${persist}"
+    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 "ISO_VERSION: %s" "${ISO_VERSION}"
 
     msg "BUILD:"
     show_profile
 }
 
 build(){
-    msg "Start building [%s]" "${profile}"
+    msg "Start building [%s]" "${PROFILE}"
     if ${clean_first};then
         for copy in "${work_dir}"/*; do
             [[ -d $copy ]] || continue
@@ -103,54 +77,55 @@ build(){
     fi
 
     if ${iso_only}; then
-        [[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
+        [[ ! -d ${work_dir} ]] && die "Create images: %s -p %s -x" "${cmd}" "${PROFILE}"
         compress_images
         exit 1
     fi
     if ${images_only}; then
         prepare_images
-        warning "Continue compress: buildiso -p %s -zc ..." "${profile}"
+        warning "Continue compress: %s -p %s -zc ..." "${cmd}" "${PROFILE}"
         exit 1
     else
         prepare_images
         compress_images
     fi
-    msg "Finished building [%s]" "${profile}"
+    msg "Finished building [%s]" "${PROFILE}"
     show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
 load_user_info
 
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
 clean_first=true
 pretend=false
 images_only=false
 iso_only=false
-verbose=false
+log=false
 persist=false
 
 mkchroot_args=()
 cmd=${0##*/}
-stablility=${cmd##*-}
+
+REPOSITORY=${cmd##*-}
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Profile [default: ${profile}]"
+    echo "Usage: ${cmd} [options]"
+    echo "    -p <profile>       Profile [default: ${PROFILE}]"
     echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_iso}]"
+    echo "                       [default: ${CHROOTS_ISO}]"
     echo '    -t <dir>           Target directory'
-    echo "                       [default: ${iso_pool}]"
+    echo "                       [default: ${ISO_POOL}]"
     echo '    -i <name>          Init system to use'
-    echo "                       [default: ${initsys}]"
+    echo "                       [default: ${INITSYS}]"
     echo '    -g <key>           The gpg key for sfs signing'
-    echo "                       [default: ${gpgkey}]"
+    echo "                       [default: ${GPG_KEY}]"
     echo '    -m                 Set SquashFS image mode to persistence'
     echo '    -c                 Disable clean work dir'
     echo '    -x                 Build images only'
     echo '    -z                 Generate iso only'
     echo '                       Requires pre built images (-x)'
-    echo '    -v                 Verbose output to log file, show profile detail (-q)'
+    echo '    -l                 Log to file'
     echo '    -q                 Query settings and pretend build'
     echo '    -h                 This help'
     echo ''
@@ -160,20 +135,20 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:r:t:i:g:czxmvqh'
+opts='p:r:t:i:g:czxmlqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) profile="$OPTARG" ;;
-        r) chroots_iso="$OPTARG" ;;
-        t) iso_pool="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        g) gpgkey="$OPTARG" ;;
+        p) PROFILE="$OPTARG" ;;
+        r) CHROOTS_ISO="$OPTARG" ;;
+        t) ISO_POOL="$OPTARG" ;;
+        i) INITSYS="$OPTARG" ;;
+        g) GPG_KEY="$OPTARG" ;;
         c) clean_first=false ;;
         x) images_only=true ;;
         z) iso_only=true ;;
         m) persist=true ;;
-        v) verbose=true ;;
+        l) log=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;

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/mkpkgclean.in

@@ -1,93 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-version=@version@
-
-LIBDIR='@libdir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-
-prepare_clean(){
-    if [[ -n ${repository} ]];then
-        storage_dir=${repos_root}/${repository}/os/${target_arch}
-        paccache_args+=(-c "${storage_dir}" -k 1)
-    else
-        if [[ -n ${PKGDEST} ]];then
-            storage_dir=${PKGDEST}
-            paccache_args+=(-c "${storage_dir}" -k 4)
-        else
-            die "PKGDEST not set in makepkg.conf!"
-        fi
-    fi
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "repository: %s" "${repository}"
-
-    msg "PATH:"
-    msg2 "storage_dir: %s" "${storage_dir}"
-
-    msg "ARGS:"
-    msg2 "paccache_args: %s" "${paccache_args[*]}"
-
-    paccache "${paccache_args[@]}"
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-load_vars /etc/makepkg.conf
-
-clean=false
-pretend=false
-repository=''
-storage_dir=''
-paccache_args=(-v)
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -d <dir>           Directory [default:${repository}]"
-    echo '    -c                 Clean up'
-    echo '    -q                 Query settings and pretend cleaning'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='d:cqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        d) repository="$OPTARG" ;;
-        c) clean=true ; paccache_args+=(-r) ;;
-        q) pretend=true; paccache_args+=(-d) ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-prepare_clean
-
-${pretend} && display_settings && exit 1
-
-${clean} && paccache "${paccache_args[@]}"

bin/pkg/buildpkg.in

@@ -0,0 +1,110 @@
+#!/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
+. @libdir@/artools/util-pkg.sh
+
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
+create_first=false
+
+mkchrootpkg_args=(-c -n)
+
+cmd=${0##*/}
+repo=${cmd#*-}
+base_devel=('base-devel')
+
+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() {
+    echo "Usage: ${0##*/} [options] -- [mkchrootpkg_args]"
+    echo "    -r <dir>           Create chroots in this directory"
+    echo '    -c                 Recreate the chroot before building'
+    echo '    -h                 This help'
+    echo ''
+    echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='hcr:'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) CHROOTS_PKG="$OPTARG" ;;
+        c) create_first=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
+    esac
+done
+
+check_root SOURCE_DATE_EPOCH
+
+mkchrootpkg_args+=("${@:$OPTIND}")
+
+if ${create_first} || [[ ! -d "${CHROOTS_PKG}/${repo}-${ARCH}" ]];then
+    msg "Creating chroot for [%s] (%s)..." "${repo}" "${ARCH}"
+
+    for copy in "${CHROOTS_PKG}/${repo}-${ARCH}"/*; do
+        [[ -d $copy ]] || continue
+        msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
+
+        lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
+
+        subvolume_delete_recursive "${copy}"
+        rm -rf --one-file-system "${copy}"
+    done
+    lock_close 9
+
+    rm -rf --one-file-system "${CHROOTS_PKG}/${repo}-${ARCH}"
+    mkdir -p "${CHROOTS_PKG}/${repo}-${ARCH}"
+    setarch "${ARCH}" mkchroot \
+        -C "${pacman_conf}" \
+        -M "${makepkg_conf}" \
+        "${CHROOTS_PKG}/${repo}-${ARCH}/root" \
+        "${base_devel[@]}" || abort
+else
+    lock 9 "${CHROOTS_PKG}/${repo}-${ARCH}/root.lock" "Locking clean chroot"
+    chroot-run \
+        -C "${pacman_conf}" \
+        -M "${makepkg_conf}" \
+        "${CHROOTS_PKG}/${repo}-${ARCH}/root" \
+        pacman -Syu --noconfirm || abort
+fi
+
+# Always build official packages reproducibly
+if [[ ! -v SOURCE_DATE_EPOCH ]]; then
+    export SOURCE_DATE_EPOCH=$(date +%s)
+fi
+
+timer_start=$(get_timer)
+
+msg "Building in chroot for [%s] (%s)..." "${repo}" "${ARCH}"
+exec mkchrootpkg -r "${CHROOTS_PKG}/${repo}-${ARCH}" "${mkchrootpkg_args[@]}"
+
+show_elapsed_time "${FUNCNAME}" "${timer_start}"

bin/pkg/buildtree.in

@@ -0,0 +1,204 @@
+#!/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
+. @libdir@/artools/util-pkg.sh
+
+pull_tree_arch(){
+    cd ${TREE_DIR_ARCH}
+    for tree in ${TREE_NAMES_ARCH[@]};do
+        if [[ -d ${tree} ]];then
+            cd ${tree}
+            pull_tree "${tree}" "$(get_local_head)" "Arch"
+            cd ..
+        else
+            clone_tree "${HOST_TREE_ARCH}" "${tree}" "Arch"
+        fi
+    done
+}
+
+pull_tree_artix(){
+    cd ${TREE_DIR_ARTIX}
+    for tree in ${TREE_NAMES_ARTIX[@]};do
+        if [[ -d ${tree} ]];then
+            config_tree "${tree}"
+            cd ${tree}
+            pull_tree "${tree}" "$(get_local_head)"
+            cd ..
+        else
+            clone_tree "${HOST_TREE_ARTIX}" "${tree}"
+            config_tree "${tree}"
+        fi
+    done
+}
+
+sync_pkg(){
+    local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
+    local src="$1" dest="$2"
+
+    rsync "${rsync_args[@]}" $src/ $dest/
+}
+
+show_deps(){
+    local src="$1" repo="$2"
+
+    . $src/PKGBUILD 2>/dev/null
+
+    [[ $arch == 'any' ]] && CARCH=any
+
+    local archver=$(get_full_version $pkg)
+
+    msg2 "repo: %s" "$repo"
+    [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
+    msg2 "pkgname: %s" "${pkgname[*]}"
+    [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
+    msg2 "Arch Version: %s" "$archver"
+    msg2 "arch: %s" "$CARCH"
+
+    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
+    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
+}
+
+from_arch(){
+    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 package=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$package" "${staging}" "${unstable}")
+
+    src=$package/repos/$repo
+
+    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "$pkg")
+    local tree_dir=$(get_artix_tree "$pkg" "$git_tree_artix" "$git_tree_arch")
+
+    dest=${TREE_DIR_ARTIX}/$tree_dir/$pkg/trunk
+
+    msg "tree: %s" "$tree_dir"
+    show_deps "$src" "$repo"
+
+    if [[ -d $dest ]];then
+
+        cd ${TREE_DIR_ARTIX}/$git_tree_artix
+
+        . $dest/PKGBUILD 2>/dev/null
+        local artixver=$(get_full_version $pkg)
+
+        msg2 "Artix Version: %s" "$artixver"
+    else
+        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 pkg="$1" src=
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+
+    local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$pkg_path" "${staging}" "${unstable}")
+
+    src=$pkg_path/repos/$repo
+
+    show_deps "$src" "$repo"
+}
+
+sync_repos(){
+    ${sync_arch} && pull_tree_arch
+    ${sync_artix} && pull_tree_artix
+}
+
+load_user_info
+
+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
+
+sync=false
+sync_arch=true
+sync_artix=true
+import=false
+view=false
+createnew=false
+conf=false
+unstable=false
+staging=true
+
+PACKAGE=''
+
+TEAM=${TREE_NAMES_ARTIX[0]}
+GROUP=${TREE_NAMES_ARTIX[0]}
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo '    -p <pkg>      Package name'
+    echo '    -t <team>     Team name (only with -n)'
+    echo "                  [default: ${TEAM}]"
+    echo '    -g <group>    Group name, the superrepo (only with -n)'
+    echo "                  [default: ${GROUP}]"
+    echo "    -s            Clone or pull repos"
+    echo "    -z            Don't clone or pull arch repos"
+    echo "    -y            Don't clone or pull artix repos"
+    echo '    -i            Import a package from arch repos'
+    echo '    -n            Make new remote subrepo and clone it'
+    echo '    -u            Include kde & gnome unstable (only with -i)'
+    echo '    -w            Exclude staging (only with -i)'
+    echo '    -v            View package depends'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='p:t:g:uwsinzyvh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        p) PACKAGE="$OPTARG" ;;
+        t) TEAM="$OPTARG" ;;
+        g) GROUP="$OPTARG" ;;
+        s) sync=true ;;
+        z) sync_arch=false ;;
+        y) sync_artix=false ;;
+        i) import=true ;;
+        n) createnew=true ;;
+        w) staging=false ;;
+        u) unstable=true ;;
+        v) view=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+prepare_dir "${TREE_DIR_ARTIX}"
+prepare_dir "${TREE_DIR_ARCH}"
+
+${sync} && sync_repos
+
+${view} && view_build "${PACKAGE}"
+
+${import} && from_arch "${PACKAGE}"
+
+${createnew} && subrepo_new "${PACKAGE}" "${GROUP}" "${TEAM}"

bin/pkg/commitpkg.in

@@ -0,0 +1,196 @@
+#!/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
+. @libdir@/artools/util-pkg.sh
+
+get_path(){
+    local repo="$1" pkg=trunk/PKGBUILD
+    if [[ $repo != trunk ]]; then
+        [[ -f repos/$repo-${ARCH}/PKGBUILD ]] && pkg=repos/$repo-${ARCH}/PKGBUILD
+        [[ -f repos/$repo-any/PKGBUILD ]] && pkg=repos/$repo-any/PKGBUILD
+    fi
+    echo $pkg
+}
+
+prepare_commit(){
+    local dest="$1"
+    [[ -d repos/$dest ]] && git rm -r repos/$dest
+    [[ ! -d repos ]] && mkdir repos
+    [[ ! -d repos/$dest ]] && mkdir repos/$dest
+}
+
+commit_pkg(){
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    if [[ -n ${git_tree} ]];then
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}
+
+        local head=$(get_local_head)
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
+
+        local pkgbuild=$(get_path "${REPO_SRC}")
+
+        . $pkgbuild
+        [[ $arch == 'any' ]] && CARCH=any
+
+        local version=$(get_full_version)
+
+        local commit_msg=""
+
+        if ${remove};then
+            local action='remove'
+            if [[ "${REPO_SRC}" == 'trunk' ]];then
+                local pkg=${PACKAGE}
+                git rm -r trunk
+            else
+                local pkg="${PACKAGE}-$version"
+                git rm -r repos/"${REPO_SRC}-$CARCH"
+            fi
+            commit_msg="[${REPO_SRC}] '$pkg' ${action}"
+            msg "Action: %s" "$commit_msg"
+        else
+            local action='modify'
+            commit_msg="[${REPO_SRC}] '${PACKAGE}-$version' ${action}"
+            msg "Action: %s" "$commit_msg"
+            git add .
+
+        fi
+        git commit -m "$commit_msg"
+
+        cd ${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
+}
+
+symlink_commit_pkg(){
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    if [[ -n ${git_tree} ]];then
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}
+
+        local head=$(get_local_head)
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
+
+        local pkgbuild=$(get_path "${REPO_SRC}")
+
+        . $pkgbuild
+        [[ $arch == 'any' ]] && CARCH=any
+
+        local version=$(get_full_version)
+
+        if [[ ${REPO_SRC} == 'trunk' ]];then
+            local action='add'
+            local dest="${REPO_DEST}-$CARCH"
+
+            prepare_commit "$dest"
+
+            cp trunk/* repos/$dest/
+        else
+            local action='move'
+            local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"
+
+            [[ ! -f repos/$src/PKGBUILD ]] && die "%s does not exist!" "repos/$src/PKGBUILD"
+            prepare_commit "$dest"
+
+            cp repos/$src/* repos/$dest/
+            git rm -r repos/$src
+        fi
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$version' ${action}"
+        msg "Action: %s" "$commit_msg"
+
+        git add .
+        git commit -m "$commit_msg"
+
+        cd ${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_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
+
+REPO_SRC='trunk'
+PACKAGE=''
+remove=false
+push=false
+
+cmd=${0##*/}
+REPO_DEST=${cmd%pkg}
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -s <name>          Source repository [default:${REPO_SRC}]"
+    echo '    -p <pkg>           Package name'
+    echo '    -r                 Delete from repo (commitpkg only)'
+    echo '    -u                 Push'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='p:s:urh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        s) REPO_SRC="$OPTARG" ;;
+        p) PACKAGE="$OPTARG" ;;
+        r) remove=true ;;
+        u) push=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+if $(is_valid_repo "${REPO_SRC}");then
+    if [[ "${cmd}" == 'commitpkg' ]];then
+        commit_pkg
+    else
+        symlink_commit_pkg
+    fi
+else
+    error "source repository '%s' is not valid!" "${REPO_SRC}"
+fi

bin/pkg/comparepkg.in

@@ -0,0 +1,245 @@
+#!/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
+. @libdir@/artools/util-pkg.sh
+
+compare(){
+    local pkgpath="$1"
+    local pkg=${pkgpath##*/}
+    local artixrepo=$(find_repo "$package" "${staging}" "${unstable}")
+    local artixshow=${artixrepo%-*}
+    local pkgbuild=$pkgpath/repos/$artixrepo/PKGBUILD
+
+    if [[ -f $pkgbuild ]];then
+
+        . $pkgbuild 2>/dev/null
+        local artixver=$(get_full_version $pkg)
+
+        local archpath=$(get_import_path $pkg)
+
+        local archrepo=$(find_repo "$archpath" "${staging}" "${unstable}")
+
+        local archshow=${archrepo%-*}
+        pkgbuild=$archpath/repos/$archrepo/PKGBUILD
+
+        if [[ -f $pkgbuild ]];then
+            . $pkgbuild 2>/dev/null
+            local archver=$(get_full_version $pkg)
+        fi
+
+        local result=$(vercmp "$artixver" "$archver")
+
+        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
+
+        fi
+        unset pkgver epoch pkgrel artixver archver pkgbuild archpath
+
+    fi
+}
+
+is_db_entry() {
+    local pkgname="$1" repo="$(arch2artix $2)"
+    if [[ -d ${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/$repo/$pkgname ]];then
+        return 0
+    fi
+    return 1
+}
+
+check_db(){
+    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
+}
+
+update_db_cache(){
+    msg "Updating database cache"
+    for repo in "${searchrepos[@]}"; do
+        local cachedir=${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/${repo}
+        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"
+}
+
+query_db() {
+    msg_table_header "%-20s %-45s %s" "Repo" "Package" "Library"
+    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%/*}"
+
+                msg_row "%-20s %-45s %s" "${repo}" "${pkg}" "${match}"
+            done < <(grep -rZ "${library}" "${db}") | sort -u
+        fi
+    done
+    exit 0
+}
+
+show_version_table(){
+
+    if ${check};then
+        ${sync} && update_db_cache
+        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
+}
+
+load_user_info
+
+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
+
+unstable=false
+staging=true
+upgrades=false
+downgrades=false
+move=false
+check=false
+sync=false
+query=false
+
+artix_repos=(
+    'goblins' 'gremlins' 'system' 'world'
+    'galaxy-goblins' 'galaxy-gremlins' 'galaxy'
+    'lib32-goblins' 'lib32-gremlins' 'lib32'
+    'gnome-wobble' 'kde-wobble'
+)
+
+searchrepos=(${artix_repos[@]})
+
+usage() {
+    echo "Usage: ${0##*/} [options] (with -q [libname])"
+    echo '    -u            Show upgrade packages'
+    echo '    -d            Show downgrade packages'
+    echo '    -m            Show packages to move'
+    echo "    -x            Don't inlcude staging packages"
+    echo '    -y            Include unstable kde and gnome'
+    echo '    -c            Check repos'
+    echo "    -s            Sync repo databases"
+    echo "    -q            Query repo databases for so libs"
+    echo '    -r <repo>     Repo name to query'
+    echo '                  [default: all]'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='r:qcsudmxyh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        u) upgrades=true ;;
+        d) downgrades=true ;;
+        m) move=true ;;
+        x) staging=false ;;
+        y) 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))
+
+library="$1"; shift
+
+show_version_table

bin/pkg/deploypkg.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,29 +12,31 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
-LIBDIR='@libdir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg.sh
+. @libdir@/artools/util-base.sh
+. @libdir@/artools/util-pkg.sh
 
 update_repo(){
-    local repo="$1" pkgfile ver ext=db.tar.xz
-    local repo_path=${repos_root}/$repo/os/${target_arch} packages=()
-    source PKGBUILD
-    for name in ${pkgname[@]};do
-        [[ $arch == any ]] && CARCH=any
+    local repo="$1" pkgfile ver
+    local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
+
+    . PKGBUILD
+
+    local pkgsearch=(${pkgname[@]})
+    if check_option "debug" "y"; then
+        pkgbase=${pkgbase:-${pkgname[@]}}
+        pkgsearch+=("${pkgbase}-debug")
+    fi
+
+    for name in ${pkgsearch[@]}; do
+        pkgarch=$(get_pkg_arch "$name")
         ver=$(get_full_version "$name")
-        if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
+        if pkgfile=$(find_cached_package "$name" "$ver" "$pkgarch");then
             local pkg=${pkgfile##*/}
             info "Found: %s" "$pkg"
             if ${add_pkg};then
                 local action='add'
                 packages+=("$pkg")
-#                 checkpkg $pkg
+#                 checkpkg "${pkgfile}" || return 2
                 if ${sign_pkg};then
                     [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
                     signfile ${pkgfile}
@@ -46,59 +51,48 @@ update_repo(){
         fi
     done
     cd $repo_path
-    [[ -n $action ]] && repo-$action -R $repo.$ext ${packages[@]}
+    if [[ -n $action ]]; then
+        repo-$action -R $repo.${PKGDBEXT} ${packages[@]}
+        ${linksdb} && links-$action $repo.${LINKSDBEXT} ${packages[@]}
+    fi
+
     return 0
 }
 
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "repository: %s" "${repository}"
-
-    msg "ARGS:"
-    msg2 "add_pkg: %s" "${add_pkg}"
-    msg2 "del_pkg: %s" "${del_pkg}"
-    msg2 "sign_pkg: %s" "${sign_pkg}"
-}
-
 load_user_info
 
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+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
 
-pretend=false
 add_pkg=false
 del_pkg=false
-repository=
 sign_pkg=false
+linksdb=false
+
+cmd=${0##*/}
+dest_repo=${cmd#*-}
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -d                 Destination repository [default:${repository}]"
+    echo "Usage: ${cmd} [options]"
     echo '    -a                 Add package(s) to repository'
     echo '    -r                 Remove package(s) from repository'
+    echo '    -l                 Use links db'
     echo '    -s                 Sign package(s)'
-    echo '    -q                 Query settings and pretend upload'
     echo '    -h                 This help'
     echo ''
     echo ''
     exit $1
 }
 
-orig_argv=("$0" "$@")
-
-opts='d:arsqh'
+opts='arlsh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        d) repository="$OPTARG" ;;
         a) add_pkg=true; del_pkg=false ;;
         r) del_pkg=true; add_pkg=false ;;
+        l) linksdb=true ;;
         s) sign_pkg=true ;;
-        q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -106,8 +100,6 @@ done
 
 shift $(($OPTIND - 1))
 
-prepare_dir "${repos_root}"
+prepare_dir "${REPOS_ROOT}"
 
-${pretend} && display_settings && exit 1
-
-update_repo "${repository}"
+update_repo "${dest_repo}"

bin/pkg/lddd.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,11 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+. @libdir@/artools/util-base.sh
 
 ifs=$IFS
 IFS="${IFS}:"

bin/pkg/links-add.in

@@ -0,0 +1,518 @@
+#!/bin/bash
+#
+#   links-add - add a package to a given repo database file
+#   links-remove - remove a package entry from a given repo database file
+#
+#   Copyright (c) 2006-2018 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2019 artoo@artixlinux.org
+#
+#   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; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   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.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+shopt -s extglob
+
+declare -r REPO_DB_NAME="links"
+
+QUIET=0
+ONLYADDNEW=0
+SIGN=0
+KEY=0
+VERIFY=0
+REPO_DB_FILE=
+REPO_DB_PREFIX=
+REPO_DB_SUFFIX=
+LOCKFILE=
+CLEAN_LOCK=0
+
+. @libdir@/artools/util-base.sh
+
+# ensure we have a sane umask set
+umask 0022
+
+# print usage instructions
+usage() {
+    cmd=${0##*/}
+    printf -- "%s \n\n" "$cmd"
+    if [[ $cmd == "links-add" ]] ; then
+        printf -- "Usage: links-add [options] <path-to-db> <package> ...\n"
+        printf -- "\n"
+        printf -- "\
+links-add will update a package database by reading a package file.\n\
+Multiple packages to add can be specified on the command line.\n"
+        printf -- "\n"
+        printf -- "Options:\n"
+        printf -- "  -n, --new         only add packages that are not already in the database\n"
+    elif [[ $cmd == "links-remove" ]] ; then
+        printf -- "Usage: links-remove [options] <path-to-db> <packagename> ...\n"
+        printf -- "\n"
+        printf -- "\
+links-remove will update a package database by removing the package name\n\
+specified on the command line from the given repo database. Multiple\n\
+packages to remove can be specified on the command line.\n"
+        printf -- "\n"
+        printf -- "Options:\n"
+    else
+        printf -- "Please move along, there is nothing to see here.\n"
+        return
+    fi
+    printf -- "  --nocolor         turn off color in output\n"
+    printf -- "  -q, --quiet       minimize output\n"
+    printf -- "  -s, --sign        sign database with GnuPG after update\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
+    printf "\n"
+    if [[ $cmd == "links-add" ]] ; then
+        printf -- "Example:  links-add /path/to/repo.${LINKSDBEXT} pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
+    elif [[ $cmd == "links-remove" ]] ; then
+        printf -- "Example:  links-remove /path/to/repo.${LINKSDBEXT} kernel26\n"
+    fi
+}
+
+find_pkgentry() {
+    local pkgname=$1
+    local pkgentry
+
+    for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
+        name=${pkgentry##*/}
+        if [[ ${name%-*-*} = $pkgname ]]; then
+            echo $pkgentry
+            return 0
+        fi
+    done
+    return 1
+}
+
+check_gpg() {
+    if ! type -p gpg >/dev/null; then
+        error "Cannot find the gpg binary! Is GnuPG installed?"
+        exit 1 # $E_MISSING_PROGRAM
+    fi
+
+    if (( ! VERIFY )); then
+        if ! gpg --list-key ${GPGKEY} &>/dev/null; then
+            if [[ ! -z $GPGKEY ]]; then
+                error "The key ${GPGKEY} does not exist in your keyring."
+            elif (( ! KEY )); then
+                error "There is no key in your keyring."
+            fi
+            exit 1
+        fi
+    fi
+}
+
+# sign the package database once repackaged
+create_signature() {
+    (( ! SIGN )) && return
+    local dbfile=$1
+    local ret=0
+    msg "Signing database '%s'..." "${dbfile##*/.tmp.}"
+
+    local SIGNWITHKEY=""
+    if [[ -n $GPGKEY ]]; then
+        SIGNWITHKEY="-u ${GPGKEY}"
+    fi
+    gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$?
+
+    if (( ! ret )); then
+        msg2 "Created signature file '%s'" "${dbfile##*/.tmp.}.sig"
+    else
+        warning "Failed to sign package database file '%s'" "${dbfile##*/.tmp.}"
+    fi
+}
+
+# verify the existing package database signature
+verify_signature() {
+    (( ! VERIFY )) && return
+    local dbfile=$1
+    local ret=0
+    msg "Verifying database signature..."
+
+    if [[ ! -f $dbfile.sig ]]; then
+        warning "No existing signature found, skipping verification."
+        return
+    fi
+    gpg --verify "$dbfile.sig" || ret=$?
+    if (( ! ret )); then
+        msg2 "Database signature file verified."
+    else
+        error "Database signature was NOT valid!"
+        exit 1
+    fi
+}
+
+verify_repo_extension() {
+    local repofile=$1
+
+    case $repofile in
+        *.links.tar.gz)  TAR_OPT="z" ;;
+        *.links.tar.bz2) TAR_OPT="j" ;;
+        *.links.tar.xz)  TAR_OPT="J" ;;
+        *.links.tar.zst) TAR_OPT="--zstd" ;;
+        *.links.tar.Z)   TAR_OPT="Z" ;;
+        *.links.tar)     TAR_OPT="" ;;
+        *) error "'%s' does not have a valid database archive extension." \
+                "$repofile"
+            exit 1 ;;
+    esac
+
+    printf '%s' "$TAR_OPT"
+}
+
+# write an entry to the pacman database
+#   arg1 - path to package
+db_write_entry() {
+    # blank out all variables
+    local pkgfile=$1
+
+    local pkgname pkgver
+
+    # read info from the zipped package
+    local line var val
+    while read -r line; do
+        [[ ${line:0:1} = '#' ]] && continue
+        IFS=' =' read -r var val < <(printf '%s\n' "$line")
+        # normalize whitespace with an extglob
+        declare "$var=${val//+([[:space:]])/ }"
+
+    done< <(bsdtar -xOqf "$pkgfile" .PKGINFO)
+
+    # ensure $pkgname and $pkgver variables were found
+    if [[ -z $pkgname || -z $pkgver ]]; then
+        error "Invalid package file '%s'." "$pkgfile"
+        return 1
+    fi
+
+    if [[ -d $tmpdir/${REPO_DB_NAME}/$pkgname-$pkgver ]]; then
+        warning "An entry for '%s' already existed" "$pkgname-$pkgver"
+        if (( ONLYADDNEW )); then
+            return 0
+        fi
+    fi
+
+    # remove an existing entry if it exists, ignore failures
+    db_remove_entry "$pkgname"
+
+    local tmppkg=$tmpdir/pkg/$pkgname-$pkgver
+
+    mkdir "$tmppkg"
+
+    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"
+    pushd "$pkgname-$pkgver" >/dev/null
+
+    # create links entry
+    msg2 "Creating '%s' db entry..." "${REPO_DB_NAME}"
+
+    local linksentry=$tmpdir/${REPO_DB_NAME}/$pkgname-$pkgver/${REPO_DB_NAME}
+
+    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
+
+    popd >/dev/null
+    popd >/dev/null
+
+    return 0
+}
+
+# remove existing entries from the DB
+#   arg1 - package name
+db_remove_entry() {
+    local pkgname=$1
+    local notfound=1
+    local pkgentry=$(find_pkgentry "$pkgname")
+    while [[ -n $pkgentry ]]; do
+        notfound=0
+
+        msg2 "Removing existing entry '%s'..." \
+        "${pkgentry##*/}"
+        rm -rf "$pkgentry"
+
+        # remove entries in "links" database
+        local linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
+        rm -rf "$linksentry"
+
+        pkgentry=$(find_pkgentry "$pkgname")
+    done
+    return $notfound
+}
+
+prepare_repo_db() {
+    local repodir dbfile
+
+    # ensure the path to the DB exists; $LOCKFILE is always an absolute path
+    repodir=${LOCKFILE%/*}/
+
+    if [[ ! -d $repodir ]]; then
+        error "%s does not exist or is not a directory." "$repodir"
+        exit 1
+    fi
+
+    # check lock file
+    if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then
+        CLEAN_LOCK=1
+    else
+        error "Failed to acquire lockfile: %s." "$LOCKFILE"
+        [[ -f $LOCKFILE ]] && error "Held by process %s" "$(cat "$LOCKFILE")"
+        exit 1
+    fi
+
+    dbfile=${repodir}/$REPO_DB_PREFIX.${REPO_DB_NAME}.$REPO_DB_SUFFIX
+
+    if [[ -f $dbfile ]]; then
+        # there are two situations we can have here:
+        # a DB with some entries, or a DB with no contents at all.
+        if ! bsdtar -tqf "$dbfile" '*/links' >/dev/null 2>&1; then
+            # check empty case
+            if [[ -n $(bsdtar -tqf "$dbfile" '*' 2>/dev/null) ]]; then
+                error "Repository file '%s' is not a proper links database." "$dbfile"
+                exit 1
+            fi
+        fi
+        verify_signature "$dbfile"
+        msg "Extracting %s to a temporary location..." "${dbfile##*/}"
+        bsdtar -xf "$dbfile" -C "$tmpdir/${REPO_DB_NAME}"
+    else
+        case $cmd in
+            links-remove)
+                # only a missing "db" database is currently an error
+                # TODO: remove if statement
+                if [[ ${REPO_DB_NAME} == "links" ]]; then
+                    error "Repository file '%s' was not found." "$dbfile"
+                    exit 1
+                fi
+                ;;
+            links-add)
+                # check if the file can be created (write permission, directory existence, etc)
+                if ! touch "$dbfile"; then
+                    error "Repository file '%s' could not be created." "$dbfile"
+                    exit 1
+                fi
+                rm -f "$dbfile"
+                ;;
+        esac
+    fi
+}
+
+add() {
+    if [[ ! -f $1 ]]; then
+        error "File '%s' not found." "$1"
+        return 1
+    fi
+
+    pkgfile=$1
+    if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then
+        error "'%s' is not a package file, skipping" "$pkgfile"
+        return 1
+    fi
+
+    msg "Adding package '%s'" "$pkgfile"
+
+    db_write_entry "$pkgfile"
+}
+
+remove() {
+    pkgname=$1
+    msg "Searching for package '%s'..." "$pkgname"
+
+    if ! db_remove_entry "$pkgname"; then
+        error "Package matching '%s' not found." "$pkgname"
+        return 1
+    fi
+
+    return 0
+}
+
+rotate_db() {
+    dirname=${LOCKFILE%/*}
+
+    pushd "$dirname" >/dev/null
+
+    filename=${REPO_DB_PREFIX}.${REPO_DB_NAME}.${REPO_DB_SUFFIX}
+    tempname=$dirname/.tmp.$filename
+
+    # hardlink or move the previous version of the database and signature to .old
+    # extension as a backup measure
+    if [[ -f $filename ]]; then
+        ln -f "$filename" "$filename.old" 2>/dev/null || \
+            mv -f "$filename" "$filename.old"
+
+        if [[ -f $filename.sig ]]; then
+            ln -f "$filename.sig" "$filename.old.sig" 2>/dev/null || \
+                mv -f "$filename.sig" "$filename.old.sig"
+        else
+            rm -f "$filename.old.sig"
+        fi
+    fi
+
+    # rotate the newly-created database and signature into place
+    mv "$tempname" "$filename"
+    if [[ -f $tempname.sig ]]; then
+        mv "$tempname.sig" "$filename.sig"
+    fi
+
+    dblink=${filename%.tar*}
+    rm -f "$dblink" "$dblink.sig"
+    ln -s "$filename" "$dblink" 2>/dev/null || \
+        ln "$filename" "$dblink" 2>/dev/null || \
+        cp "$filename" "$dblink"
+    if [[ -f "$filename.sig" ]]; then
+        ln -s "$filename.sig" "$dblink.sig" 2>/dev/null || \
+            ln "$filename.sig" "$dblink.sig" 2>/dev/null || \
+            cp "$filename.sig" "$dblink.sig"
+    fi
+
+    popd >/dev/null
+}
+
+create_db() {
+    TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE")
+    # $LOCKFILE is already guaranteed to be absolute so this is safe
+    dirname=${LOCKFILE%/*}
+
+    filename=${REPO_DB_PREFIX}.${REPO_DB_NAME}.${REPO_DB_SUFFIX}
+    # this ensures we create it on the same filesystem, making moves atomic
+    tempname=$dirname/.tmp.$filename
+
+    pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
+    if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then
+        bsdtar -c${TAR_OPT}f "$tempname" *
+    else
+        # we have no packages remaining? zip up some emptyness
+        warning "No packages remain, creating empty database."
+        bsdtar -c${TAR_OPT}f "$tempname" -T /dev/null
+    fi
+    popd >/dev/null
+
+    create_signature "$tempname"
+}
+
+trap_exit() {
+    # unhook all traps to avoid race conditions
+    trap '' EXIT TERM HUP QUIT INT ERR
+
+    echo
+    error "$@"
+    clean_up 1
+}
+
+clean_up() {
+    local exit_code=${1:-$?}
+
+    # unhook all traps to avoid race conditions
+    trap '' EXIT TERM HUP QUIT INT ERR
+
+    [[ -d $tmpdir ]] && rm -rf "$tmpdir"
+    (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE"
+
+    exit $exit_code
+}
+
+# PROGRAM START
+case $1 in
+    -h|--help) usage; exit 0;;
+esac
+
+# figure out what program we are
+cmd=${0##*/}
+
+if [[ $cmd != "links-add" && $cmd != "links-remove" ]]; then
+    error "Invalid command name '%s' specified." "$cmd"
+    exit 1
+fi
+
+tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/repo-tools.XXXXXXXXXX") || (\
+    error "Cannot create temp directory for database building."; \
+    exit 1)
+
+for repo in "pkg" "${REPO_DB_NAME}"; do
+    mkdir "$tmpdir/$repo"
+done
+
+trap 'clean_up' EXIT
+for signal in TERM HUP QUIT; do
+    trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal"
+done
+trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
+trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
+
+declare -a args
+# parse arguments
+while (( $# )); do
+    case $1 in
+        -q|--quiet) QUIET=1 ;;
+        -n|--new) ONLYADDNEW=1 ;;
+        -s|--sign) SIGN=1 ;;
+        -k|--key) KEY=1 ; shift; GPGKEY=$1 ;;
+        -v|--verify) VERIFY=1 ;;
+        *) args+=("$1") ;;
+    esac
+    shift
+done
+
+REPO_DB_FILE=${args[0]}
+if [[ -z $REPO_DB_FILE ]]; then
+    usage
+    exit 1
+fi
+
+if [[ $REPO_DB_FILE == /* ]]; then
+    LOCKFILE=$REPO_DB_FILE.lck
+else
+    LOCKFILE=$PWD/$REPO_DB_FILE.lck
+fi
+
+verify_repo_extension "$REPO_DB_FILE" >/dev/null
+
+REPO_DB_PREFIX=${REPO_DB_FILE##*/}
+REPO_DB_PREFIX=${REPO_DB_PREFIX%.links.*}
+REPO_DB_SUFFIX=${REPO_DB_FILE##*.links.}
+
+if (( SIGN || VERIFY )); then
+    check_gpg
+fi
+
+if (( VERIFY && ${#args[@]} == 1 )); then
+    dbfile=${repodir}/$REPO_DB_PREFIX.${REPO_DB_NAME}.$REPO_DB_SUFFIX
+
+    if [[ -f $dbfile ]]; then
+        verify_signature "$dbfile"
+    fi
+    exit 0
+fi
+
+prepare_repo_db
+
+fail=0
+for arg in "${args[@]:1}"; do
+    case $cmd in
+        links-add) add "$arg" ;;
+        links-remove) remove "$arg" ;;
+    esac || fail=1
+done
+
+# if the whole operation was a success, re-zip and rotate databases
+if (( !fail )); then
+    msg "Creating updated database file '%s'" "$REPO_DB_FILE"
+    create_db
+    rotate_db
+else
+    msg "No packages modified, nothing to do."
+    exit 1
+fi
+
+exit 0

bin/pkg/mkchrootpkg.in

@@ -1,5 +1,8 @@
 #!/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.
@@ -9,13 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-chroot.sh
+. @libdir@/artools/util-base.sh
 
 shopt -s nullglob
 
@@ -58,35 +55,39 @@ usage() {
     exit 1
 }
 
-sync_chroot() {
-    local chrootdir=$1
-    local copy=$2
-    local copydir=''
-    if [[ ${copy:0:1} = / ]]; then
-        copydir=$copy
-    else
-        copydir="$chrootdir/$copy"
-    fi
+# {{{ functions
 
-    if [[ "$chrootdir/root" -ef "$copydir" ]]; then
+# Usage: sync_chroot $rootdir $copydir [$copy]
+sync_chroot() {
+    local rootdir=$1
+    local copydir=$2
+    local copy=${3:-$2}
+
+    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" \
-        "Locking clean chroot [%s]" "$chrootdir/root"
+    slock 8 "$rootdir.lock" \
+        "Locking clean chroot [%s]" "$rootdir"
 
-    stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copydir"
-    if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
-        subvolume_delete_recursive "$copydir" ||
-            die "Unable to delete subvolume %s" "$copydir"
-        btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||
+    stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$rootdir" "$copy"
+    if is_subvolume "$rootdir" && is_same_fs "$rootdir" "$(dirname -- "$copydir")" && ! mountpoint -q "$copydir"; then
+        if is_subvolume "$copydir"; then
+            subvolume_delete_recursive "$copydir" ||
+                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
 
@@ -103,7 +104,7 @@ delete_chroot() {
     local copy=${1:-$2}
 
     stat_busy "Removing chroot copy [%s]" "$copy"
-    if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
+    if is_subvolume "$copydir" && ! mountpoint -q "$copydir"; then
         subvolume_delete_recursive "$copydir" ||
             die "Unable to delete subvolume %s" "$copydir"
     else
@@ -128,7 +129,10 @@ install_packages() {
     pkgnames=("${install_pkgs[@]##*/}")
 
     cp -- "${install_pkgs[@]}" "$copydir/root/"
-    chroot-run -r "${bindmounts_ro[*]}" -w "${bindmounts_rw[*]}" "$copydir" \
+    chroot-run \
+        -r "${bindmounts_ro[@]}" \
+        -r "${bindmounts_rw[@]}" \
+        "$copydir" \
         pacman -U --noconfirm -- "${pkgnames[@]/#//root/}"
     ret=$?
     rm -- "${pkgnames[@]/#/$copydir/root/}"
@@ -148,8 +152,9 @@ prepare_chroot() {
 
     [[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
 
-    local builduser_uid="${SUDO_UID:-$UID}"
-    local builduser_gid="$(id -g "$builduser_uid")"
+    local builduser_uid builduser_gid
+    builduser_uid="${SUDO_UID:-$UID}"
+    builduser_gid="$(id -g "$builduser_uid")"
     local install="install -o $builduser_uid -g $builduser_gid"
     local x
 
@@ -157,16 +162,11 @@ prepare_chroot() {
     # which we might not be able to load (i.e. when building i686 packages on
     # an x86_64 host).
     sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,shadow,group}
-    printf >>"$copydir/etc/group"  'builduser:x:%d:\n' $builduser_gid
-    printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' $builduser_uid $builduser_gid
+    printf >>"$copydir/etc/group"  'builduser:x:%d:\n' "$builduser_gid"
+    printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' "$builduser_uid" "$builduser_gid"
     printf >>"$copydir/etc/shadow" 'builduser:!!:%d::::::\n' "$(( $(date -u +%s) / 86400 ))"
 
-    $install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
-
-#     for x in .gnupg/pubring.{kbx,gpg}; do
-#         [[ -r $USER_HOME/$x ]] || continue
-#         $install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
-#     done
+    $install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}
 
     sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
     for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
@@ -203,23 +203,22 @@ _chrootbuild() {
     # No coredumps
     ulimit -c 0
 
-    # Work around chroot-run not giving a ctty
-    #exec </dev/console
+    . /etc/locale.conf
 
+    # shellcheck source=/dev/null
     . /etc/profile
 
-    #export LANG=en_US.UTF-8
-
-    # workaround meson locale errors
-    # supposedly fixed with coming python-3.7
-    #locale-gen &> /dev/null
-
+    # Beware, there are some stupid arbitrary rules on how you can
+    # use "$" in arguments to commands with "sudo -i".  ${foo} or
+    # ${1} is OK, but $foo or $1 isn't.
+    # https://bugzilla.sudo.ws/show_bug.cgi?id=765
     sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
-
     ret=$?
     case $ret in
-        0|14) return 0;;
-        *) return $ret;;
+        0|14)
+            return 0;;
+        *)
+            return $ret;;
     esac
 }
 
@@ -231,33 +230,35 @@ _chrootnamcap() {
     done
 }
 
-# Usage: download_sources $copydir $src_owner
+# Usage: download_sources $copydir $makepkg_user
 # Globals:
 #  - SRCDEST
-#  - USER
 download_sources() {
     local copydir=$1
     local makepkg_user=$2
 
-    local builddir
-    builddir="$(mktemp -d)"
-#     chmod 1777 "$builddir"
-    chown "$makepkg_user:" "$builddir"
+#     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 \
-        env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
+        env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
         makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
         die "Could not download sources."
 
     # Clean up garbage from verifysource
-    rm -rf "$builddir"
+#     rm -rf "$builddir"
 }
 
 # Usage: move_products $copydir $owner
 # Globals:
 #  - PKGDEST
 #  - LOGDEST
+#  - SRCPKGDEST
 move_products() {
     local copydir=$1
     local src_owner=$2
@@ -305,8 +306,8 @@ main() {
     chrootdir=
     passeddir=
     makepkg_user=
-    declare -ga install_pkgs
-    declare -gi ret=0
+    declare -a install_pkgs
+    declare -i ret=0
 
     bindmounts_ro=()
     bindmounts_rw=()
@@ -318,7 +319,7 @@ main() {
 
     local opts='hcur:I:l:nTD:d:U:'
 
-    while getopts ${opts} arg; do
+    while getopts "${opts}" arg; do
         case "$arg" in
             c) clean_first=true ;;
             D) bindmounts_ro+=("$OPTARG") ;;
@@ -338,7 +339,7 @@ main() {
     [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
     makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-    check_root SOURCE_DATE_EPOCH,GNUPGHOME
+    check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
 
     # Canonicalize chrootdir, getting rid of trailing /
     chrootdir=$(readlink -e "$passeddir")
@@ -368,7 +369,7 @@ main() {
 
     umask 0022
 
-    load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+    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
@@ -381,11 +382,16 @@ main() {
     lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
 
     if [[ ! -d $copydir ]] || $clean_first; then
-        sync_chroot "$chrootdir" "$copy"
+        sync_chroot "$chrootdir/root" "$copydir" "$copy"
     fi
 
-    $update_first && chroot-run -r "${bindmounts_ro[*]}" -w "${bindmounts_rw[*]}" "$copydir" \
-        pacman -Syu --noconfirm
+    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[@]}"
@@ -399,14 +405,16 @@ main() {
         exit 1
     fi
 
-    download_sources "$copydir" "$src_owner"
+    download_sources "$copydir" "$makepkg_user"
 
     prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
 
-    bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
-
-    if chroot-run -r "${bindmounts_ro[*]}" -w "${bindmounts_rw[*]}" "$copydir" \
-        /chrootbuild "${makepkg_args[@]}"; then
+    if chroot-run \
+        -r "${bindmounts_ro[*]}" \
+        -w "${bindmounts_rw[*]}" \
+        "$copydir" \
+        /chrootbuild "${makepkg_args[@]}"
+    then
         move_products "$copydir" "$src_owner"
     else
         (( ret += 1 ))

bin/pkg/pkg2yaml.in

@@ -0,0 +1,149 @@
+#!/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
+
+write_attr(){
+    local ident1="$1" ident2="$2" ident3="$3"
+    local attrname=$4 attrvalues=("${@:5}")
+
+    # normalize whitespace, strip leading and trailing
+    attrvalues=("${attrvalues[@]//+([[:space:]])/ }")
+    attrvalues=("${attrvalues[@]#[[:space:]]}")
+    attrvalues=("${attrvalues[@]%[[:space:]]}")
+
+    case $attrname in
+        makedepends|checkdepends|depends|provides|arch)
+            Yaml+=$(write_yaml_map $ident1 "$attrname")
+            for v in ${attrvalues[@]};do
+                Yaml+=$(write_yaml_seq $ident2 "$v")
+            done
+        ;;
+        *)
+            for v in ${attrvalues[@]};do
+                Yaml+=$(write_yaml_map $ident3 "$attrname" "$v")
+            done
+        ;;
+    esac
+}
+
+extract_info() {
+    local pkgname=$1 attrname=$2 isarray=$3 outvalue=
+
+    if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then
+        [[ -z $pkgname ]] && write_attr 2 4 2 "$attrname" "${outvalue[@]}"
+        [[ -n $pkgname ]] && write_attr 4 6 2 "$attrname" "${outvalue[@]}"
+    fi
+}
+
+write_details() {
+    local attr package_arch a
+    local multivalued_arch_attrs=(provides depends makedepends checkdepends)
+
+    local singlevalued=()
+    local multivalued=(arch provides depends checkdepends)
+
+    if [[ -z "$1" ]];then
+        singlevalued=(pkgver pkgrel epoch)
+        multivalued=(arch provides depends makedepends checkdepends)
+    fi
+
+    for attr in "${singlevalued[@]}"; do
+        extract_info "$1" "$attr" 0
+    done
+
+    for attr in "${multivalued[@]}"; do
+        extract_info "$1" "$attr" 1
+    done
+
+    get_pkgbuild_attribute "$1" 'arch' 1 'package_arch'
+    for a in "${package_arch[@]}"; do
+        # 'any' is special. there's no support for, e.g. depends_any.
+        [[ $a = any ]] && continue
+
+        for attr in "${multivalued_arch_attrs[@]}"; do
+            extract_info "$1" "${attr}_$a" 1
+        done
+    done
+}
+
+write_pkg_yaml(){
+
+    Yaml=$(write_yaml_header)
+
+    Yaml+=$(write_empty_line)
+
+    local full=$(get_full_version)
+
+    local ver=${full:-0}
+
+    pkgbase=${pkgbase:-${pkgname[0]}}
+
+    Yaml+=$(write_yaml_map 0 "pkgbase")
+    Yaml+=$(write_yaml_map 2 "pkgname" "${pkgbase}")
+    ${details} && write_details ''
+    Yaml+=$(write_yaml_map 2 "fullver" "${ver}")
+
+    Yaml+=$(write_empty_line)
+
+    Yaml+=$(write_yaml_map 0 "package")
+    for pkg in "${pkgname[@]}"; do
+        Yaml+=$(write_yaml_seq_map 2 "pkgname" "$pkg")
+        ${details} && write_details "$pkg"
+    done
+
+    Yaml+=$(write_empty_line)
+
+    local pkgfile=$(print_all_package_names)
+
+    Yaml+=$(write_yaml_map 0 "pkgfile")
+    for f in ${pkgfile[@]};do
+        Yaml+=$(write_yaml_seq 2 "${f##*/}")
+    done
+
+    Yaml+=$(write_empty_line)
+
+    printf '%s' "${Yaml}"
+}
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -d            Don't include details"
+    echo '    -h            This help'
+    echo ''
+    exit $1
+}
+
+details=true
+
+opts='dh'
+
+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 ))
+
+[[ -f "$1"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$1"
+PACKAGE="$1"/PKGBUILD; shift
+
+. "$PACKAGE"
+
+. /etc/makepkg.conf
+
+write_pkg_yaml

data/artools.conf

@@ -3,60 +3,72 @@
 #############################################
 
 # build dir where buildpkg or buildiso chroots are created
-# chroots_dir=/var/lib/artools
+# CHROOTS_DIR=/var/lib/artools
 
 # the workspace directory
-# workspace_dir="/home/${OWNER}/artools-workspace"
+# WORKSPACE_DIR="/home/${OWNER}/artools-workspace"
 
 #############################################
 ################ artools-pkg ################
 #############################################
 
-# git user access token
-# git_token=''
+# gitea user access token
+# GIT_TOKEN=''
 
-# host_tree_artix='gitea@gitea.artixlinux.org:artix'
+# HOST_TREE_ARTIX='gitea@gitea.artixlinux.org:artix'
 
-# host_tree_arch=git://projects.archlinux.org/svntogit
+# 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-devel
+#         packages-ruby
+#         packages-gtk
+#         packages-gnome
+#         packages-cinnamon
+#         packages-lxqt
+#         packages-mate
+#         packages-kde
+# )
+
+# 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
+# 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"
+# ISO_POOL="${WORKSPACE_DIR}/iso"
 
 # the dist release; default: auto
-# iso_version=$(date +%Y%m%d)
+# ISO_VERSION=$(date +%Y%m%d)
 
-# possible values: openrc, (s6, runit) not yet supported
-# initsys="openrc"
-
-# unset defaults to given value
-# kernel="linux"
+# possible values: openrc, runit (s6 not yet supported)
+# INITSYS="openrc"
 
 # gpg key; leave empty or commented to skip sfs signing
-# gpgkey=""
+# GPG_KEY=""
 
 # set upload bandwidth limit in kB/s
-# uplimit=100
-
-# the torrent tracker urls, comma separated
-# tracker_url='udp://mirror.strits.dk:6969'
-
-# file_host="sourceforge.net"
+# UPLIMIT=1000
 
 # the server user
-# account=[SetUser]
-
-# the server project
-# project="artix-linux"
-
-# host mirrors
-# host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
-
-# Piece size, 2^n
-# piece_size=21
+# ACCOUNT=[SetUser]

data/base/pacman-gnome-wobble.conf

@@ -0,0 +1,146 @@
+#
+# /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 -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
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux artix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[gnome-wobble]
+Include = /etc/pacman.d/mirrorlist
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-goblins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[gnome-unstable]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-kde-wobble.conf

@@ -0,0 +1,146 @@
+#
+# /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 -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
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux artix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[kde-wobble]
+Include = /etc/pacman.d/mirrorlist
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-goblins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+[kde-unstable]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pkg/makepkg.conf

@@ -1,4 +1,6 @@
 #!/hint/bash
+# shellcheck disable=2034
+
 #
 # /etc/makepkg.conf
 #
@@ -37,8 +39,8 @@ CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
@@ -143,3 +145,5 @@ COMPRESSZ=(compress -c -f)
 #
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:

initcpio/Makefile

@@ -1,6 +1,5 @@
 DIRMODE = -dm0755
 MODE =  -m0755
-RM = rm -f
 
 CPIOHOOKS = \
 	$(wildcard hooks/*)
@@ -19,13 +18,6 @@ install_initcpio:
 	install $(MODE) $(CPIOINST) $(DESTDIR)$(CPIODIR)/install
 	install $(MODE) $(SCRIPT) $(DESTDIR)$(CPIODIR)
 
-uninstall_initcpio:
-	for f in $(notdir $(CPIOHOOKS)); do $(RM) $(DESTDIR)$(CPIODIR)/hooks/$$f; done
-	for f in $(notdir $(CPIOINST)); do $(RM) $(DESTDIR)$(CPIODIR)/install/$$f; done
-	for f in $(notdir $(SCRIPT)); do $(RM) $(DESTDIR)$(CPIODIR)/$$f; done
-
 install: install_initcpio
 
-uninstall: uninstall_initcpio
-
-.PHONY: install uninstall
+.PHONY: install

lib/base/chroot.sh

@@ -1,4 +1,8 @@
 #!/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.
@@ -9,20 +13,31 @@
 # GNU General Public License for more details.
 
 is_btrfs() {
-	[[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
+    [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
+}
+
+is_subvolume() {
+    [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs && "$(stat -c %i "$1")" == 256 ]]
+}
+
+is_same_fs() {
+    [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]]
 }
 
 subvolume_delete_recursive() {
     local subvol
 
-    is_btrfs "$1" || return 0
+    is_subvolume "$1" || return 0
 
     while IFS= read -d $'\0' -r subvol; do
-        if ! btrfs subvolume delete "$subvol" &>/dev/null; then
-            error "Unable to delete subvolume %s" "$subvol"
+        if ! subvolume_delete_recursive "$subvol"; then
             return 1
         fi
-    done < <(find "$1" -xdev -depth -inum 256 -print0)
+    done < <(find "$1" -mindepth 1 -xdev -depth -inum 256 -print0)
+    if ! btrfs subvolume delete "$1" &>/dev/null; then
+        error "Unable to delete subvolume %s" "$subvol"
+        return 1
+    fi
 
     return 0
 }

lib/base/fstab.sh

@@ -1,4 +1,8 @@
 #!/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.
@@ -11,6 +15,7 @@
 declare -A pseudofs_types=([anon_inodefs]=1
                         [autofs]=1
                         [bdev]=1
+                        [bpf]=1
                         [binfmt_misc]=1
                         [cgroup]=1
                         [cgroup2]=1
@@ -21,6 +26,7 @@ declare -A pseudofs_types=([anon_inodefs]=1
                         [devpts]=1
                         [devtmpfs]=1
                         [dlmfs]=1
+                        [efivarfs]=1
                         [fuse.gvfs-fuse-daemon]=1
                         [fusectl]=1
                         [hugetlbfs]=1

lib/base/message.sh

@@ -1,4 +1,8 @@
 #!/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.
@@ -11,8 +15,6 @@
 # export LC_MESSAGES=C
 export LANG=C
 
-source /usr/share/makepkg/util.sh
-
 if [[ -t 2 ]]; then
     colorize
 else
@@ -62,8 +64,30 @@ slock() {
     fi
 }
 
+_setup_workdir=false
+setup_workdir() {
+    [[ -z ${WORKDIR:-} ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")
+    _setup_workdir=true
+    trap 'trap_abort' INT QUIT TERM HUP
+    trap 'trap_exit' EXIT
+}
+
+trap_abort() {
+    trap - EXIT INT QUIT TERM HUP
+    abort
+}
+
+trap_exit() {
+    local r=$?
+    trap - EXIT INT QUIT TERM HUP
+    cleanup $r
+}
+
 cleanup() {
-    exit ${1:-0}
+    if [[ -n ${WORKDIR:-} ]] && $_setup_workdir; then
+        rm -rf "$WORKDIR"
+    fi
+    exit "${1:-0}"
 }
 
 abort() {
@@ -93,18 +117,11 @@ msg_row_notify(){
 
 msg_row(){
     local mesg=$1; shift
-    printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
 msg_row_upgrade(){
     local mesg=$1; shift
-    printf "${RED}${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
-}
-
-import(){
-    if [[ -r "$1" ]];then
-        source "$1"
-    else
-        die 'Could not import %s' "$1"
-    fi
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
 }

lib/base/mount.sh

@@ -1,4 +1,8 @@
 #!/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.
@@ -33,54 +37,18 @@ get_os_name(){
     echo "$str"
 }
 
-get_chroot_arch(){
-    local elf=$(file $1/usr/bin/file)
-    elf=${elf//*executable,}
-    echo ${elf%%,*}
-}
-
 chroot_part_mount() {
     info "mount: [%s]" "$2"
     mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
 }
 
-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
-}
-
 trap_setup(){
     [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
     trap "$1" EXIT
 }
 
 chroot_mount() {
-    info "mount: [%s]" "$2"
+#     info "mount: [%s]" "$2"
     mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
 }
 
@@ -120,16 +88,18 @@ chroot_mount_conditional() {
 }
 
 chroot_setup(){
-    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
-    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
-        efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
-    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
+    local mnt="$1" os="$2" run_args='-t tmpfs -o nosuid,nodev,mode=0755'
+    $os && run_args='--bind'
+    chroot_mount_conditional "! mountpoint -q '$mnt'" "$mnt" "$mnt" --bind &&
+    chroot_mount proc "$mnt/proc" -t proc -o nosuid,noexec,nodev &&
+    chroot_mount sys "$mnt/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
+    ignore_error chroot_mount_conditional "[[ -d '$mnt/sys/firmware/efi/efivars' ]]" \
+        efivarfs "$mnt/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
+    chroot_mount udev "$mnt/dev" -t devtmpfs -o mode=0755,nosuid &&
+    chroot_mount devpts "$mnt/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
+    chroot_mount shm "$mnt/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
+    chroot_mount /run "$mnt/run" ${run_args} &&
+    chroot_mount tmp "$mnt/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
 }
 
 mount_os(){
@@ -151,36 +121,28 @@ mount_os(){
         esac
     done
 
-    local chroot_arch=$(get_chroot_arch $1)
-    [[ ${chroot_arch} == x86-64 ]] && chroot_arch=${chroot_arch/-/_}
-    case ${target_arch} in
-        i686)
-            if [[ ${chroot_arch} == x86_64 ]];then
-                die "You can't chroot from %s host into %s!" "${target_arch}" "${chroot_arch}"
-            fi
-        ;;
-    esac
-
-    chroot_setup "$1"
+    chroot_setup "$1" true
     chroot_add_resolv_conf "$1"
 }
 
 chroot_api_mount() {
     CHROOT_ACTIVE_MOUNTS=()
     trap_setup chroot_api_umount
-    chroot_setup "$1"
-}
-
-chroot_part_umount() {
-    info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
-    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_PART_MOUNTS CHROOT_ACTIVE_MOUNTS
+    chroot_setup "$1" false
 }
 
 chroot_api_umount() {
-    info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
+    if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
+#         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,196 @@
+#!/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-devel
+            packages-ruby
+            packages-gtk
+            packages-gnome
+            packages-cinnamon
+            packages-lxqt
+            packages-mate
+            packages-kde
+    )
+
+    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'}
+
+    GPG_KEY=${GPG_KEY:-''}
+
+    UPLIMIT=${UPLIMIT:-1000}
+
+    FILE_HOST="download.${DOMAIN}"
+
+    FILE_HOME=${FILE_HOME:-'/srv/iso'}
+
+    FILE_PORT=${FILE_PORT:-65432}
+
+    ACCOUNT=${ACCOUNT:-'naughtyISOuploader'}
+}
+
+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

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

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
+        [[ -z ${DESKTOP_LIST} ]] && 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/grub.sh

@@ -1,12 +1,15 @@
 #!/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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
 prepare_initcpio(){
@@ -21,35 +24,35 @@ prepare_initramfs(){
     local mnt="$1"
     cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-artix.conf
 
-    if [[ "${profile}" != 'base' ]];then
+    if [[ "${PROFILE}" != 'base' ]];then
         sed -e 's/artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs //' -i $mnt/etc/mkinitcpio-artix.conf
     fi
 
-    if [[ -n ${gpgkey} ]]; then
-        user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
-        exec 17<>${AT_USERCONFDIR}/gpgkey
+    if [[ -n ${GPG_KEY} ]]; then
+        user_run "gpg --export ${GPG_KEY} >${USERCONFDIR}/artools/gpgkey"
+        exec 17<>${USERCONFDIR}/artools/GPG_KEY
     fi
     local _kernel=$(cat $mnt/usr/lib/modules/*/version)
-    ARTIX_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
+    ARTIX_GNUPG_FD=${GPG_KEY:+17} chroot-run $mnt \
         /usr/bin/mkinitcpio -k ${_kernel} \
         -c /etc/mkinitcpio-artix.conf \
         -g /boot/initramfs.img
 
-    if [[ -n ${gpgkey} ]]; then
+    if [[ -n ${GPG_KEY} ]]; then
         exec 17<&-
     fi
-    if [[ -f ${AT_USERCONFDIR}/gpgkey ]]; then
-        rm ${AT_USERCONFDIR}/gpgkey
+    if [[ -f ${USERCONFDIR}/artools/GPG_KEY ]]; then
+        rm ${USERCONFDIR}/artools/GPG_KEY
     fi
 }
 
 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
+    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

lib/iso/iso.sh

@@ -0,0 +1,147 @@
+#!/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.
+
+gen_iso_fn(){
+    local vars=("artix") name
+    vars+=("${PROFILE}")
+    vars+=("${INITSYS}")
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') vars+=("${REPOSITORY}") ;;
+    esac
+    vars+=("${ISO_VERSION}")
+    vars+=("${ARCH}")
+    for n in ${vars[@]};do
+        name=${name:-}${name:+-}${n}
+    done
+    echo $name
+}
+
+clean_iso_root(){
+    local dest="$1"
+    msg "Deleting isoroot [%s] ..." "${dest##*/}"
+    rm -rf --one-file-system "$dest"
+}
+
+make_sig () {
+    local idir="$1" file="$2"
+    msg2 "Creating signature file..."
+    cd "$idir"
+    user_own "$idir"
+    user_run "gpg --detach-sign --default-key ${GPG_KEY} $file.sfs"
+    chown -R root "$idir"
+    cd ${OLDPWD}
+}
+
+make_checksum(){
+    local idir="$1" file="$2"
+    msg2 "Creating sha512sum ..."
+    cd $idir
+    sha512sum $file.sfs > $file.sha512
+    cd ${OLDPWD}
+}
+
+# $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[@]}"
+
+    make_checksum "${dest}" "${name}"
+    ${persist} && rm "${src}.img"
+
+    if [[ -n ${GPG_KEY} ]];then
+        make_sig "${dest}" "${name}"
+    fi
+
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}
+
+assemble_iso(){
+    msg "Creating ISO image..."
+    local mod_date=$(date -u +%Y-%m-%d-%H-%M-%S-00  | sed -e s/-//g)
+
+    xorriso -as mkisofs \
+        --modification-date=${mod_date} \
+        --protective-msdos-label \
+        -volid "${iso_label}" \
+        -appid "$(get_osname) Live/Rescue CD" \
+        -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 \
+        -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}/efi.img \
+        -e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
+        -no-emul-boot \
+        -iso-level 3 \
+        -o ${iso_dir}/${iso_file} \
+        ${iso_root}/
+}

lib/iso/mount.sh

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

lib/iso/profile.sh

@@ -0,0 +1,119 @@
+#!/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.
+
+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-Desktop" ]] && DESKTOP_LIST="$profdir/$prof/Packages-Desktop"
+    [[ -d "$profdir/$prof/desktop-overlay" ]] && DESKTOP_OVERLAY="$profdir/$prof/desktop-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 prof="$1"
+    local profdir="${DATADIR}/iso-profiles"
+    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profdir=${WORKSPACE_DIR}/iso-profiles
+
+    init_profile "$profdir" "$prof"
+
+    [[ -f $profdir/$prof/profile.conf ]] || return 1
+
+    [[ -r $profdir/$prof/profile.conf ]] && . $profdir/$prof/profile.conf
+
+    DISPLAYMANAGER=${DISPLAYMANAGER:-'none'}
+
+    AUTOLOGIN=${AUTOLOGIN:-"true"}
+    [[ ${DISPLAYMANAGER} == 'none' ]] && AUTOLOGIN="false"
+
+    HOST_NAME=${HOST_NAME:-'artix'}
+
+    USER_NAME=${USER_NAME:-'artix'}
+
+    PASSWORD=${PASSWORD:-'artix'}
+
+    ADDGROUPS=${ADDGROUPS:-"video,power,optical,network,lp,scanner,wheel,users,log"}
+
+    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
+}
+
+write_live_session_conf(){
+    msg2 "Writing live.conf"
+    local conf=''
+    conf+=$(printf '%s\n' '# live session configuration')
+    conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
+    conf+=$(printf "\nUSER_NAME=%s\n" "${USER_NAME}")
+    conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
+    conf+=$(printf "\nADDGROUPS='%s'\n" "${ADDGROUPS}")
+    printf '%s' "$conf"
+}
+
+load_pkgs(){
+    local pkglist="$1" init="$2"
+    info "Loading Packages: [%s] ..." "${pkglist##*/}"
+
+    local _init="s|@$init||g"
+    case "$init" in
+        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6*||g" ;;
+        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
+        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
+    esac
+
+    local _space="s| ||g" \
+        _clean=':a;N;$!ba;s/\n/ /g' \
+        _com_rm="s|#.*||g"
+
+    packages=($(sed "$_com_rm" "$pkglist" \
+            | sed "$_space" \
+            | sed "$_purge" \
+            | sed "$_init" \
+            | sed "$_init_rm1" \
+            | sed "$_init_rm2" \
+            | sed "$_clean"))
+}

lib/iso/util.sh

@@ -0,0 +1,282 @@
+#!/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_desktopfs() {
+    if [[ ! -e ${work_dir}/desktopfs.lock ]]; then
+        msg "Prepare [Desktop installation] (desktopfs)"
+        local desktopfs="${work_dir}/desktopfs"
+
+        prepare_dir "${desktopfs}"
+
+        mount_overlay "${desktopfs}" "${work_dir}"
+
+        install_packages "${desktopfs}"
+
+        copy_overlay "${DESKTOP_OVERLAY}" "${desktopfs}"
+
+        umount_overlay
+        clean_up_image "${desktopfs}"
+
+        msg "Done [Desktop installation] (desktopfs)"
+    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}" "${DESKTOP_LIST}"
+
+        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}" "${DESKTOP_LIST}"
+
+        prepare_initcpio "${bootfs}"
+        prepare_initramfs "${bootfs}"
+
+        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 "${DESKTOP_LIST}" ]] ; then
+        load_pkgs "${DESKTOP_LIST}" "${INITSYS}"
+        run_safe "make_desktopfs"
+    fi
+    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/gitea.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+create_repo(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    local json="{ \"auto_init\": true, \"name\":\"$gitname\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
+
+    msg2 "Create package repo [%s] in org (%s)" "${pkg}" "${org}"
+
+    curl -s -X POST "${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}" \
+        -H "accept: application/json" \
+        -H "content-type: application/json" \
+        -d "$json"
+
+    echo
+}
+
+delete_repo(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+
+    msg2 "Delete package repo [%s] in org (%s)" "${pkg}" "${org}"
+
+    curl -s -X DELETE "${GIT_URL}/api/v1/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
+        -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/subrepo.sh

@@ -0,0 +1,160 @@
+#!/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="packagesRuby" ;;
+        perl-*) org="packagesPerl" ;;
+        python-*|python2-*) org="packagesPython" ;;
+        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
+    esac
+    echo $org
+}
+
+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/util.sh

@@ -0,0 +1,234 @@
+#!/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="${SYSCONFDIR}/pkglist.d/$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 ;;
+        $(get_cases python)) tree=packages-python ;;
+        $(get_cases perl)) tree=packages-perl ;;
+        $(get_cases ruby)) tree=packages-ruby ;;
+        $(get_cases openrc)) tree=packages-openrc ;;
+        $(get_cases runit)) tree=packages-runit ;;
+        $(get_cases xorg)) tree=packages-xorg ;;
+        $(get_cases qt5)) tree=packages-qt5 ;;
+        $(get_cases gtk)) tree=packages-gtk ;;
+        $(get_cases devel)) tree=packages-devel ;;
+        $(get_cases lxqt)) tree=packages-lxqt ;;
+        $(get_cases cinnamon)) tree=packages-cinnamon ;;
+        $(get_cases kde)) tree=packages-kde ;;
+        $(get_cases gnome)) tree=packages-gnome ;;
+        $(get_cases mate)) tree=packages-mate ;;
+        *) tree=$artix_tree
+    esac"
+    echo $tree
+}
+
+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.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-profile.sh

@@ -1,117 +0,0 @@
-#!/bin/bash
-# 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.
-
-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-Desktop" ]] && desktop_list="$profdir/$prof/Packages-Desktop"
-    [[ -d "$profdir/$prof/desktop-overlay" ]] && desktop_overlay="$profdir/$prof/desktop-overlay"
-
-    [[ -f "$profdir/$prof/Packages-Live" ]] && live_list="$profdir/$prof/Packages-Live"
-    [[ -d "$profdir/$prof/live-overlay" ]] && live_overlay="$profdir/$prof/live-overlay"
-}
-
-load_profile(){
-    local prof="$1"
-    local profdir="${DATADIR}/iso-profiles"
-    [[ -d ${workspace_dir}/iso-profiles ]] && profdir=${workspace_dir}/iso-profiles
-
-    init_profile "$profdir" "$prof"
-
-    [[ -f $profdir/$prof/profile.conf ]] || return 1
-
-    [[ -r $profdir/$prof/profile.conf ]] && source $profdir/$prof/profile.conf
-
-    [[ -z ${displaymanager} ]] && displaymanager="none"
-
-    [[ -z ${autologin} ]] && autologin="true"
-    [[ ${displaymanager} == 'none' ]] && autologin="false"
-
-    [[ -z ${hostname} ]] && hostname="artix"
-
-    [[ -z ${username} ]] && username="artix"
-
-    [[ -z ${password} ]] && password="artix"
-
-    if [[ -z ${addgroups} ]];then
-        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
-    fi
-
-    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
-}
-
-write_live_session_conf(){
-    local path=$1${SYSCONFDIR}
-    [[ ! -d $path ]] && mkdir -p "$path"
-    local conf=$path/live.conf
-    msg2 "Writing %s" "${conf##*/}"
-    echo '# live session configuration' > ${conf}
-    echo '' >> ${conf}
-    echo '# autologin' >> ${conf}
-    echo "autologin=${autologin}" >> ${conf}
-    echo '' >> ${conf}
-    echo '# live username' >> ${conf}
-    echo "username=${username}" >> ${conf}
-    echo '' >> ${conf}
-    echo '# live password' >> ${conf}
-    echo "password=${password}" >> ${conf}
-    echo '' >> ${conf}
-    echo '# live group membership' >> ${conf}
-    echo "addgroups='${addgroups}'" >> ${conf}
-}
-
-load_pkgs(){
-    local pkglist="$1" init="$2"
-    info "Loading Packages: [%s] ..." "${pkglist##*/}"
-
-    local _init="s|>$init||g"
-    case "$init" in
-        'openrc') _init_rm1="s|>runit.*||g"; _init_rm2="s|>s6*||g" ;;
-        's6') _init_rm1="s|>runit.*||g"; _init_rm2="s|>openrc.*||g" ;;
-        'runit') _init_rm1="s|>s6.*||g"; _init_rm2="s|>openrc.*||g" ;;
-    esac
-
-    local _blacklist="s|>blacklist.*||g" \
-        _space="s| ||g" \
-        _clean=':a;N;$!ba;s/\n/ /g' \
-        _com_rm="s|#.*||g"
-
-    packages=($(sed "$_com_rm" "$pkglist" \
-            | sed "$_space" \
-            | sed "$_blacklist" \
-            | sed "$_purge" \
-            | sed "$_init" \
-            | sed "$_init_rm1" \
-            | sed "$_init_rm2" \
-            | sed "$_clean"))
-}

lib/util-iso-publish.sh

@@ -1,51 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-connect(){
-    local home="/home/frs/project/${project}"
-    echo "${account},${project}@frs.${file_host}:${home}"
-}
-
-gen_webseed(){
-    local webseed seed="$1"
-    for mirror in ${host_mirrors[@]};do
-        webseed=${webseed:-}${webseed:+,}"https://${mirror}.dl.${seed}"
-    done
-    echo ${webseed}
-}
-
-make_torrent(){
-    find ${src_dir} -type f -name "*.torrent" -delete
-
-    if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then
-        for iso in $(ls ${src_dir}/*.iso);do
-            local seed=${file_host}/project/${project}${target_dir}${iso##*/}
-            local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed ${seed}))
-            ${verbose} && mktorrent_args+=(-v)
-            info "mktorrent_args: %s" "${mktorrent_args[@]}"
-            msg2 "Creating (%s) ..." "${iso##*/}.torrent"
-            mktorrent ${mktorrent_args[*]} -o ${iso}.torrent ${iso}
-        done
-    fi
-}
-
-prepare_transfer(){
-    target_dir="/iso/${profile}/"
-    src_dir="${iso_pool}/${profile}/"
-    ${torrent} && make_torrent
-}
-
-sync_dir(){
-    msg "Start upload [%s] ..." "${profile}"
-    rsync "${rsync_args[@]}" ${src_dir} $(connect)${target_dir}
-    msg "Done upload [%s]" "${profile}"
-    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-}

lib/util-iso-yaml.sh

@@ -1,85 +0,0 @@
-#!/bin/bash
-#
-# 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_users_conf(){
-    local conf="$1/users.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "defaultGroups:" >> "$conf"
-    local IFS=','
-    for g in ${addgroups[@]};do
-        echo "    - $g" >> "$conf"
-    done
-    unset IFS
-    echo "autologinGroup:  autologin" >> "$conf"
-    echo "doAutologin:     false" >> "$conf"
-    echo "sudoersGroup:    wheel" >> "$conf"
-    echo "setRootPassword: true" >> "$conf"
-#     echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
-    echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
-    echo "avatarFilePath:  ~/.face" >> "$conf"
-}
-
-write_servicescfg_conf(){
-    local init="$2"
-    local conf="$1"/services-"$init".conf
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo '---' >  "$conf"
-    case "$init" in
-        'runit')
-            echo 'svDir: /etc/runit/sv' >> "$conf"
-            echo '' >> "$conf"
-            echo 'runsvDir: /etc/runit/runsvdir' >> "$conf"
-            echo '' >> "$conf"
-            echo 'services:' >> "$conf"
-            echo "    enabled:" >> "$conf"
-            for svc in ${services[@]};do
-                echo "      - name: $svc" >> "$conf"
-                echo '        runlevel: default' >> "$conf"
-            done
-        ;;
-        'openrc')
-            echo 'initdDir: /etc/init.d' >> "$conf"
-            echo '' >> "$conf"
-            echo 'runlevelsDir: /etc/runlevels' >> "$conf"
-            echo '' >> "$conf"
-            echo 'services:' >> "$conf"
-            for svc in ${services[@]};do
-                echo "      - name: $svc" >> "$conf"
-                echo '        runlevel: default' >> "$conf"
-            done
-        ;;
-    esac
-}
-
-write_postcfg_conf(){
-    local conf="$1/postcfg.conf" init="$2"
-    sed -e "s|openrc|$init|" -i "$conf"
-}
-
-write_netinstall_conf(){
-    local conf="$1/netinstall.conf" init="$2"
-    sed -e "s|netgroups-openrc.yaml|netgroups-$init.yaml|" -i "$conf"
-}
-
-configure_calamares(){
-    local mods="$1/etc/calamares/modules" init="$2"
-    if [[ -d "$mods" ]];then
-        info "Configuring [Calamares]"
-        write_netinstall_conf "$mods" "$init"
-        write_users_conf "$mods"
-        write_servicescfg_conf "$mods" "$init"
-        write_postcfg_conf "$mods" "$init"
-        local name=services-"$init"
-        sed -e "s|services-openrc|$name|" -i "$1"/etc/calamares/settings.conf
-        info "Done configuring [Calamares]"
-    fi
-}

lib/util-iso.sh

@@ -1,557 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-import ${LIBDIR}/util-chroot.sh
-import ${LIBDIR}/util-iso-grub.sh
-import ${LIBDIR}/util-iso-yaml.sh
-import ${LIBDIR}/util-iso-profile.sh
-
-track_img() {
-    info "mount: [%s]" "$2"
-    mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
-}
-
-mount_img() {
-    IMG_ACTIVE_MOUNTS=()
-    mkdir -p "$2"
-    track_img "$1" "$2"
-}
-
-umount_img() {
-    if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
-        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
-        umount "${IMG_ACTIVE_MOUNTS[@]}"
-        unset IMG_ACTIVE_MOUNTS
-        rm -r "$1"
-    fi
-}
-
-track_fs() {
-    info "overlayfs mount: [%s]" "$5"
-    mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
-}
-
-mount_overlay(){
-    FS_ACTIVE_MOUNTS=()
-    local lower= upper="$1" work="$2" pkglist="$3"
-    local fs=${upper##*/}
-    local rootfs="$work/rootfs" desktopfs="$work/desktopfs" livefs="$work/livefs"
-    mkdir -p "${mnt_dir}/work"
-    mkdir -p "$upper"
-    case $fs in
-        desktopfs) lower="$rootfs" ;;
-        livefs)
-            lower="$rootfs"
-            [[ -f $pkglist ]] && lower="$desktopfs":"$rootfs"
-        ;;
-        bootfs)
-            lower="$livefs":"$rootfs"
-            [[ -f $pkglist ]] && lower="$livefs":"$desktopfs":"$rootfs"
-        ;;
-    esac
-    track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
-}
-
-umount_overlay(){
-    if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
-        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
-        umount "${FS_ACTIVE_MOUNTS[@]}"
-        unset FS_ACTIVE_MOUNTS
-        rm -rf "${mnt_dir}/work"
-    fi
-}
-
-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'
-    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 ${verbose};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
-}
-
-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 ${hostname}|" -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 ${hostname} > $mnt/etc/hostname
-}
-
-clean_iso_root(){
-    local dest="$1"
-    msg "Deleting isoroot [%s] ..." "${dest##*/}"
-    rm -rf --one-file-system "$dest"
-}
-
-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
-}
-
-configure_live_image(){
-    local fs="$1"
-    msg "Configuring [livefs]"
-    configure_hosts "$fs"
-    configure_system "$fs"
-    configure_services "$fs"
-    configure_calamares "$fs" "${initsys}"
-    write_live_session_conf "$fs"
-    msg "Done configuring [livefs]"
-}
-
-make_sig () {
-    local idir="$1" file="$2"
-    msg2 "Creating signature file..."
-    cd "$idir"
-    user_own "$idir"
-    user_run "gpg --detach-sign --default-key ${gpgkey} $file.sfs"
-    chown -R root "$idir"
-    cd ${OLDPWD}
-}
-
-make_checksum(){
-    local idir="$1" file="$2"
-    msg2 "Creating sha512sum ..."
-    cd $idir
-    sha512sum $file.sfs > $file.sha512
-    cd ${OLDPWD}
-}
-
-# $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/${target_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=()
-        ${verbose} && ext4_args+=(-q)
-        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})
-    if ${verbose};then
-        mksquashfs "${mksfs_args[@]}" >/dev/null
-    else
-        mksquashfs "${mksfs_args[@]}"
-    fi
-    make_checksum "${dest}" "${name}"
-    ${persist} && rm "${src}.img"
-
-    if [[ -n ${gpgkey} ]];then
-        make_sig "${dest}" "${name}"
-    fi
-
-    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-}
-
-assemble_iso(){
-    msg "Creating ISO image..."
-    local mod_date=$(date -u +%Y-%m-%d-%H-%M-%S-00  | sed -e s/-//g)
-
-    xorriso -as mkisofs \
-        --modification-date=${mod_date} \
-        --protective-msdos-label \
-        -volid "${iso_label}" \
-        -appid "$(get_osname) Live/Rescue CD" \
-        -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 \
-        -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}/efi.img \
-        -e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
-        -no-emul-boot \
-        -iso-level 3 \
-        -o ${iso_dir}/${iso_file} \
-        ${iso_root}/
-}
-
-# 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]"
-}
-
-gen_iso_fn(){
-    local vars=("artix") name
-    vars+=("${profile}")
-    [[ ${initsys} == 'runit' ]] && vars+=("${initsys}")
-    vars+=("${iso_version}")
-    vars+=("${target_arch}")
-    for n in ${vars[@]};do
-        name=${name:-}${name:+-}${n}
-    done
-    echo $name
-}
-
-install_packages(){
-    local fs="$1"
-    setarch "${target_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
-}
-
-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_desktopfs() {
-    if [[ ! -e ${work_dir}/desktopfs.lock ]]; then
-        msg "Prepare [Desktop installation] (desktopfs)"
-        local desktopfs="${work_dir}/desktopfs"
-
-        prepare_dir "${desktopfs}"
-
-        mount_overlay "${desktopfs}" "${work_dir}"
-
-        install_packages "${desktopfs}"
-
-        copy_overlay "${desktop_overlay}" "${desktopfs}"
-
-        umount_overlay
-        clean_up_image "${desktopfs}"
-
-        msg "Done [Desktop installation] (desktopfs)"
-    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}" "${desktop_list}"
-
-        install_packages "${livefs}"
-
-        copy_overlay "${live_overlay}" "${livefs}"
-
-        configure_live_image "${livefs}"
-
-        pacman -Qr "${livefs}" > ${iso_dir}/$(gen_iso_fn)-pkgs.txt
-
-        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-${target_arch}
-
-        local bootfs="${work_dir}/bootfs"
-
-        mount_overlay "${bootfs}" "${work_dir}" "${desktop_list}"
-
-        prepare_initcpio "${bootfs}"
-        prepare_initramfs "${bootfs}"
-
-        cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${target_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 "${desktop_list}" ]] ; then
-        load_pkgs "${desktop_list}" "${initsys}"
-        run_safe "make_desktopfs"
-    fi
-    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/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-gitea.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-#
-# 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
-}
-
-
-create_repo(){
-    local pkg="$1"
-    local gitname=$(get_compliant_name "$pkg")
-    curl -X POST "${git_url}/api/v1/org/packages/repos?access_token=${git_token}" -H "accept: application/json" -H "content-type: application/json" -d "{ \"auto_init\": true, \"name\":\"$gitname\", \"readme\": \"Default\" }"
-}
-
-delete_repo(){
-    local pkg="$1"
-    local gitname=$(get_compliant_name "$pkg")
-    curl -X DELETE "${git_url}/api/v1/repos/packages/$gitname?access_token=${git_token}" -H  "accept: application/json"
-}
-
-find_team(){
-    local pkg="$1" team_id=
-
-    if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
-        team_id=18
-    elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
-        team_id=18
-    elif [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
-        team_id=19
-    elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
-        team_id=19
-    elif [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
-        team_id=20
-    elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
-        team_id=20
-    elif [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
-        team_id=21
-    fi
-    echo $team_id
-}
-
-add_repo_to_team(){
-    local pkg="$1" path="$2"
-    local id=$(find_team "$path")
-
-    curl -X PUT "${git_url}/api/v1/teams/$id/repos/packages/$pkg?access_token=${git_token}" -H  "accept: application/json"
-}

lib/util-pkg-subrepo.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-subrepo_init(){
-    local pkg="$1"
-    git subrepo init $pkg -r gitea@${git_domain}:packages/$pkg.git -b master
-}
-
-subrepo_push(){
-    local pkg="$1"
-    git subrepo push -u "$pkg" -b master
-}
-
-subrepo_pull(){
-    local pkg="$1" name="${2:-$1}"
-    git subrepo pull "$pkg" -b master -r gitea@${git_domain}:packages/$name.git -u
-}
-
-subrepo_clone(){
-    local pkg="$1" name="${2:-$1}"
-    git subrepo clone gitea@gitea.artixlinux.org:packages/$pkg.git "$name" -b master
-}

lib/util-pkg.sh

@@ -1,308 +0,0 @@
-#!/bin/bash
-#
-# 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/$1^ | head -n 1)
-}
-
-get_remote_head(){
-    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
-}
-
-is_dirty() {
-    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
-    return 0
-}
-
-is_untracked(){
-    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
-    return 0
-}
-
-patch_pkg(){
-    local pkg="$1" repo="$2"
-    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
-}
-
-write_jenkinsfile(){
-    local pkg="$1" jenkins=Jenkinsfile
-    echo '@Library(["PackagePipeline", "BuildPkg", "DeployPkg", "Notify", "PostBuild", "RepoPackage"]) import org.artixlinux.RepoPackage' > $pkg/$jenkins
-    echo '' >> $pkg/$jenkins
-    echo 'PackagePipeline(new RepoPackage(this))' >> $pkg/$jenkins
-    echo '' >> $pkg/$jenkins
-}
-
-find_tree(){
-    local tree="$1" pkg="$2"
-    local result=$(find $tree -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    result=${result%/*}
-    echo ${result##*/}
-}
-
-clone_tree(){
-    local timer=$(get_timer) host_tree="$1"
-    git clone $host_tree.git
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-pull_tree(){
-    local branch="master"
-    local local_head=$(get_local_head "$branch")
-    local remote_head=$(get_remote_head "$branch")
-    if [[ "${local_head}" == "${remote_head}" ]]; then
-        msg2 "remote changes: no"
-    else
-        msg2 "remote changes: yes"
-        git pull origin "$branch"
-    fi
-}
-
-push_tree(){
-    local branch="master"
-    git push origin "$branch"
-}
-
-get_import_path(){
-    local tree="$1" import_path=
-    case $tree in
-        packages) import_path=${tree_dir_arch}/packages ;;
-        packages-galaxy) import_path=${tree_dir_arch}/community ;;
-    esac
-    echo $import_path
-}
-
-is_valid_repo(){
-    local src="$1"
-    case $src in
-        core|extra|community|multilib|testing|staging|community-testing|community-staging|multilib-testing|multilib-staging|trunk) return 0 ;;
-        *) return 1 ;;
-    esac
-}
-
-find_repo(){
-    local pkg="$1" unst="$2" stag="$3" repo=
-
-    if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
-        repo=core-x86_64
-    elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
-        repo=core-any
-    fi
-
-    if [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
-        repo=extra-x86_64
-    elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
-        repo=extra-any
-    fi
-
-    if [[ -f $pkg/repos/testing-x86_64/PKGBUILD ]];then
-        repo=testing-x86_64
-    elif [[ -f $pkg/repos/testing-any/PKGBUILD ]];then
-        repo=testing-any
-    fi
-
-    if $stag;then
-        if [[ -f $pkg/repos/staging-x86_64/PKGBUILD ]];then
-            repo=staging-x86_64
-        elif [[ -f $pkg/repos/staging-any/PKGBUILD ]];then
-            repo=staging-any
-        fi
-    fi
-
-    if [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
-        repo=community-x86_64
-    elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
-        repo=community-any
-    fi
-
-    if [[ -f $pkg/repos/community-testing-x86_64/PKGBUILD ]];then
-        repo=community-testing-x86_64
-    elif [[ -f $pkg/repos/community-testing-any/PKGBUILD ]];then
-        repo=community-testing-any
-    fi
-
-    if $stag;then
-        if [[ -f $pkg/repos/community-staging-x86_64/PKGBUILD ]];then
-            repo=community-staging-x86_64
-        elif [[ -f $pkg/repos/community-staging-any/PKGBUILD ]];then
-            repo=community-staging-any
-        fi
-    fi
-
-    if [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
-        repo=multilib-x86_64
-    fi
-
-    if [[ -f $pkg/repos/multilib-testing-x86_64/PKGBUILD ]];then
-        repo=multilib-testing-x86_64
-    fi
-
-    if $stag;then
-        if [[ -f $pkg/repos/multilib-staging-x86_64/PKGBUILD ]];then
-            repo=multilib-staging-x86_64
-        fi
-    fi
-
-    if $unst;then
-        if [[ -f $pkg/repos/gnome-unstable-x86_64/PKGBUILD ]];then
-            repo=gnome-unstable-x86_64
-        elif [[ -f $pkg/repos/gnome-unstable-any/PKGBUILD ]];then
-            repo=gnome-unstable-any
-        fi
-
-        if [[ -f $pkg/repos/kde-unstable-x86_64/PKGBUILD ]];then
-            repo=kde-unstable-x86_64
-        elif [[ -f $pkg/repos/kde-unstable-any/PKGBUILD ]];then
-            repo=kde-unstable-any
-        fi
-    fi
-    echo $repo
-}
-
-arch_to_artix_repo(){
-    local repo="$1"
-    case $repo in
-        core-*) repo=system ;;
-        extra-*) repo=world ;;
-        community-x86_64|community-any) repo=galaxy ;;
-        multilib-x86_64) repo=lib32 ;;
-        testing-*) repo=gremlins ;;
-        staging-*) repo=goblins ;;
-        multilib-testing-x86_64) repo=lib32-gremlins ;;
-        multilib-staging-x86_64) repo=lib32-goblins ;;
-        community-testing-*) repo=galaxy-gremlins ;;
-        community-staging-*) repo=galaxy-goblins ;;
-        kde-unstable-*|gnome-unstable-*) repo=goblins ;;
-    esac
-    echo $repo
-}
-
-# $1: sofile
-# $2: soarch
-process_sofile() {
-    # extract the library name: libfoo.so
-    local soname="${1%.so?(+(.+([0-9])))}".so
-    # extract the major version: 1
-    soversion="${1##*\.so\.}"
-    if [[ "$soversion" = "$1" ]] && (($IGNORE_INTERNAL)); then
-        continue
-    fi
-    if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then
-    # libfoo.so=1-64
-        msg "${soname}=${soversion}-$2"
-        soobjects+=("${soname}=${soversion}-$2")
-    fi
-}
-
-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-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

lib/util.sh

@@ -1,184 +0,0 @@
-#!/bin/bash
-# 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(){
-    source /usr/lib/os-release
-    echo "${HOME_URL}"
-}
-
-get_osname(){
-    source /usr/lib/os-release
-    echo "${NAME}"
-}
-
-init_artools_base(){
-
-    target_arch=$(uname -m)
-
-    [[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/artools'
-
-    [[ -z ${workspace_dir} ]] && workspace_dir=/home/${OWNER}/artools-workspace
-
-    prepare_dir "${workspace_dir}"
-}
-
-init_artools_pkg(){
-
-    git_domain='gitea.artixlinux.org'
-
-    git_url="https://${git_domain}"
-
-    [[ -z ${git_token} ]] && git_token=''
-
-    [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
-
-    [[ -z ${host_tree_artix} ]] && host_tree_artix="gitea@gitea.artixlinux.org:artix"
-
-    [[ -z ${tree_dir_arch} ]] && tree_dir_arch=${workspace_dir}/archlinux
-
-    [[ -z ${host_tree_arch} ]] && host_tree_arch='git://projects.archlinux.org/svntogit'
-
-    chroots_pkg="${chroots_dir}/buildpkg"
-
-    [[ -z ${repos_root} ]] && repos_root="${workspace_dir}/repos"
-}
-
-init_artools_iso(){
-    chroots_iso="${chroots_dir}/buildiso"
-
-    [[ -z ${iso_pool} ]] && iso_pool="${workspace_dir}/iso"
-
-    prepare_dir "${iso_pool}"
-
-    profile='base'
-
-    [[ -z ${iso_version} ]] && iso_version=$(date +%Y%m%d)
-
-    iso_label="ARTIX_$(date +%Y%m)"
-
-    [[ -z ${initsys} ]] && initsys="openrc"
-
-    [[ -z ${gpgkey} ]] && gpgkey=''
-
-    [[ -z ${uplimit} ]] && uplimit=100
-
-    [[ -z ${tracker_url} ]] && tracker_url='udp://mirror.strits.dk:6969'
-
-    [[ -z ${piece_size} ]] && piece_size=21
-
-    [[ -z ${file_host} ]] && file_host="sourceforge.net"
-
-    [[ -z ${project} ]] && project="artix-linux"
-
-    [[ -z ${account} ]] && account="[SetUser]"
-
-    [[ -z ${host_mirrors[@]} ]] && host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
-
-    torrent_meta="$(get_osname)"
-}
-
-
-load_config(){
-
-    [[ -f $1 ]] || return 1
-
-    artools_conf="$1"
-
-    [[ -r ${artools_conf} ]] && source ${artools_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 "$@"
-}
-
-clean_dir(){
-    if [[ -d $1 ]]; then
-        msg "Cleaning [%s] ..." "$1"
-        rm -r $1/*
-    fi
-}
-
-load_user_info(){
-    OWNER=${SUDO_USER:-$USER}
-
-    if [[ -n $SUDO_USER ]]; then
-        eval "USER_HOME=~$SUDO_USER"
-    else
-        USER_HOME=$HOME
-    fi
-
-    AT_USERCONFDIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/artools"
-    PAC_USERCONFDIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman"
-    prepare_dir "${AT_USERCONFDIR}"
-}
-
-show_version(){
-    msg "artools"
-    msg2 "version: %s" "${version}"
-}
-
-show_config(){
-    if [[ -f ${AT_USERCONFDIR}/artools.conf ]]; then
-        msg2 "config: %s" "~/.config/artools/artools.conf"
-    else
-        msg2 "config: %s" "${artools_conf}"
-    fi
-}
-
-check_root() {
-    (( EUID == 0 )) && return
-    if type -P sudo >/dev/null; then
-        exec sudo -- "${orig_argv[@]}"
-    else
-        exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
-    fi
-}