readme: update deps

add lxqt list
update artools.conf

.gitignore

@@ -4,3 +4,5 @@
 .kateproject.d
 data/schemas/*.conf
 .project
+iso-profiles
+live-services

Makefile

@@ -1,238 +1,208 @@
-Version=0.4
+VERSION=0.12
 
-PREFIX = /usr/local
+CHROOT_VERSION=0.9
+
+TOOLS = artools
+PREFIX ?= /usr
 SYSCONFDIR = /etc
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+DATADIR = $(PREFIX)/share
+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 = \
-	data/pacman-default.conf \
-	data/pacman-multilib.conf
+BASE_UTIL = lib/util-base.sh
 
-LIST_PKG = \
-	$(wildcard data/pkg.list.d/*.list)
+BASE_DATA = \
+	$(wildcard data/base/pacman*.conf)
 
-ARCH_CONF = \
-	$(wildcard data/make.conf.d/*.conf)
+PKG_BIN = \
+	bin/pkg/buildpkg \
+	bin/pkg/deploypkg \
+	bin/pkg/commitpkg \
+	bin/pkg/comparepkg \
+	bin/pkg/checkpkg \
+	bin/pkg/mkchrootpkg \
+	bin/pkg/pkg2yaml \
+	bin/pkg/buildtree \
+	bin/pkg/lddd \
+	bin/pkg/finddeps \
+	bin/pkg/find-libdeps
 
-LIST_IMPORT = \
-	$(wildcard data/import.list.d/*.list)
+LN_COMMITPKG = \
+	extrapkg \
+	corepkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
+	multilibpkg \
+	multilib-testingpkg \
+	multilib-stagingpkg \
+	kde-unstablepkg \
+	gnome-unstablepkg
 
-BIN_PKG = \
-	bin/checkpkg \
-	bin/lddd \
-	bin/finddeps \
-	bin/find-libdeps \
-	bin/signpkgs \
-	bin/mkchrootpkg \
-	bin/buildpkg \
-	bin/buildtree \
-	bin/deploypkg
+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
 
-LIBS_PKG = \
-	$(wildcard lib/util-pkg*.sh)
+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
 
-SHARED_PKG = \
-	data/makepkg.conf
+PKG_LIBS = \
+	$(wildcard lib/pkg/*)
 
-BIN_ISO = \
-	bin/buildiso \
-	bin/deployiso
+PKG_LISTS = \
+	$(wildcard data/pkglists/*.list)
 
-LIBS_ISO = \
-	$(wildcard lib/util-iso*.sh)
+PKG_UTIL = lib/util-pkg.sh
 
-SHARED_ISO = \
-	data/mkinitcpio.conf \
-	data/profile.conf.example
+PKG_DATA = \
+	data/pkg/makepkg.conf
 
-CPIOHOOKS = \
-	$(wildcard initcpio/hooks/*)
+PATCHES = \
+	$(wildcard data/patches/*.patch)
 
-CPIOINST = \
-	$(wildcard initcpio/install/*)
+ISO_BIN = \
+	bin/iso/buildiso \
+	bin/iso/deployiso
 
-CPIO = \
-	initcpio/script/artix_shutdown
+LN_BUILDISO = \
+	buildiso-gremlins \
+	buildiso-goblins
 
-MAN_XML = \
-	buildpkg.xml \
-	buildtree.xml \
-	buildiso.xml \
-	deployiso.xml \
-	deploypkg.xml \
-	buildyaml.xml \
-	artools.conf.xml \
-	profile.conf.xml
+ISO_LIBS = \
+	$(wildcard lib/iso/*.sh)
 
-BIN_YAML = \
-	bin/buildyaml
+ISO_UTIL = lib/util-iso.sh
 
-LIBS_YAML = \
-	$(wildcard lib/util-yaml*.sh) \
-	lib/util-profile.sh
+ISO_DATA = \
+	data/iso/mkinitcpio.conf
 
-SHARED_YAML = \
-	data/linux.preset
+DIRMODE = -dm0755
+FILEMODE = -m0644
+MODE =  -m0755
+LN = ln -sf
+RM = rm -f
+M4 = m4 -P
+CHMODAW = chmod a-w
+CHMODX = chmod +x
 
-all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO) $(BIN_YAML) doc
+BIN = $(BASE_BIN) $(PKG_BIN) $(ISO_BIN)
+UTIL = $(BASE_UTIL) $(PKG_UTIL) $(ISO_UTIL)
 
-edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
-	-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
-	-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/artools|g" \
-	-e "s|@version@|${Version}|"
+all: $(BIN) $(UTIL)
 
-%: %.in Makefile
+EDIT_UTIL = sed -e "s|@datadir[@]|$(DATADIR)|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
+	-e "s|@chroot_version@|$(CHROOT_VERSION)|"
+
+EDIT_BIN = sed -e "s|@libdir[@]|$(LIBDIR)|g"
+
+$(UTIL): %: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@m4 -P $@.in | $(edit) >$@
-	@chmod a-w "$@"
-	@chmod +x "$@"
+	@$(M4) $@.in | $(EDIT_UTIL) >$@
+	@$(CHMODAW) "$@"
 
-doc:
-	mkdir -p man
-	$(foreach var,$(MAN_XML),xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/$(var) | db2x_manxml --output-dir man ;)
+$(BIN): %: %.in Makefile
+	@echo "GEN $@"
+	@$(RM) "$@"
+	@$(M4) $@.in | $(EDIT_BIN) >$@
+	@$(CHMODAW) "$@"
+	@$(CHMODX) "$@"
 
 clean:
-	rm -f $(BIN_BASE) ${BIN_PKG} ${BIN_ISO}
-	rm -rf man
+	$(RM) $(BIN) $(UTIL)
 
 install_base:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools
-	install -m0644 ${SYSCONF} $(DESTDIR)$(SYSCONFDIR)/artools
+	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install $(FILEMODE) $(CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_BASE} $(DESTDIR)$(PREFIX)/bin
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_BASE} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
+	install $(FILEMODE) $(BASE_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(BASE_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/artools
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
-	install -m0644 ${LIST_PKG} $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(PKG_BIN) $(DESTDIR)$(BINDIR)
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
-	install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
+	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d
-	install -m0644 ${ARCH_CONF} $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d
+	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 -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
+	install $(FILEMODE) $(PKG_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(PKG_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
 
-	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_PKG} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
+	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
+	install $(FILEMODE) $(PKG_LISTS) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
+install_cpio:
+	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
-	gzip -c man/buildpkg.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildpkg.1.gz
-	gzip -c man/buildtree.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
+install_iso: install_cpio
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(ISO_BIN) $(DESTDIR)$(BINDIR)
 
-install_iso:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
+	for l in $(LN_BUILDISO); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
+	install $(FILEMODE) $(ISO_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(ISO_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
-	install -m0755 ${CPIOHOOKS} $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(ISO_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/initcpio/install
-	install -m0755 ${CPIOINST} $(DESTDIR)$(SYSCONFDIR)/initcpio/install
+install: install_base install_pkg install_iso
 
-	install -m0755 ${CPIO} $(DESTDIR)$(SYSCONFDIR)/initcpio
-
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_ISO} $(DESTDIR)$(PREFIX)/share/artools
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
-	gzip -c man/buildiso.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
-	gzip -c man/deployiso.1 > $(DESTDIR)$(PREFIX)/share/man/man1/deployiso.1.gz
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man5
-	gzip -c man/artools.conf.5 > $(DESTDIR)$(PREFIX)/share/man/man5/artools.conf.5.gz
-	gzip -c man/profile.conf.5 > $(DESTDIR)$(PREFIX)/share/man/man5/profile.conf.5.gz
-
-install_yaml:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_YAML} $(DESTDIR)$(PREFIX)/bin
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_YAML} $(DESTDIR)$(PREFIX)/lib/artools
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_YAML} $(DESTDIR)$(PREFIX)/share/artools
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
-	gzip -c man/buildyaml.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildyaml.1.gz
-
-uninstall_base:
-	for f in ${SYSCONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/$$f; done
-	for f in ${BIN_BASE}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for f in ${SHARED_BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-	for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-
-uninstall_pkg:
-	for f in ${LIST_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d/$$f; done
-	for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
-	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d/$$f; done
-	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-	for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildpkg.1.gz
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
-
-uninstall_iso:
-	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-
-	for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-	for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks/$$f; done
-	for f in ${CPIOINST}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/install/$$f; done
-	for f in ${CPIO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/deployiso.1.gz
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man5/artools.conf.5.gz
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man5/profile.conf.5.gz
-
-uninstall_yaml:
-	for f in ${BIN_YAML}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for f in ${LIBS_YAML}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-	for f in ${SHARED_YAML}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildyaml.1.gz
-
-install: install_base install_pkg install_iso install_yaml
-
-uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_yaml
-
-dist:
-	git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz
-	gpg --detach-sign --use-agent artools-$(Version).tar.gz
-
-.PHONY: all clean install uninstall dist
+.PHONY: all clean install install_base install_pkg install_iso

README.md

@@ -1,46 +1,67 @@
 artools
 =============
 
-User manual
+#### Make flags
 
-### 1. artools.conf
+
+* PREFIX=/usr
+* SYSCONFDIR=/etc
+
+#### Dependencies
+
+##### Buildtime:
+
+* make
+* git
+* m4
+
+##### Runtime:
+
+- base:
+  * openssh
+  * rsync
+  * haveged
+  * os-prober
+  * gnupg
+  * pacman
+
+- pkg:
+  * namcap
+  * git-subrepo
+  * jshon
+
+- iso:
+  * dosfstools
+  * libisoburn
+  * squashfs-tools
+  * mkinitcpio
+  * grub
+
+#### Configuration
 
 artools.conf is the central configuration file for artools.
 By default, the config is installed in
 
-~~~
-/etc/artools/artools.conf
-~~~
+    /etc/artools/artools.conf
 
 A user artools.conf can be placed in
 
-~~~
-$HOME/.config/artools/artools.conf
-~~~
+    $HOME/.config/artools/artools.conf
+
 
 If the userconfig is present, artools will load the userconfig values, however, if variables have been set in the systemwide
 
-~~~
-/etc/artools/artools.conf
-~~~
-
-these values take precedence over the userconfig.
+These values take precedence over the userconfig.
 Best practise is to leave systemwide file untouched.
 By default it is commented and shows just initialization values done in code.
 
 Tools configuration is done in artools.conf or by args.
 Specifying args will override artools.conf settings.
 
-User build lists(eg 'my-super-build.list') can be placed in
+Both, pacman.conf and makepkg.conf for chroots are loaded from
 
-~~~
-$HOME/.config/artools/pkg.list.d
-$HOME/.config/artools/iso.list.d
-~~~
+    /usr/share/artools/{makepkg,pacman-*}.conf
 
-overriding
+and can be overridden dropping them in
 
-~~~
-/etc/artools/pkg.list.d
-/etc/artools/iso.list.d
-~~~
+    $HOME/.config/artools/

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,10 +93,8 @@ else
 
     [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
 
-    ${pretend} && display_settings && exit 1
-
-    chroot_api_efi_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
-    chroot_mount /etc/resolv.conf "${chrootdir}/etc/resolv.conf" --bind
+    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
+    chroot_add_resolv_conf "${chrootdir}"
 fi
 
 SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}

bin/base/basestrap.in

@@ -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,29 +20,39 @@
 #  4) A valid mirror appears in /etc/pacman.d/mirrorlist
 #
 
-version=@version@
-
 shopt -s extglob
 
-DATADIR='@datadir@'
-LIBDIR='@libdir@'
+. @libdir@/artools/util-base.sh
 
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-mount.sh
-import ${LIBDIR}/util-chroot.sh
+copy_mirrorlist(){
+    cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
+}
+
+copy_keyring(){
+    if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $1/etc/pacman.d/gnupg ]]; then
+        cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d/"
+    fi
+}
+
+create_min_fs(){
+    msg "Creating install root at %s" "$1"
+    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}
+}
 
 newroot=/mnt
 
 hostcache=false
 copykeyring=true
 copymirrorlist=true
+directory=false
+interactive=false
 
 usage() {
     echo "usage: ${0##*/} [options] root [packages...]"
     echo " -C <config>      Use an alternate config file for pacman"
     echo " -c               Use the package cache on the host, rather than the target"
-    echo " -d               Allow installation to a non-mountpoint directory"
     echo " -G               Avoid copying the host's pacman keyring to the target"
     echo " -i               Avoid auto-confirmation of package selections"
     echo " -M               Avoid copying the host's mirrorlist to the target"
@@ -45,12 +67,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts=':C:cdGiM'
+opts=':C:cGiM'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf=$OPTARG ;;
-        d) directory=true ;;
         c) hostcache=true ;;
         i) interactive=true ;;
         G) copykeyring=false ;;
@@ -67,18 +88,14 @@ check_root
 newroot=$1; shift
 pacman_args=("${@:-base}")
 
-${hostcache} && pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
+${hostcache} || pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
 
-${interactive} && pacman_args+=(--noconfirm)
+${interactive} || pacman_args+=(--noconfirm)
 
 [[ -n $pacman_conf ]] && pacman_args+=(--config="$pacman_conf")
 
 [[ -d $newroot ]] || die "%s is not a directory" "$newroot"
 
-if ! mountpoint -q "$newroot" && ! ${directory}; then
-    die '%s is not a mountpoint!' "$newroot"
-fi
-
 # create obligatory directories
 create_min_fs "$newroot"
 

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,17 +12,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+chroot_version=0.9
 
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-mount.sh
+. @libdir@/artools/util-base.sh
 
 working_dir=''
 files=()
-keep_mirrors=false
 nosetarch=false
 
 usage() {
@@ -86,11 +84,13 @@ copy_hostconf () {
         cp -T "$file" "$working_dir$file"
     done
 
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$1/etc/pacman.conf"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$1/etc/pacman.conf"
 }
 
 chroot_extra_mount() {
-    chroot_mount "/etc/resolv.conf" "$1/etc/resolv.conf" -B
+    chroot_add_resolv_conf "$1"
+    chroot_mount "/etc/hosts" "$1/etc/hosts" -B
+#     chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
     chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 
     for cache_dir in ${cache_dirs[@]:1}; do
@@ -111,8 +111,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") != $version ]]; then
-    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$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}"
@@ -126,3 +126,9 @@ eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
 ${nosetarch} && unset CARCH
 
 ${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
+
+ret=$?
+
+kill_chroot_process "${working_dir}"
+
+exit $ret

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=()
@@ -64,19 +62,26 @@ optstring_apply_quirks() {
     # one might install Arch from a Fedora environment), so let's remove it.
     optstring_remove_option "$varname" seclabel
 
+    # Prune 'relatime' option for any pseudofs. This seems to be a rampant
+    # default which the kernel often exports even if the underlying filesystem
+    # doesn't support it. Example: https://bugs.archlinux.org/task/54554.
+    if awk -v fstype="$fstype" '$1 == fstype { exit 1 }' /proc/filesystems; then
+        optstring_remove_option "$varname" relatime
+    fi
+
     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
 }
@@ -86,6 +91,7 @@ usage() {
 usage: ${0##*/} [options] root
 
   Options:
+    -f FILTER      Restrict output to mountpoints matching the prefix FILTER
     -L             Use labels for source identifiers (shortcut for -t LABEL)
     -p             Exclude pseudofs mounts (default behavior)
     -P             Include printing mounts
@@ -101,14 +107,15 @@ EOF
 }
 
 if [[ -z $1 || $1 = @(-h|--help) ]]; then
-  usage
-  exit $(( $# ? 0 : 1 ))
+    usage
+    exit $(( $# ? 0 : 1 ))
 fi
 
-while getopts ':LPpt:U' flag; do
+while getopts ':f:LPpt:U' flag; do
     case $flag in
         L) bytag=LABEL ;;
         U) bytag=UUID ;;
+        f) prefixfilter=$OPTARG ;;
         P) pseudofs=1 ;;
         p) pseudofs=0 ;;
         t) bytag=${OPTARG^^} ;;
@@ -132,6 +139,8 @@ while read -r src target fstype opts fsroot; do
         continue
     fi
 
+    [[ $target = "$prefixfilter"* ]] || continue
+
     # default 5th and 6th columns
     dump=0 pass=2
 
@@ -151,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
 
@@ -198,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,30 +12,23 @@
 # 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
 
 working_dir=''
 files=()
 
-build_locales=false
-keep_mirrors=false
-keep_flag=''
 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
@@ -40,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
@@ -71,9 +67,6 @@ else
     cache_dirs=(${cache_dir})
 fi
 
-basestrap_args=(-Gcd ${pacman_conf:+-C "$pacman_conf"})
-[[ -n ${mirror} ]] && basestrap_args+=(-M)
-
 umask 0022
 
 #[[ -e $working_dir ]] && die "Working directory '%s' already exists" "$working_dir"
@@ -102,17 +95,21 @@ while read -r varname; do
     _env+=("$varname=${!varname}")
 done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
 env -i "${_env[@]}" \
-basestrap "${basestrap_args[@]}" "$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 "$version" > "$working_dir/.artools"
+echo "${CHROOTVERSION}" > "$working_dir/.artools"
 
-default_locale "set" "$working_dir"
+if [[ ! -f "$working_dir/etc/locale.gen.orig" ]];then
+    mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.orig"
+fi
+printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
+echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
+
+dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 
 chroot_args=(${pacman_conf:+-C "$pacman_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${cache_dir:+-c "$cache_dir"})
 ${nosetarch} && chroot_args+=(${nosetarch:+-s})
 
-[[ -n ${mirror} ]] && default_mirror "$working_dir" "$mirror"
-
 exec chroot-run \
     "${chroot_args[@]}" \
     "$working_dir" locale-gen

bin/base/signfile.in

@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+. @libdir@/artools/util-base.sh
+
+load_user_info
+
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+file_to_sign="$1"
+
+if [ ! -e "$1" ]; then
+    error "%s does not exist!" "$file_to_sign"
+    exit 1
+fi
+
+if [[ -n "${BUILDBOT_GPGP}" ]]; then
+    msg2 "Signing [%s]" "${file_to_sign##*/}"
+    gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
+else
+    msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
+    gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
+fi

bin/buildiso.in

@@ -1,143 +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@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-iso.sh
-
-show_profile(){
-    prepare_build
-    msg2 "iso_file: %s" "${iso_file}"
-    if ${verbose};then
-        msg2 "autologin: %s" "${autologin}"
-
-        msg2 "netgroups: %s" "$(get_yaml)"
-
-        msg2 "hostname: %s" "${hostname}"
-        msg2 "username: %s" "${username}"
-        msg2 "password: %s" "${password}"
-        msg2 "addgroups: %s" "${addgroups}"
-
-        msg2 "enable_live: %s" "${enable_live[*]}"
-        msg2 "openrc_boot: %s" "${openrc_boot[*]}"
-        msg2 "openrc_default: %s" "${openrc_default[*]}"
-    fi
-    reset_profile
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "initsys: %s" "${initsys}"
-    msg2 "kernel: %s" "${kernel}"
-    [[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
-
-    msg "ARGS:"
-    msg2 "clean_first: %s" "${clean_first}"
-    msg2 "images_only: %s" "${images_only}"
-    msg2 "iso_only: %s" "${iso_only}"
-    msg2 "persist: %s" "${persist}"
-
-    msg "DIST SETTINGS:"
-    msg2 "dist_name: %s" "${dist_name}"
-    msg2 "dist_release: %s" "${dist_release}"
-    msg2 "dist_branding: %s" "${dist_branding}"
-
-    msg "BUILD:"
-    show_profile
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-load_run_dir
-
-clean_first=true
-pretend=false
-images_only=false
-iso_only=false
-verbose=false
-persist=false
-
-mkchroot_args=()
-profile=lxqt
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Profile [default: ${profile}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
-    echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_iso}]"
-    echo '    -t <dir>           Target directory'
-    echo "                       [default: ${cache_dir_iso}]"
-    echo '    -k <name>          Kernel to use'
-    echo "                       [default: ${kernel}]"
-    echo '    -i <name>          Init system to use'
-    echo "                       [default: ${initsys}]"
-    echo '    -g <key>           The gpg key for sfs signing'
-    echo "                       [default: ${gpgkey}]"
-    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 '    -q                 Query settings and pretend build'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:a:r:t:k:i:g:czxmvqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) profile="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
-        r) chroots_iso="$OPTARG" ;;
-        t) cache_dir_iso="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        g) gpgkey="$OPTARG" ;;
-        c) clean_first=false ;;
-        x) images_only=true ;;
-        z) iso_only=true ;;
-        m) persist=true ;;
-        v) verbose=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-check_root
-
-check_requirements
-
-${pretend} && display_settings && exit 1
-
-build

bin/buildpkg.in

@@ -1,185 +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
-import ${LIBDIR}/util-pkg.sh
-import ${LIBDIR}/util-pkg-chroot.sh
-
-show_pkg(){
-    check_build "$1"
-    cd $1
-        source PKGBUILD
-        for n in ${pkgname[@]}; do
-            msg2 "%s" "$n"
-        done
-    cd ..
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg2 "is_build_list: %s" "${is_build_list}"
-
-    msg "OPTIONS:"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "chroots_pkg: %s" "${chroots_pkg}"
-
-    msg "ARGS:"
-    msg2 "create_first: %s" "${create_first}"
-    msg2 "delete_first: %s" "${delete_first}"
-    msg2 "clean_first: %s" "${clean_first}"
-    msg2 "update_first: %s" "${update_first}"
-    msg2 "purge: %s" "${purge}"
-    msg2 "namcap: %s" "${namcap}"
-    msg2 "sign: %s" "${sign}"
-    msg2 "repo_add: %s" "${repo_add}"
-
-    msg "PATHS:"
-    msg2 "pkg_dir: %s" "${pkg_dir}"
-
-    if ${create_first};then
-        msg "PKG:"
-        msg2 "packages: %s" "${packages[*]}"
-    fi
-
-    msg "BUILD QUEUE:"
-    run show_pkg "${build_list}"
-}
-
-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
-
-create_first=false
-delete_first=false
-clean_first=false
-update_first=false
-purge=false
-namcap=false
-pretend=false
-is_build_list=false
-sign=false
-is_multilib=false
-repo_add=false
-
-mkchroot_args=()
-mkchrootpkg_args=()
-
-install_pkgs=()
-repository=${PWD##*/}
-
-prepare_build(){
-    local pac_arch='default'
-
-    if [[ "${target_arch}" == 'multilib' ]];then
-        pac_arch='multilib'
-        is_multilib=true
-    fi
-
-    local pacman_conf="${DATADIR}/pacman-$pac_arch.conf"
-
-    work_dir="${chroots_pkg}/${target_arch}"
-    pkg_dir="${cache_dir_pkg}/${target_arch}"
-
-    local makepkg_conf=$(get_makepkg_conf "${target_arch}")
-
-    [[ "$pac_arch" == 'multilib' ]] && target_arch='x86_64'
-
-    mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf})
-
-    mkchrootpkg_args+=(-r ${work_dir})
-
-    prepare_dir "${pkg_dir}"
-
-    prepare_dir "${work_dir}"
-
-    eval_build_list "${build_list}"
-
-    packages=('base-devel')
-    ${is_multilib} && packages+=('multilib-devel')
-
-    timer_start=$(get_timer)
-}
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -p <pkg>           Build list or pkg [default: ${build_list}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
-    echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_pkg}]"
-    echo '    -i <pkgs>          Install packages into the working copy of the chroot'
-    echo "    -z <repo>          The repo name to add the package(s)  [default: ${repository}]"
-    echo '    -o                 Create chroot'
-    echo '    -d                 Delete chroot'
-    echo '    -c                 Clean chroot copy'
-    echo '    -u                 Update chroot copy'
-    echo '    -w                 Clean up cache and sources'
-    echo '    -x                 Add the package(s) to the repo'
-    echo '    -n                 Install and run namcap check'
-    echo '    -s                 Sign packages'
-    echo '    -q                 Query settings and pretend build'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:a:r:i:z:odcuwnsxqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) build_list="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
-        r) chroots_pkg="$OPTARG" ;;
-        i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I "${install_pkgs[*]}") ;;
-        z) repository="$OPTARG" ;;
-        o) create_first=true ;;
-        d) delete_first=true ;;
-        c) clean_first=true ; mkchrootpkg_args+=(-c) ;;
-        u) update_first=true ; mkchrootpkg_args+=(-u) ;;
-        w) purge=true ;;
-        x) repo_add=true ;;
-        n) namcap=true; mkchrootpkg_args+=(-n) ;;
-        s) sign=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-check_root
-
-prepare_build
-
-${pretend} && display_settings && exit
-
-${delete_first} && delete_chroot "${work_dir}/root" "${work_dir}"
-
-${create_first} && create_chroot "${mkchroot_args[@]}" "${work_dir}/root" "${packages[@]}"
-
-run make_pkg "${build_list}"

bin/buildtree.in

@@ -1,110 +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-pkg-tree.sh
-
-show_imports(){
-    for repo in ${repo_tree_artix[@]};do
-        read_import_list "$repo"
-        for p in ${import_list[@]};do
-            msg2 "%s: %s" ""$repo "$p"
-        done
-    done
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "REPOS:"
-    msg2 "repo_tree_artix: %s" "${repo_tree_artix[*]}"
-    msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
-
-    msg "ARGS:"
-    msg2 "verbose: %s" "${verbose}"
-    msg2 "artix: %s" "${artix}"
-    msg2 "arch: %s" "${arch}"
-    msg2 "import_arch: %s" "${import_arch}"
-
-    msg "PATHS:"
-    msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
-    msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
-#     msg2 "host_tree_artix: %s" "${host_tree_artix}"
-#     msg2 "host_tree_arch: %s" "${host_tree_arch}"
-
-    if ${verbose}; then
-        if ${import_arch};then
-            msg "IMPORT QUEUE:"
-            show_imports
-        fi
-    fi
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-artix=false
-pretend=false
-arch=false
-import_arch=false
-verbose=false
-
-rsync_args=(-aWx --progress --delete --no-R --no-implied-dirs)
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -x            Sync artix tree"
-    echo "    -a            Sync arch tree"
-    echo '    -i            Import arch system packages'
-    echo '    -v            Verbose import output'
-    echo '    -q            Query settings'
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='xaivqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        x) artix=true ;;
-        a) arch=true ;;
-        i) import_arch=true ;;
-        v) verbose=true; rsync_args+=(-v --stats) ;;
-        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
-
-${artix} && sync_tree_artix
-
-${arch} && sync_tree_arch
-
-${import_arch} && import_from_arch

bin/buildyaml.in

@@ -1,115 +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@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-yaml-check.sh
-import ${LIBDIR}/util-profile.sh
-
-show_profile(){
-    prepare_build
-    msg2 "yaml_dir: %s" "${yaml_dir}"
-    msg2 "autologin: %s" "${autologin}"
-
-    msg2 "netgroups: %s" "$(get_yaml)"
-
-    msg2 "hostname: %s" "${hostname}"
-    msg2 "username: %s" "${username}"
-    msg2 "password: %s" "${password}"
-    msg2 "addgroups: %s" "${addgroups}"
-
-    msg2 "enable_live: %s" "${enable_live[*]}"
-    msg2 "openrc_boot: %s" "${openrc_boot[*]}"
-    msg2 "openrc_default: %s" "${openrc_default[*]}"
-
-    reset_profile
-    unset yaml_dir
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "initsys: %s" "${initsys}"
-    msg2 "kernel: %s" "${kernel}"
-
-    msg "ARGS:"
-    msg2 "calamares: %s" "${calamares}"
-    msg2 "group: %s" "${group}"
-
-    msg "BUILD:"
-    show_profile
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-# to force old way to have buildiso run in iso-profiles dir
-# run_dir=$(pwd)
-
-load_run_dir
-
-calamares=false
-pretend=false
-group=false
-cache_dir_netinstall="${workspace_dir}/netinstall"
-profile=lxqt
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Buildset or profile [default: ${profile}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
-    echo "    -k <name>          Kernel to use[default: ${kernel}]"
-    echo "    -i <name>          Init system to use [default: ${initsys}]"
-    echo '    -c                 Check also calamares yaml files generated for the profile'
-    echo '    -g                 Enable pacman group accepted for -p'
-    echo '    -q                 Query settings'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:a:i:k:gcqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) profile="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
-        c) calamares=true ;;
-        g) group=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-${pretend} && display_settings && exit 1
-
-${group} && write_pacman_group_yaml "${profile}" && exit 0
-
-build

bin/deployiso.in

@@ -1,103 +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}"
-#     msg2 "dist_release: %s" "${dist_release}"
-
-    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 "host: %s" "${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
-profile=lxqt
-
-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) limit="$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/deploypkg.in

@@ -1,116 +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-pkg-publish.sh
-
-show_transfer(){
-    local repo="$1"
-    msg2 "local: %s" "${repos_local}/$repo/"
-    msg2 "remote: %s" "${repos_remote}/$repo/"
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "repository: %s" "${repository}"
-    msg2 "package: %s" "${package}"
-    msg2 "target_arch: %s" "${target_arch}"
-
-    msg "ARGS:"
-    msg2 "add_pkg: %s" "${add_pkg}"
-    msg2 "del_pkg: %s" "${del_pkg}"
-    msg2 "download: %s" "${download}"
-    msg2 "upload: %s" "${upload}"
-    msg2 "verbose: %s" "${verbose}"
-
-    msg "REMOTE:"
-    msg2 "account: %s" "${account}"
-    msg2 "host: %s" "${host}"
-    msg2 "project: %s" "${project}"
-
-    msg "SYNC:"
-    show_transfer "${repository}"
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-pretend=false
-upload=false
-download=false
-verbose=false
-verbose=false
-add_pkg=false
-del_pkg=false
-package=''
-
-rsync_args=(-rtxisP --progress --delete -e ssh)
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -a                 Repository arch [default:${target_arch}]"
-    echo "    -r                 Repository to sync [default:${repository}]"
-    echo "    -u                 Upload repository"
-    echo '    -d                 Download repository'
-    echo "    -p                 Package name to add/delete"
-    echo '    -x                 Add package to repository'
-    echo '    -y                 Delete package from repository'
-    echo '    -q                 Query settings and pretend upload'
-    echo '    -v                 Verbose output'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:a:r:xyduvqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        a) target_arch="$OPTARG" ;;
-        r) repository="$OPTARG" ;;
-        p) package="$OPTARG" ;;
-        x) add_pkg=true ;;
-        y) del_pkg=true ;;
-        d) download=true ;;
-        u) upload=true; rsync_args+=(-L) ;;
-        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)
-
-prepare_dir "${repos_local}"
-
-${pretend} && display_settings #&& exit 1
-
-${add_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "add"
-${del_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "remove"
-
-${download} && repo_download "${repository}"
-${upload} && repo_upload "${repository}"

bin/iso/buildiso.in

@@ -0,0 +1,168 @@
+#!/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-iso.sh
+
+prepare_build(){
+    timer_start=$(get_timer)
+
+    load_profile "${PROFILE}"
+
+    local pacman_conf pac_file="pacman-default.conf"
+
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') pac_file="pacman-${REPOSITORY}.conf" ;;
+    esac
+
+    pacman_conf="${DATADIR}/$pac_file"
+    [[ -f ${USERCONFDIR}/artools/$pac_file ]] && pacman_conf="${USERCONFDIR}/artools/$pac_file"
+
+    iso_file=$(gen_iso_fn).iso
+
+    iso_label="ARTIX_$(date +%Y%m)"
+
+    mkchroot_args+=(-C ${pacman_conf} -m)
+    work_dir=${CHROOTS_ISO}/${PROFILE}/${ARCH}
+
+    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}"
+    prepare_dir "${iso_root}"
+}
+
+display_settings(){
+    msg "OPTIONS:"
+    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}"
+
+    msg "BUILD:"
+    show_profile
+}
+
+build(){
+    msg "Start building [%s]" "${PROFILE}"
+    if ${clean_first};then
+        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}"
+        clean_iso_root "${iso_root}"
+    fi
+
+    if ${iso_only}; then
+        [[ ! -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: %s -p %s -zc ..." "${cmd}" "${PROFILE}"
+        exit 1
+    else
+        prepare_images
+        compress_images
+    fi
+    msg "Finished building [%s]" "${PROFILE}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}
+
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
+clean_first=true
+pretend=false
+images_only=false
+iso_only=false
+log=false
+persist=false
+
+mkchroot_args=()
+cmd=${0##*/}
+
+REPOSITORY=${cmd##*-}
+
+usage() {
+    echo "Usage: ${cmd} [options]"
+    echo "    -p <profile>       Profile [default: ${PROFILE}]"
+    echo '    -r <dir>           Chroots directory'
+    echo "                       [default: ${CHROOTS_ISO}]"
+    echo '    -t <dir>           Target directory'
+    echo "                       [default: ${ISO_POOL}]"
+    echo '    -i <name>          Init system to use'
+    echo "                       [default: ${INITSYS}]"
+    echo '    -g <key>           The gpg key for sfs signing'
+    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 '    -l                 Log to file'
+    echo '    -q                 Query settings and pretend build'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+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) GPG_KEY="$OPTARG" ;;
+        c) clean_first=false ;;
+        x) images_only=true ;;
+        z) iso_only=true ;;
+        m) persist=true ;;
+        l) log=true ;;
+        q) pretend=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+${pretend} && display_settings && exit 1
+
+check_root
+
+prepare_traps
+
+prepare_build
+
+build

bin/iso/deployiso.in

@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+. @libdir@/artools/util-base.sh
+
+connect(){
+    echo "${ACCOUNT}@${FILE_HOST}:${FILE_HOME}"
+}
+
+prepare_transfer(){
+    DEST_DIR="/iso/${PROFILE}/"
+    SRC_DIR="${ISO_POOL}/${PROFILE}/"
+}
+
+sync_dir(){
+    msg "Start upload [%s] ..." "${PROFILE}"
+    rsync "${rsync_args[@]}" ${SRC_DIR} $(connect)${DEST_DIR}
+    msg "Done upload [%s]" "${PROFILE}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}
+
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
+update=false
+verbose=false
+
+rsync_args=(-aP --progress -e "ssh -p ${FILE_PORT}")
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -p                 Source folder to upload [default: ${PROFILE}]"
+    echo "    -l                 Limit bandwidth in kB/s [default:${UPLIMIT}]"
+    echo '    -u                 Update remote directory'
+    echo '    -v                 Verbose output'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+opts='p:l:uvh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        p) PROFILE="$OPTARG" ;;
+        l) UPLIMIT="$OPTARG" ;;
+        u) update=true; rsync_args+=(-u) ;;
+        v) verbose=true; rsync_args+=(-v --stats) ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+timer_start=$(get_timer)
+
+rsync_args+=(--bwlimit=${UPLIMIT})
+
+prepare_transfer
+
+sync_dir

bin/pkg/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,198 @@
+#!/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")
+
+    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")
+
+    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
+
+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 '    -v            View package depends'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='p:t:g:sinzyvh'
+
+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 ;;
+        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/checkpkg.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,18 +12,14 @@
 # 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
+. @libdir@/artools/util-base.sh
+. @libdir@/artools/util-pkg.sh
 
 shopt -s extglob
 
 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
 
 if [[ ! -f PKGBUILD ]]; then

bin/pkg/commitpkg.in

@@ -0,0 +1,177 @@
+#!/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
+
+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}
+
+        . trunk/PKGBUILD
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${PACKAGE}")
+        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}-$ver"
+                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}-$ver' ${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}
+
+        . trunk/PKGBUILD
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${PACKAGE}")
+
+        if [[ ${REPO_SRC} == 'trunk' ]];then
+            local action='add'
+            local dest="${REPO_DEST}-$CARCH"
+
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp trunk/* repos/$dest/
+        else
+            local action='move'
+            local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"
+
+            [[ ! -f repos/$src/PKGBUILD ]] && die "%s does not exist!" "repos/$src/PKGBUILD"
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp repos/$src/* repos/$dest/
+            git rm -r repos/$src
+        fi
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$ver' ${action}"
+        msg "Action: %s" "$commit_msg"
+
+        git add .
+        git commit -m "$commit_msg"
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}
+
+        ${push} && pull_tree "${git_tree}" "$head"
+
+        subrepo_pull "${PACKAGE}"
+        subrepo_push "${PACKAGE}"
+        subrepo_clean "${PACKAGE}"
+
+        ${push} && push_tree "${git_tree}"
+
+        git prune
+    else
+        error "Package '%s' does not exist!" "${PACKAGE}"
+    fi
+}
+
+load_user_info
+
+load_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,133 @@
+#!/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
+
+show_version_table(){
+    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
+
+    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
+
+            local pkg=${package##*/}
+            local artixrepo=$(find_repo "$package" "${staging}" "${unstable}")
+            local artixshow=${artixrepo%-*}
+            local pkgbuild=$package/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
+        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
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    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 '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='udmxyh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        u) upgrades=true ;;
+        d) downgrades=true ;;
+        m) move=true ;;
+        x) staging=false ;;
+        y) unstable=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+show_version_table

bin/pkg/deploypkg.in

@@ -0,0 +1,97 @@
+#!/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
+
+update_repo(){
+    local repo="$1" pkgfile ver ext=db.tar.xz
+    local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
+
+    . PKGBUILD
+
+    local pkgsearch=(${pkgname[@]})
+    if check_option "debug" "y"; then
+        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" "$pkgarch");then
+            local pkg=${pkgfile##*/}
+            info "Found: %s" "$pkg"
+            if ${add_pkg};then
+                local action='add'
+                packages+=("$pkg")
+#                 checkpkg "${pkgfile}" || return 2
+                if ${sign_pkg};then
+                    [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
+                    signfile ${pkgfile}
+                fi
+                ln -sf ${pkgfile}{,.sig} $repo_path/
+            elif ${del_pkg};then
+                local action='remove'
+                packages+=("$name")
+                [[ -e $repo_path/$pkg ]] && rm $repo_path/$pkg
+                [[ -e $repo_path/$pkg.sig ]] && rm $repo_path/$pkg.sig
+            fi
+        fi
+    done
+    cd $repo_path
+    [[ -n $action ]] && repo-$action -R $repo.$ext ${packages[@]}
+    return 0
+}
+
+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
+
+add_pkg=false
+del_pkg=false
+sign_pkg=false
+
+cmd=${0##*/}
+dest_repo=${cmd#*-}
+
+usage() {
+    echo "Usage: ${cmd} [options]"
+    echo '    -a                 Add package(s) to repository'
+    echo '    -r                 Remove package(s) from repository'
+    echo '    -s                 Sign package(s)'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+opts='arsh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        a) add_pkg=true; del_pkg=false ;;
+        r) del_pkg=true; add_pkg=false ;;
+        s) sign_pkg=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+prepare_dir "${REPOS_ROOT}"
+
+update_repo "${dest_repo}"

bin/pkg/find-libdeps.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,12 +12,25 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+. @libdir@/artools/util-base.sh
+. @libdir@/artools/util-pkg.sh
 
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util-pkg.sh
+# $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
+        return
+    fi
+    if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then
+    # libfoo.so=1-64
+        msg "${soname}=${soversion}-$2"
+        soobjects+=("${soname}=${soversion}-$2")
+    fi
+}
 
 set -e
 shopt -s extglob

bin/pkg/finddeps.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,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+. @libdir@/artools/util-base.sh
 
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 match=$1
 
 if [[ -z $match ]]; then

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}:"
@@ -21,15 +20,15 @@ IFS="${IFS}:"
 libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
 extras=
 
-TMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
+TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
 
 msg 'Go out and drink some tea, this will take a while :) ...'
 #  Check ELF binaries in the PATH and specified dir trees.
 for tree in $PATH $libdirs $extras; do
-    msg2 "DIR $tree"
+    msg2 "DIR %s" "$tree"
 
     #  Get list of files in tree.
-    files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
+    files=$(find "$tree" -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
     -name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name \
     '*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' \
     ! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' \
@@ -37,22 +36,22 @@ for tree in $PATH $libdirs $extras; do
     -name '*.mcopclass' ! -name '*.mcoptype')
     IFS=$ifs
     for i in $files; do
-        if (( $(file $i | grep -c 'ELF') != 0 )); then
+        if (( $(file "$i" | grep -c 'ELF') != 0 )); then
             #  Is an ELF binary.
-            if (( $(ldd $i 2>/dev/null | grep -c 'not found') != 0 )); then
+            if (( $(ldd "$i" 2>/dev/null | grep -c 'not found') != 0 )); then
                 #  Missing lib.
-                echo "$i:" >> $TMPDIR/raw.txt
-                ldd $i 2>/dev/null | grep 'not found' >> $TMPDIR/raw.txt
+                echo "$i:" >> "$TEMPDIR/raw.txt"
+                ldd "$i" 2>/dev/null | grep 'not found' >> "$TEMPDIR/raw.txt"
             fi
         fi
     done
 done
-grep '^/' $TMPDIR/raw.txt | sed -e 's/://g' >> $TMPDIR/affected-files.txt
+grep '^/' "$TEMPDIR/raw.txt" | sed -e 's/://g' >> "$TEMPDIR/affected-files.txt"
 # invoke pacman
-for i in $(cat $TMPDIR/affected-files.txt); do
-    pacman -Qo $i | awk '{print $4,$5}' >> $TMPDIR/pacman.txt
-done
+while read -r i; do
+    pacman -Qo "$i" | awk '{print $4,$5}' >> "$TEMPDIR/pacman.txt"
+done < "$TEMPDIR/affected-files.txt"
 # clean list
-sort -u $TMPDIR/pacman.txt >> $TMPDIR/possible-rebuilds.txt
+sort -u "$TEMPDIR/pacman.txt" >> "$TEMPDIR/possible-rebuilds.txt"
 
-msg "Files saved to $TMPDIR"
+msg "Files saved to %s" "$TEMPDIR"

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,39 +12,10 @@
 # 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
 
-init_variables() {
-    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-    makepkg_args=("${default_makepkg_args[@]}")
-    repack=false
-    update_first=false
-    clean_first=false
-    run_namcap=false
-    temp_chroot=false
-    chrootdir=
-    passeddir=
-    makepkg_user=
-    declare -ga install_pkgs
-    declare -gi ret=0
-
-    bindmounts_ro=()
-    bindmounts_rw=()
-
-    copy=$USER
-    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
-    [[ -z "$copy" || $copy = root ]] && copy=copy
-    src_owner=${SUDO_USER:-$USER}
-}
-
 usage() {
     echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
     echo ' Run this script in a PKGBUILD dir to build a package inside a'
@@ -81,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
 
@@ -121,24 +99,24 @@ sync_chroot() {
 }
 
 # Usage: delete_chroot $copydir [$copy]
-# delete_chroot() {
-#     local copydir=$1
-#     local copy=${1:-$2}
-#
-#     stat_busy "Removing chroot copy [%s]" "$copy"
-#     if is_btrfs "$chrootdir" && ! mountpoint -q "$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
-#
-#     # remove lock file
-#     rm -f "$copydir.lock"
-#     stat_done
-# }
+delete_chroot() {
+    local copydir=$1
+    local copy=${1:-$2}
+
+    stat_busy "Removing chroot copy [%s]" "$copy"
+    if is_subvolume "$copydir" && ! mountpoint -q "$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
+
+    # remove lock file
+    rm -f "$copydir.lock"
+    stat_done
+}
 
 # Usage: install_packages $copydir $pkgs...
 install_packages() {
@@ -151,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/}"
@@ -159,36 +140,33 @@ install_packages() {
     return $ret
 }
 
-# Usage: prepare_chroot $copydir $HOME $repack $run_namcap
+# Usage: prepare_chroot $copydir $HOME $keepbuilddir $run_namcap
 # Globals:
 #  - MAKEFLAGS
 #  - PACKAGER
 prepare_chroot() {
     local copydir=$1
     local USER_HOME=$2
-    local repack=$3
+    local keepbuilddir=$3
     local run_namcap=$4
 
-    $repack || rm -rf "$copydir/build"
+    [[ $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
 
     # We can't use useradd without chrooting, otherwise it invokes PAM modules
     # 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,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
+    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/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 \
@@ -208,9 +186,10 @@ EOF
     {
         printf '#!/bin/bash\n'
         declare -f _chrootbuild
+        declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
         printf '_chrootbuild "$@" || exit\n'
 
-        if $run_namcap; then
+        if [[ $run_namcap = true ]]; then
             declare -f _chrootnamcap
             printf '_chrootnamcap || exit\n'
         fi
@@ -221,8 +200,26 @@ EOF
 # These functions aren't run in makechrootpkg,
 # so no global variables
 _chrootbuild() {
+    # No coredumps
+    ulimit -c 0
+
+    . /etc/locale.conf
+
+    # shellcheck source=/dev/null
     . /etc/profile
-    sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+
+    # 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;;
+    esac
 }
 
 _chrootnamcap() {
@@ -233,32 +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 src_owner=$2
+    local makepkg_user=$2
 
-    local builddir="$(mktemp -d)"
-    chmod 1777 "$builddir"
+#     local builddir
+#     builddir="$(mktemp -d)"
+#     chown "$makepkg_user:" "$builddir"
+
+    setup_workdir
+    chown "$makepkg_user:" "$WORKDIR"
 
     # Ensure sources are downloaded
-    makepkg_user=${makepkg_user:-$SUDO_USER}
-    sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
-    makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
-    die "Could not download sources."
-    (( $? != 0 )) && die "Could not download sources."
+    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
+        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
@@ -284,6 +284,11 @@ move_products() {
     for s in "$copydir"/srcpkgdest/*; do
         chown "$src_owner" "$s"
         mv "$s" "$SRCPKGDEST"
+
+        # Fix broken symlink because of temporary chroot SRCPKGDEST /srcpkgdest
+        if [[ "$PWD" != "$SRCPKGDEST" && -L "$PWD/${s##*/}" ]]; then
+            ln -sf "$SRCPKGDEST/${s##*/}"
+        fi
     done
 }
 # }}}
@@ -291,11 +296,30 @@ move_products() {
 orig_argv=("$0" "$@")
 
 main() {
-    init_variables
+    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
+    makepkg_args=("${default_makepkg_args[@]}")
+    keepbuilddir=false
+    update_first=false
+    clean_first=false
+    run_namcap=false
+    temp_chroot=false
+    chrootdir=
+    passeddir=
+    makepkg_user=
+    declare -a install_pkgs
+    declare -i ret=0
+
+    bindmounts_ro=()
+    bindmounts_rw=()
+
+    copy=$USER
+    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+    [[ -z "$copy" || $copy = root ]] && copy=copy
+    src_owner=${SUDO_USER:-$USER}
 
     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") ;;
@@ -315,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
+    check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
 
     # Canonicalize chrootdir, getting rid of trailing /
     chrootdir=$(readlink -e "$passeddir")
@@ -331,13 +355,13 @@ main() {
     # Pass all arguments after -- right to makepkg
     makepkg_args+=("${@:$OPTIND}")
 
-    # See if -R was passed to makepkg
-    for arg in "${@:OPTIND}"; do
+    # See if -R or -e was passed to makepkg
+    for arg in "${makepkg_args[@]}"; do
         case ${arg%%=*} in
-            -*R*|--repackage)
-                repack=true
-                break 2
-                ;;
+            --repackage|--noextract) keepbuilddir=true; break ;;
+            --repackage|--noextract) keepbuilddir=true; break ;;
+            --*) ;;
+            -*R*|-*e*) keepbuilddir=true; break ;;
         esac
     done
 
@@ -345,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
@@ -358,11 +382,14 @@ 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
+    $update_first && chroot-run \
+            -r "${bindmounts_ro[@]}" \
+            -w "${bindmounts_rw[@]}" \
+            "$copydir" \
+            pacman -Syu --noconfirm
 
     if [[ -n ${install_pkgs[*]:-} ]]; then
         install_packages "$copydir" "${install_pkgs[@]}"
@@ -376,14 +403,18 @@ main() {
         exit 1
     fi
 
-    download_sources "$copydir" "$src_owner"
+    download_sources "$copydir" "$makepkg_user"
 
-    prepare_chroot "$copydir" "$USER_HOME" "$repack" "$run_namcap"
+    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,139 @@
+#!/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(){
+    local pkgfile=$(print_all_package_names)
+
+    Yaml=$(write_yaml_header)
+
+    Yaml+=$(write_empty_line)
+
+    Yaml+=$(write_yaml_map 0 "pkgbase")
+    Yaml+=$(write_yaml_map 2 "pkgname" "${pkgbase:-$pkgname}")
+    ${details} && write_details ''
+
+    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)
+
+    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"
+
+write_pkg_yaml

data/artools.conf

@@ -1,70 +1,64 @@
-######################################################
-################ artools.conf ##################
-######################################################
-
-# default taget arch: auto detect
-# target_arch=$(uname -m)
+#############################################
+################ artools-base ###############
+#############################################
 
 # build dir where buildpkg or buildiso chroots are created
-# chroots_dir=/var/lib/artools
-
-# custom build mirror server
-# build_mirror=https://netcologne.dl.sourceforge.net/project/artix-linux/repos
-
-# the server user
-# account=[SetUser]
-
-# the server project
-# project="artix-linux"
-
-# host mirrors
-# host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
+# CHROOTS_DIR=/var/lib/artools
 
 # the workspace directory
-# workspace_dir="/home/${OWNER}/artools-workspace"
+# WORKSPACE_DIR="/home/${OWNER}/artools-workspace"
 
-################ buildtree ###############
+#############################################
+################ artools-pkg ################
+#############################################
 
-# artix package tree
-# repo_tree_artix=('system' 'world' 'galaxy')
+# gitea user access token
+# GIT_TOKEN=''
 
-# host_tree_artix=https://github.com/artix-linux
+# HOST_TREE_ARTIX='gitea@gitea.artixlinux.org:artix'
 
-# archlinux package tree
-# repo_tree_arch=('packages' 'community')
+# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
 
-# host_tree_arch=git://projects.archlinux.org/svntogit
+# TREE_NAMES_ARTIX=(
+#         packages
+#         community
+#         packages-kernel
+#         packages-openrc
+#         packages-runit
+#         packages-xorg
+#         packages-python
+#         packages-perl
+#         packages-qt5
+#         packages-ruby
+# )
 
-################ buildpkg ################
+# HOST_TREE_ARCH=git://git.archlinux.org/svntogit
 
-# default pkg build list; name without .list extension
-# build_list=default
+# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
 
-################ buildiso ################
+# TREE_NAMES_ARCH=(packages community)
+
+# default repos root
+# REPOS_ROOT=${WORKSPACE_DIR}/repos
+
+#############################################
+################ artools-iso ################
+#############################################
+
+# the iso storage directory
+# ISO_POOL="${WORKSPACE_DIR}/iso"
 
 # the dist release; default: auto
-# dist_release=rolling
+# ISO_VERSION=$(date +%Y%m%d)
 
-# the branding; default: auto
-# dist_branding="ARTIX"
-
-# possible values: openrc, (s6, runit) not yet supported
-# initsys="openrc"
-
-# unset defaults to given value
-# kernel="linux-lts"
+# possible values: openrc, runit (s6 not yet supported)
+# INITSYS="openrc"
 
 # gpg key; leave empty or commented to skip sfs signing
-# gpgkey=""
-
-################ deployiso ################
+# GPG_KEY=""
 
 # set upload bandwidth limit in kB/s
-# limit=100
-
-# the torrent tracker urls, comma separated
-# tracker_url='udp://mirror.strits.dk:6969'
-
-# Piece size, 2^n
-# piece_size=21
+# UPLIMIT=1000
 
+# the server user
+# ACCOUNT=[SetUser]

data/base/pacman-default.conf

@@ -0,0 +1,122 @@
+#
+# /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.
+
+#[gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+#[galaxy-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-gnome-wobble.conf

@@ -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-goblins.conf

@@ -0,0 +1,140 @@
+#
+# /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.
+
+[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
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-staging]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-gremlins.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+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.
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # uncommented to enable the repo.
+#
+
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
@@ -70,20 +78,45 @@ Include = /etc/pacman.d/mirrorlist
 [world]
 Include = /etc/pacman.d/mirrorlist
 
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-# [core]
-# Include = /etc/pacman.d/mirrorlist-arch
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
 
 [extra]
 Include = /etc/pacman.d/mirrorlist-arch
 
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
 [community]
 Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-kde-wobble.conf

@@ -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/base/pacman-lib32-goblins.conf

@@ -0,0 +1,140 @@
+#
+# /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.
+
+[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
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-lib32-gremlins.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+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.
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # uncommented to enable the repo.
+#
+
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
@@ -70,14 +78,20 @@ Include = /etc/pacman.d/mirrorlist
 [world]
 Include = /etc/pacman.d/mirrorlist
 
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
+# enable the lib32 repositories as required here.
 
-[multilib]
-Include = /etc/pacman.d/mirrorlist-arch
+[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.
@@ -85,11 +99,24 @@ Include = /etc/pacman.d/mirrorlist-arch
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-# [core]
-# Include = /etc/pacman.d/mirrorlist-arch
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
 
 [extra]
 Include = /etc/pacman.d/mirrorlist-arch
 
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
 [community]
 Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/base/pacman-lib32.conf

@@ -0,0 +1,122 @@
+#
+# /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.
+
+#[gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+#[galaxy-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[lib32]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+#
+# ARCHLINUX
+#
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/import.list.d/system.list

@@ -1,146 +0,0 @@
-acl
-archlinux-keyring
-attr
-autoconf
-automake
-b43-fwcutter
-binutils
-bison
-bridge-utils
-bzip2
-ca-certificates
-ca-certificates-cacert
-coreutils
-cracklib
-curl
-dash
-db
-dialog
-diffutils
-ding-libs
-dnssec-anchors
-dosfstools
-e2fsprogs
-ed
-efibootmgr
-efivar
-elfutils
-expat
-fakeroot
-file
-findutils
-flex
-gawk
-gcc
-gdbm
-gettext
-glib2
-gmp
-gnutls
-gpgme
-grep
-groff
-gzip
-hdparm
-hwids
-iana-etc
-icu
-ifenslave
-iproute2
-iputils
-ipw2100-fw
-ipw2200-fw
-isdn4k-utils
-iw
-jfsutils
-kbd
-keyutils
-ldns
-less
-libaio
-libarchive
-libassuan
-libcap
-libedit
-libevent
-libffi
-libgcrypt
-libgpg-error
-libgssglue
-libidn
-libksba
-libmnl
-libmpc
-libnftnl
-libnghttp2
-libnl
-libpcap
-libpipeline
-libpsl
-librpcsecgss
-libseccomp
-libsecret
-libssh2
-libtasn1
-libtirpc
-libtool
-libunistring
-licenses
-links
-linux-api-headers
-linux-atm
-linux-firmware
-linux-lts
-lz4
-lzo
-m4
-make
-man-pages
-mkinitcpio-busybox
-mkinitcpio-nfs-utils
-mpfr
-nano
-nettle
-net-tools
-nfsidmap
-nilfs-utils
-npth
-nspr
-nss
-openssl
-openssl-1.0
-p11-kit
-patch
-pciutils
-pcre
-perl
-pinentry
-pkcs11-helper
-pkg-config
-popt
-pptpclient
-procinfo-ng
-psmisc
-pth
-reiserfsprogs
-run-parts
-sdparm
-sed
-s-nail
-sqlite
-sysfsutils
-syslinux
-tar
-texinfo
-thin-provisioning-tools
-traceroute
-tzdata
-usbutils
-vi
-which
-wireless-regdb
-wireless_tools
-wpa_actiond
-xfsprogs
-xz
-zd1211-firmware

data/import.list.d/world.list

@@ -1,35 +0,0 @@
-qt5-3d
-qt5-canvas3d
-qt5-charts
-qt5-connectivity
-qt5-datavis3d
-qt5-declarative
-qt5-doc
-qt5-examples
-qt5-gamepad
-qt5-graphicaleffects
-qt5-imageformats
-qt5-location
-qt5-multimedia
-qt5-networkauth
-qt5-quickcontrols
-qt5-quickcontrols2
-qt5-remoteobjects
-qt5-script
-qt5-scxml
-qt5-sensors
-qt5-serialbus
-qt5-serialport
-qt5-speech
-qt5-svg
-qt5-tools
-qt5-translations
-qt5-virtualkeyboard
-qt5-wayland
-qt5-webchannel
-qt5-webengine
-qt5-webkit
-qt5-websockets
-qt5-webview
-qt5-x11extras
-qt5-xmlpatterns

data/iso/mkinitcpio.conf

@@ -0,0 +1,5 @@
+MODULES=(loop dm-snapshot)
+
+HOOKS=(base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block filesystems keyboard keymap)
+
+COMPRESSION="xz"

data/linux.preset

@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-@kernel@-@arch@"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-@kernel@-@arch@.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-@kernel@-@arch@-fallback.img"
-fallback_options="-S autodetect"

data/make.conf.d/i686.conf

@@ -1,3 +0,0 @@
-carch="i686"
-chost="i686-pc-linux-gnu"
-cflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/make.conf.d/multilib.conf

@@ -1,3 +0,0 @@
-carch="x86_64"
-chost="x86_64-pc-linux-gnu"
-cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/make.conf.d/x86_64.conf

@@ -1,3 +0,0 @@
-carch="x86_64"
-chost="x86_64-pc-linux-gnu"
-cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/mkinitcpio.conf

@@ -1,3 +0,0 @@
-MODULES="loop dm-snapshot"
-HOOKS="base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block pcmcia filesystems keyboard keymap"
-COMPRESSION="xz"

data/patches/artix-bash.patch

@@ -0,0 +1,87 @@
+--- /dev/null
++++ b/artix.bashrc
+@@ -0,0 +1,46 @@
++use_color=true
++
++# Set colorful PS1 only on colorful terminals.
++# dircolors --print-database uses its own built-in database
++# instead of using /etc/DIR_COLORS.  Try to use the external file
++# first to take advantage of user additions.  Use internal bash
++# globbing instead of external grep binary.
++safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
++match_lhs=""
++[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
++[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
++[[ -z ${match_lhs}    ]] \
++	&& type -P dircolors >/dev/null \
++	&& match_lhs=$(dircolors --print-database)
++[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
++
++if ${use_color} ; then
++	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
++	if type -P dircolors >/dev/null ; then
++		if [[ -f ~/.dir_colors ]] ; then
++			eval $(dircolors -b ~/.dir_colors)
++		elif [[ -f /etc/DIR_COLORS ]] ; then
++			eval $(dircolors -b /etc/DIR_COLORS)
++		fi
++	fi
++
++	if [[ ${EUID} == 0 ]] ; then
++		PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
++	else
++		PS1='\[\033[01;36m\][\u@\h\[\033[01;37m\] \W\[\033[01;36m\]]\$\[\033[00m\] '
++	fi
++
++	alias ls='ls --color=auto'
++	alias grep='grep --colour=auto'
++	alias egrep='egrep --colour=auto'
++	alias fgrep='fgrep --colour=auto'
++else
++	if [[ ${EUID} == 0 ]] ; then
++		# show root@ when we don't have colors
++		PS1='\u@\h \W \$ '
++	else
++		PS1='\u@\h \w \$ '
++	fi
++fi
++
++unset use_color safe_term match_lhs sh
+--- a/dot.bashrc
++++ b/dot.bashrc
+@@ -5,5 +5,5 @@
+ # If not running interactively, don't do anything
+ [[ $- != *i* ]] && return
+
+-alias ls='ls --color=auto'
+-PS1='[\u@\h \W]\$ '
++# alias ls='ls --color=auto'
++# PS1='[\u@\h \W]\$ '
+
+--- a/system.bashrc
++++ a/system.bashrc
+@@ -1,5 +1,5 @@
+ #
+-# /etc/bash.bashrc
++# /etc/bash/bashrc
+ #
+
+ # If not running interactively, don't do anything
+@@ -19,4 +19,8 @@
+     ;;
+ esac
+
++for sh in /etc/bash/bashrc.d/*.bashrc ; do
++	[[ -r ${sh} ]] && source "${sh}"
++done
++
+ [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
+
+--- a/system.bash_logout
++++ a/system.bash_logout
+@@ -1,3 +1,3 @@
+ #
+-# /etc/bash.bash_logout
++# /etc/bash/bash_logout
+ #
+

data/pkg.list.d/default.list

@@ -1 +0,0 @@
-openrc

data/pkg/makepkg.conf

@@ -1,3 +1,4 @@
+#!/hint/bash
 #
 # /etc/makepkg.conf
 #
@@ -8,9 +9,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
+          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -20,26 +22,24 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %
 # /usr/bin/wget
 
 #-- The package required by makepkg to download VCS sources
-# Format: 'protocol::package'
+#  Format: 'protocol::package'
 VCSCLIENTS=('bzr::bzr'
-	    'git::git'
-	    'hg::mercurial'
-	    'svn::subversion')
+            'git::git'
+            'hg::mercurial'
+            'svn::subversion')
 
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
 #
-CARCH="@CARCH@"
-CHOST="@CHOST@"
+CARCH="x86_64"
+CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="@CFLAGS@"
-CXXFLAGS="@CFLAGS@"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+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"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
@@ -50,10 +50,9 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
-#-- fakeroot: Allow building packages as a non-root user
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
 #-- color:    Colorize output messages
 #-- ccache:   Use ccache to cache compilation
@@ -74,7 +73,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -84,10 +83,9 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- emptydirs:  Leave empty directories in packages
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
-#-- upx:        Compress binary executable files using UPX
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -103,6 +101,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
 DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+#-- Directory to store source code in for debug packages
+DBGSRCDIR="/usr/src/debug"
 
 #########################################################################
 # PACKAGE OUTPUT
@@ -143,5 +143,3 @@ COMPRESSZ=(compress -c -f)
 #
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:

data/pkglists/freedesktop.list

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

data/pkglists/gnome.list

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

data/pkglists/kde.list

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

data/pkglists/kernel.list

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

data/pkglists/lxqt.list

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

data/pkglists/xorg.list

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

data/profile.conf.example

@@ -1,30 +0,0 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-################ install ################
-
-# default displaymanager: none
-# supported; lightdm, sddm, gdm, lxdm, mdm
-# displaymanager="none"
-
-# Set to false to disable autologin in the livecd
-# autologin="true"
-
-# service runlevels
-# openrc_boot=('elogind')
-# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-
-# unset defaults to given values
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
-
-################# live-session #################
-
-# unset defaults to given value
-# hostname="artix"
-
-# unset defaults to given value
-# username="artix"
-
-# unset defaults to given value
-# password="artix"

docbook/artools.conf.xml

@@ -1,298 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="profile.conf" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-    <refentryinfo>
-        <title>profile.conf-+</title>
-        <productname>artools</productname>
-
-        <authorgroup>
-        <author>
-            <contrib></contrib>
-            <firstname></firstname>
-            <surname></surname>
-            <email></email>
-        </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>artools.conf</refentrytitle>
-        <manvolnum>5</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>artools.conf</refname>
-        <refpurpose>general configuration file for artools</refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <para><filename>artools.conf</filename></para>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para>artools.conf is a general configuration file for all artools binaries. </para>
-
-        <para>By default all the options in the file are commented, with a value equal to the
-        default value. To change it just uncomment and put the desired value.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>General options for all tools</title>
-
-        <para>The following options are understood and used for various tools:</para>
-
-        <variablelist>
-
-            <varlistentry>
-                <term><varname>target_arch=</varname></term>
-
-                <listitem><para>Takes <option>i686</option> or <option>x86_64</option>.
-                By default it will try to autodetect the current architecture.
-                It defines in witch architecture the packages will be built with
-                buildpkg.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>workspace_dir=</varname></term>
-
-                <listitem><para>Workspace dir where packages, iso, repos or build tree. Default is "/home/$OWNER/artools-workspace".
-                </para></listitem>
-            </varlistentry>
-
-
-            <varlistentry>
-                <term><varname>chroots_dir=</varname></term>
-
-                <listitem><para>Build dir where buildpkg or buildiso chroot
-                environment will be created. Default is "/var/lib/artools".
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>build_mirror=</varname></term>
-
-                <listitem><para>Default mirror to be used when building
-                packages or iso.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>account=</varname></term>
-
-                <listitem><para>Default user to be used for upload.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>project=</varname></term>
-
-                <listitem><para>Default SF project name to be used for upload.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>host_mirrors=</varname></term>
-
-                <listitem><para>Array of host mirrors.
-                </para></listitem>
-            </varlistentry>
-
-        </variablelist>
-    </refsect1>
-
-    <refsect1>
-        <title>Options for buildtree</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><varname>repo_tree_artix=</varname></term>
-
-                <listitem><para>Artix package tree. Default is
-                "('system' 'world' 'galaxy')".
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>host_tree_artix=</varname></term>
-
-                <listitem><para>Host tree. Default is "https://github.com/artix-linux".
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>repo_tree_arch=</varname></term>
-
-                <listitem><para>Archlinux package tree. Default is
-                "('packages' 'community')".
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>host_tree_arch=</varname></term>
-
-                <listitem><para>Host tree for archlinux. Default is
-                "https://projects.archlinux.org/git/svntogit".
-                </para></listitem>
-            </varlistentry>
-        </variablelist>
-    </refsect1>
-
-    <refsect1>
-        <title>Options for buildpkg</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><varname>build_list=</varname></term>
-
-                <listitem><para>Default list for buildpkg without the .list
-                extension.
-                </para></listitem>
-            </varlistentry>
-
-        </variablelist>
-    </refsect1>
-
-    <refsect1>
-        <title>Options for buildiso</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-
-        <varlistentry>
-            <term><varname>dist_release=</varname></term>
-
-            <listitem><para>Release version of the distribution.
-            </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <!-- TODO: We should tell where exactly this is used -->
-            <term><varname>dist_branding=</varname></term>
-
-            <listitem><para>Branding of the distribution.
-            </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term><varname>gpgkey=</varname></term>
-
-            <listitem><para>If the gpgkey is supplied, the sfs images on iso will be signed.
-                    If the key is left empty or commented, signing will be skipped.
-                    </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term><varname>initsys=</varname></term>
-
-            <listitem><para>Takes <option>openrc</option> (the default)
-            or <option>notyetimplemented</option>. Selecting and option will change
-            how the hostname, the displaymanager and services will be configured.
-            </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term><varname>kernel=</varname></term>
-
-            <listitem><para>Takes a string corresponding to an
-            artix kernel package.
-            </para></listitem>
-        </varlistentry>
-
-        </variablelist>
-    </refsect1>
-
-        <refsect1>
-        <title>Options for deployiso</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-
-             <varlistentry>
-                <term><varname>tracker_url=</varname></term>
-
-                <listitem><para>Default tracker announce for the torrent.
-                    The tracker url can also contain comma separated urls.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>piece_size=</varname></term>
-
-                <listitem><para>Default priece size for the torrent in 2^n.
-                        </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>uplimit=</varname></term>
-
-                <listitem><para>Default upload bandwidth limit in kb/s.
-                </para></listitem>
-            </varlistentry>
-
-        </variablelist>
-    </refsect1>
-
-    <refsect1>
-        <title>Options for deploypkg</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><varname>repos_local=</varname></term>
-
-                <listitem><para>The local repository root. Default is "${workspace_dir}/repos".
-                </para></listitem>
-            </varlistentry>
-
-        </variablelist>
-    </refsect1>
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>profiles.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>buildiso</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>deployiso</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>buildtree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>deploypkg</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>buildpkg</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-        </para>
-    </refsect1>
-
-</refentry>
-
-

docbook/buildiso.xml

@@ -1,181 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with artools; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="buildiso" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-    <refentryinfo>
-        <title>buildiso-+</title>
-        <productname>artools</productname>
-
-        <authorgroup>
-            <author>
-                <contrib></contrib>
-                <firstname></firstname>
-                <surname></surname>
-                <email></email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>buildiso</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>buildiso</refname>
-        <refpurpose>buildiso is used to build a particular ISO or a set of ISOs. </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <cmdsynopsis>
-            <command>buildiso</command>
-            <arg choice="opt" rep="repeat">OPTIONS</arg>
-        </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para><command>buildiso</command> is used to build a particular ISO or a set of ISOs. </para>
-
-        <para>With buildiso you can build ISOs suitable to be booted from a removable media
-        like a DVD o a USB Stick, it will automatically create the necessary files to
-        install this ISO using calamares.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>-p PROFILE...</option></term>
-
-                <listitem><para>Name of the name of the directory
-                you will build. It needs to contain a
-                folder with a valid profile.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-a i686|x86_64</option></term>
-
-                <listitem><para>Architecture that the iso will be built. Can be i686 or x86_64.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-r DIR</option></term>
-
-                <listitem><para>Root working directory where the iso will be built.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-t DIR</option></term>
-
-                <listitem><para>Iso target directory where the final iso will be stored.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-i openrc|s6|runit</option></term>
-
-                <listitem><para>The init system on the iso</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-g KEY</option></term>
-
-                <listitem><para>The GPG key to use to sign the sfs images.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-k linuxXXX</option></term>
-
-                <listitem><para>The kernel on the iso</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-c</option></term>
-
-                <listitem><para>Disable clean working directory step.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-m</option></term>
-
-                <listitem><para>Enable persistence mode.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-x</option></term>
-
-                <listitem><para>Only build images, without creating an ISO file.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-z</option></term>
-
-                <listitem><para>Generate iso from already created images, for example created with the -x option.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-v</option></term>
-
-                <listitem><para>Verbose output to log file, show profile detail in combination with pretend.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-q</option></term>
-
-                <listitem><para>Query settings and pretend build.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-h</option></term>
-
-                <listitem><para>Help.</para></listitem>
-            </varlistentry>
-        </variablelist>
-
-    </refsect1>
-
-    <!--<refsect1>
-        <title>Exit status</title>
-
-        <para>On success, 0 is returned, a non-zero failure code
-        otherwise.</para>
-    </refsect1>
-    -->
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>artools.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>profiles.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        </para>
-    </refsect1>
-
-</refentry>
-

docbook/buildpkg.xml

@@ -1,160 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with artools; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="buildpkg" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <refentryinfo>
-        <title>buildpkg-+</title>
-        <productname>artools</productname>
-        <authorgroup>
-            <author>
-                <contrib></contrib>
-                <firstname></firstname>
-                <surname></surname>
-                <email></email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>buildpkg</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>buildpkg</refname>
-        <refpurpose>buildpkg is used to build packages in a clean chroot. </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <cmdsynopsis>
-            <command>buildpkg</command>
-            <arg choice="opt" rep="repeat">OPTIONS</arg>
-        </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para><command>buildpkg</command> is used to build a particular package or a set of packages. </para>
-
-        <para>With buildpkg you can build packages in a clean chroot environment.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>-p PROFILE...</option></term>
-
-                <listitem><para>Name of the build list or name of the directory
-                you will build. It needs to cantain a existing build list or a
-                folder with a valid PKGBUILD.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-a i686|x86_64|multilib</option></term>
-
-                <listitem><para>Architecture that the iso will be built. Can be i686, x86_64 or multilib.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-r DIR</option></term>
-
-                <listitem><para>Root working directory where the package will be built.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-i PKG</option></term>
-
-                <listitem><para>Install packages into the working copy of the chroot.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-o</option></term>
-
-                <listitem><para>Create chroot.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-d</option></term>
-
-                <listitem><para>Delete chroot.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-c</option></term>
-
-                <listitem><para>Clean chroot copy.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-u</option></term>
-
-                <listitem><para>Update chroot copy.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-w</option></term>
-
-                <listitem><para>Clean up cache and sources.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-n</option></term>
-
-                <listitem><para>Install built package in chroot and run namcap check.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-s</option></term>
-
-                <listitem><para>Sign package.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-q</option></term>
-
-                <listitem><para>Query settings and pretend build.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-h</option></term>
-
-                <listitem><para>Help.</para></listitem>
-            </varlistentry>
-        </variablelist>
-
-    </refsect1>
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>artools.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        </para>
-    </refsect1>
-</refentry>

docbook/buildtree.xml

@@ -1,111 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with artools; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="buildtree" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <refentryinfo>
-        <title>buildtree-+</title>
-        <productname>artools</productname>
-        <authorgroup>
-            <author>
-                <contrib></contrib>
-                <firstname></firstname>
-                <surname></surname>
-                <email></email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>buildtree</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>buildtree</refname>
-        <refpurpose>buildtree is used to sync the cromnix and arch package build tree. </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <cmdsynopsis>
-            <command>buildtree</command>
-            <arg choice="opt" rep="repeat">OPTIONS</arg>
-        </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para><command>buildtree</command> is used to sync package trees. </para>
-
-        <para>With buildtree, you can sync the cromnix and arch linux packae build trees.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>-s</option></term>
-
-                <listitem><para>Sync Manjaro linux tree.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-a</option></term>
-
-                <listitem><para>Sync Arch linux tree.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-c</option></term>
-
-                <listitem><para>Clean package trees.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-q</option></term>
-
-                <listitem><para>Query settings.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-h</option></term>
-
-                <listitem><para>Help.</para></listitem>
-            </varlistentry>
-        </variablelist>
-
-    </refsect1>
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>artools.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        </para>
-    </refsect1>
-</refentry>
-

docbook/buildyaml.xml

@@ -1,146 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with artools; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="buildyaml" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-    <refentryinfo>
-        <title>buildyaml-+</title>
-        <productname>artools</productname>
-
-        <authorgroup>
-            <author>
-                <contrib></contrib>
-                <firstname></firstname>
-                <surname></surname>
-                <email></email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>buildyaml</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>buildyaml</refname>
-        <refpurpose>buildyaml is used to generate and validate yaml files used by calamares. </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <cmdsynopsis>
-            <command>buildyaml</command>
-            <arg choice="opt" rep="repeat">OPTIONS</arg>
-        </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para><command>buildyaml</command> is used to generate and validate yaml files used by calamares.</para>
-
-        <para>buildyaml is a script to generate and validate yaml files by yaml schemas. Buildiso generates these files also, but buildyaml is a standalone version without the need to build the entire iso.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>-p PROFILE...</option></term>
-
-                <listitem><para>Name of the profile directory.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-a i686|x86_64</option></term>
-
-                <listitem><para>Architecture that the yaml will be created for. Can be i686 or x86_64.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-i openrc|s6|runit</option></term>
-
-                <listitem><para>The init system the yaml will be created for.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-k linuxXXX</option></term>
-
-                <listitem><para>The kernel the yaml will be created for.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-c</option></term>
-
-                <listitem><para>Create calamares yaml conf files.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-g</option></term>
-
-                <listitem><para>Generate a packman group netgroup yaml file.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-v</option></term>
-
-                <listitem><para>Validate the yaml file by yaml schema.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-q</option></term>
-
-                <listitem><para>Query settings.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-h</option></term>
-
-                <listitem><para>Help.</para></listitem>
-            </varlistentry>
-        </variablelist>
-
-    </refsect1>
-
-    <!--<refsect1>
-        <title>Exit status</title>
-
-        <para>On success, 0 is returned, a non-zero failure code
-        otherwise.</para>
-    </refsect1>
-    -->
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>artools.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>profiles.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        </para>
-    </refsect1>
-
-</refentry>

docbook/deployiso.xml

@@ -1,135 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with artools; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="deployiso" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-    <refentryinfo>
-        <title>deployiso-+</title>
-        <productname>artools</productname>
-
-        <authorgroup>
-            <author>
-                <contrib></contrib>
-                <firstname></firstname>
-                <surname></surname>
-                <email></email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>deployiso</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>deployiso</refname>
-        <refpurpose>deployiso is used to upload a particular ISO or a set of ISOs. </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <cmdsynopsis>
-            <command>deployiso</command>
-            <arg choice="opt" rep="repeat">OPTIONS</arg>
-        </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para><command>deployiso</command> is used to upload a particular ISO or a set of ISOs. </para>
-
-        <para>deployiso is a script to upload a specific iso or a buiildset to SF.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>-p PROFILE...</option></term>
-
-                <listitem><para>Name of the iso profile directory
-                you will upload.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-l</option></term>
-
-                <listitem><para>Limit bandwidth in kB/s.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-u</option></term>
-
-                <listitem><para>Update remote iso.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-t</option></term>
-
-                <listitem><para>Create a torrent from iso file.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-v</option></term>
-
-                <listitem><para>Verbose output.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-q</option></term>
-
-                <listitem><para>Query settings and pretend upload.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-h</option></term>
-
-                <listitem><para>Help.</para></listitem>
-            </varlistentry>
-        </variablelist>
-
-    </refsect1>
-
-    <!--<refsect1>
-        <title>Exit status</title>
-
-        <para>On success, 0 is returned, a non-zero failure code
-        otherwise.</para>
-    </refsect1>
-    -->
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>artools.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>profiles.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        </para>
-    </refsect1>
-
-</refentry>

docbook/deploypkg.xml

@@ -1,145 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with artools; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="deploypkg" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-    <refentryinfo>
-        <title>deploypkg-+</title>
-        <productname>artools</productname>
-
-        <authorgroup>
-            <author>
-                <contrib></contrib>
-                <firstname></firstname>
-                <surname></surname>
-                <email></email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>deploypkg</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>deploypkg</refname>
-        <refpurpose>deploypkg is used to sync package repositories. </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <cmdsynopsis>
-            <command>deploypkg</command>
-            <arg choice="opt" rep="repeat">OPTIONS</arg>
-        </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para><command>deploypkg</command> is used to sync package repositories. </para>
-
-        <para>deploypkg is a script to sync a specific repoitory with SF.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>-r REPOSITORY...</option></term>
-
-                <listitem><para>Name of the repo to sync.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-p PACKAGE...</option></term>
-
-                <listitem><para>Name of the package to add or delete.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-x</option></term>
-
-                <listitem><para>Add a package to the repo db.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-y</option></term>
-
-                <listitem><para>Delete a package from the repo.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-u</option></term>
-
-                <listitem><para>Upload a repo.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-d</option></term>
-
-                <listitem><para>Download a repo.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-v</option></term>
-
-                <listitem><para>Verbose output.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-q</option></term>
-
-                <listitem><para>Query settings and pretend upload.</para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>-h</option></term>
-
-                <listitem><para>Help.</para></listitem>
-            </varlistentry>
-        </variablelist>
-
-    </refsect1>
-
-    <!--<refsect1>
-        <title>Exit status</title>
-
-        <para>On success, 0 is returned, a non-zero failure code
-        otherwise.</para>
-    </refsect1>
-    -->
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>artools.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        </para>
-    </refsect1>
-
-</refentry>

docbook/profile.conf.xml

@@ -1,156 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-This file is part of artools.
-
-Copyright 2015 Manjaro Developers
-Copyright 2017 Artoo
-
-artools is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-artools 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with artools; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="profile.conf" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refentryinfo>
-        <title>profile.conf-+</title>
-        <productname>artools</productname>
-
-        <authorgroup>
-            <author>
-                <contrib></contrib>
-                <firstname></firstname>
-                <surname></surname>
-                <email></email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>profile.conf</refentrytitle>
-        <manvolnum>5</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>profile.conf</refname>
-        <refpurpose>configuration file for the individual profiles </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-        <para><filename>profile.conf</filename></para>
-    </refsynopsisdiv>
-
-    <refsect1>
-        <title>Description</title>
-
-        <para>profile.conf is a configuration file used to modify how the ISO will be built. </para>
-
-        <para>By default all the options in the file are commented, with a value equal to the
-        default value. To change it just uncomment and put the desired value.</para>
-
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <para>The following options are understood:</para>
-
-        <variablelist>
-
-            <varlistentry>
-                <term><varname>displaymanager=</varname></term>
-
-                <listitem><para>Takes a value of
-                <option>lightdm</option>,
-                <option>sddm</option>,
-                <option>gdm</option>,
-                <option>mdm</option>,
-                <option>lxdm</option>. Defaults to "none" value,
-                which won't configure any display manager.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>autologin=</varname></term>
-
-                <listitem><para>Accepts
-                    <option>true</option> (the default)
-                    <option>false</option>.</para>
-                </listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>openrc_boot=</varname></term>
-
-                <listitem><para>Array of services that will be
-                enabled in openrc boot runlevel.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>openrc_default=</varname></term>
-
-                <listitem><para>Array of services that will be
-                enabled in openrc default runlevel.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>hostname=</varname></term>
-
-                <listitem><para>Hostname for the ISO.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>username=</varname></term>
-
-                <listitem><para>Username of the default user
-                that will be created in the live-cd.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>password=</varname></term>
-
-                <listitem><para>Password of the default user
-                that will be created in the live-cd.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><varname>addgroups=</varname></term>
-
-                <listitem><para>Default groups of the default user
-                in the live-cd and the user created while installing
-                the iso using calamares.
-                </para></listitem>
-            </varlistentry>
-
-        </variablelist>
-
-    </refsect1>
-
-    <refsect1>
-        <title>See Also</title>
-        <para>
-            <citerefentry project='artools'><refentrytitle>artools.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-            <citerefentry project='artools'><refentrytitle>buildiso</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        </para>
-    </refsect1>
-
-</refentry>
-
-

initcpio/Makefile

@@ -0,0 +1,23 @@
+DIRMODE = -dm0755
+MODE =  -m0755
+
+CPIOHOOKS = \
+	$(wildcard hooks/*)
+
+CPIOINST = \
+	$(wildcard install/*)
+
+SCRIPT = \
+	$(wildcard script/*)
+
+install_initcpio:
+	install $(DIRMODE) $(DESTDIR)$(CPIODIR)/hooks
+	install $(MODE) $(CPIOHOOKS) $(DESTDIR)$(CPIODIR)/hooks
+
+	install $(DIRMODE) $(DESTDIR)$(CPIODIR)/install
+	install $(MODE) $(CPIOINST) $(DESTDIR)$(CPIODIR)/install
+	install $(MODE) $(SCRIPT) $(DESTDIR)$(CPIODIR)
+
+install: install_initcpio
+
+.PHONY: install

initcpio/hooks/artix

@@ -32,6 +32,10 @@ _mnt_dmsnapshot() {
 
     dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
 
+    if [[ "${cow_persistent}" != "P" ]]; then
+        rm -f "/run/artix/cowspace/${cow_directory}/${img_name}.cow"
+    fi
+
     _mnt_dev "/dev/mapper/${dm_snap_name}" "${mnt}" "-w" "defaults"
     echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/artix/used_block_devices
 }
@@ -102,7 +106,7 @@ _mnt_dev() {
 _verify_checksum() {
     local _status
     cd "/run/artix/bootmnt/${artixbasedir}/${arch}"
-    md5sum -c $1.md5 > /tmp/checksum.log 2>&1
+    sha512sum -c $1.sha512 > /tmp/checksum.log 2>&1
     _status=$?
     cd "${OLDPWD}"
     return ${_status}
@@ -120,7 +124,7 @@ _verify_signature() {
 run_hook() {
     [[ -z "${arch}" ]] && arch="$(uname -m)"
     [[ -z "${copytoram_size}" ]] && copytoram_size="75%"
-    [[ -z "${artixbasedir}" ]] && artixbasedir="cromnix"
+    [[ -z "${artixbasedir}" ]] && artixbasedir="artix"
 
     [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
     [[ -z "${artixdevice}" ]] && artixdevice="/dev/disk/by-label/${artixlabel}"
@@ -160,7 +164,7 @@ artix_mount_handler() {
     if [[ "${checksum}" == "y" ]]; then
         for fs in rootfs desktopfs livefs;do
             if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sfs" ]]; then
-                if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.md5" ]]; then
+                if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sha512" ]]; then
                     msg -n ":: Self-test requested, please wait..."
                     if _verify_checksum "${fs}"; then
                         msg "done. Checksum is OK, continue booting."
@@ -170,7 +174,7 @@ artix_mount_handler() {
                         launch_interactive_shell
                     fi
                 else
-                    echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.md5 not found"
+                    echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.sha512 not found"
                     launch_interactive_shell
                 fi
             fi

initcpio/hooks/miso

@@ -1,245 +0,0 @@
-# args: source, newroot, mountpoint
-_mnt_dmsnapshot() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}";
-    local img_name="${img_fullname%%.*}"
-    local dm_snap_name="${dm_snap_prefix}_${img_name}"
-    local ro_dev ro_dev_size rw_dev
-
-    ro_dev=$(losetup --find --show --read-only "${img}")
-    echo ${ro_dev} >> /run/miso/used_block_devices
-    ro_dev_size=$(blockdev --getsz ${ro_dev})
-
-    if [[ "${cow_persistent}" == "P" ]]; then
-        if [[ -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '/run/miso/cowspace/${cow_directory}/${img_name}.cow', using as persistent."
-        else
-            msg ":: Creating '/run/miso/cowspace/${cow_directory}/${img_name}.cow' as persistent."
-            truncate -s "${cow_spacesize}" "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
-        fi
-    else
-        if [[ -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '/run/miso/cowspace/${cow_directory}/${img_name}.cow' but non-persistent requested, removing."
-            rm -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
-        fi
-        msg ":: Creating '/run/miso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent."
-        truncate -s "${cow_spacesize}" "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
-    fi
-
-    rw_dev=$(losetup --find --show "/run/miso/cowspace/${cow_directory}/${img_name}.cow")
-    echo ${rw_dev} >> /run/miso/used_block_devices
-
-    dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
-
-    _mnt_dev "/dev/mapper/${dm_snap_name}" "${mnt}" "-w" "defaults"
-    echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/miso/used_block_devices
-}
-
-# args: source, newroot, mountpoint
-_mnt_overlayfs() {
-    local src="${1}"
-    local newroot="${2}"
-    local mnt="${3}"
-    local work_dir="/run/miso/overlay_root/work"
-    local upper_dir="/run/miso/overlay_root/upper"
-
-    mkdir -p "${upper_dir}" "${work_dir}"
-
-    mount -t overlay overlay -o lowerdir="${src}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
-}
-
-# args: /path/to/image_file, mountpoint
-_mnt_sfs() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}"
-    local sfs_dev
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg -n ":: Copying squashfs image to RAM..."
-        if ! cp "${img}" "/run/miso/copytoram/${img_fullname}" ; then
-            echo "ERROR: while copy '${img}' to '/run/miso/copytoram/${img_fullname}'"
-            launch_interactive_shell
-        fi
-        img="/run/miso/copytoram/${img_fullname}"
-        msg "done."
-    fi
-    sfs_dev=$(losetup --find --show --read-only "${img}")
-    echo ${sfs_dev} >> /run/miso/used_block_devices
-    _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
-}
-
-# args: device, mountpoint, flags, opts
-_mnt_dev() {
-    local dev="${1}"
-    local mnt="${2}"
-    local flg="${3}"
-    local opts="${4}"
-
-    mkdir -p "${mnt}"
-
-    msg ":: Mounting '${dev}' to '${mnt}'"
-
-    while ! poll_device "${dev}" 30; do
-        echo "ERROR: '${dev}' device did not show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
-        msg ":: Device '${dev}' mounted successfully."
-    else
-        echo "ERROR; Failed to mount '${dev}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-_verify_checksum() {
-    local _status
-    cd "/run/miso/bootmnt/${misobasedir}/${arch}"
-    md5sum -c $1.md5 > /tmp/checksum.log 2>&1
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-_verify_signature() {
-    local _status
-    cd "/run/miso/bootmnt/${misobasedir}/${arch}"
-    gpg --homedir /gpg --status-fd 1 --verify $1.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-run_hook() {
-    [[ -z "${arch}" ]] && arch="$(uname -m)"
-    [[ -z "${copytoram_size}" ]] && copytoram_size="75%"
-    [[ -z "${misobasedir}" ]] && misobasedir="cromnix"
-
-    [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
-    [[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}"
-    [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"
-    [[ -z "${overlay_root_size}" ]] && overlay_root_size="75%"
-
-    if [[ -n "${cow_label}" ]]; then
-        cow_device="/dev/disk/by-label/${cow_label}"
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    elif [[ -n "${cow_device}" ]]; then
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    else
-        cow_persistent="N"
-    fi
-
-    [[ -z "${cow_flags}" ]] && cow_flags="defaults"
-    [[ -z "${cow_directory}" ]] && cow_directory="persistent_${misolabel}/${arch}"
-    [[ -z "${cow_chunksize}" ]] && cow_chunksize="8"
-
-    # set mount handler for miso
-    mount_handler="miso_mount_handler"
-}
-
-# This function is called normally from init script, but it can be called
-# as chain from other mount handlers.
-# args: /path/to/newroot
-miso_mount_handler() {
-    local newroot="${1}"
-
-    if ! mountpoint -q "/run/miso/bootmnt"; then
-        _mnt_dev "${misodevice}" "/run/miso/bootmnt" "-r" "defaults"
-        if [[ "${copytoram}" != "y" ]]; then
-            echo $(readlink -f ${misodevice}) >> /run/miso/used_block_devices
-        fi
-    fi
-
-    if [[ "${checksum}" == "y" ]]; then
-        for fs in rootfs desktopfs livefs;do
-            if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then
-                if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.md5" ]]; then
-                    msg -n ":: Self-test requested, please wait..."
-                    if _verify_checksum "${fs}"; then
-                        msg "done. Checksum is OK, continue booting."
-                    else
-                        echo "ERROR: one or more files are corrupted"
-                        echo "see /tmp/checksum.log for details"
-                        launch_interactive_shell
-                    fi
-                else
-                    echo "ERROR: checksum=y option specified but ${misobasedir}/${arch}/${fs}.md5 not found"
-                    launch_interactive_shell
-                fi
-            fi
-        done
-    fi
-
-    if [[ "${verify}" == "y" ]]; then
-        for fs in rootfs desktopfs livefs;do
-            if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then
-                if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs.sig" ]]; then
-                    msg -n ":: Signature verification requested, please wait..."
-                    if _verify_signature "${fs}"; then
-                        msg "done. Signature is OK, continue booting."
-                    else
-                        echo "ERROR: one or more files are corrupted"
-                        launch_interactive_shell
-                    fi
-                else
-                    echo "ERROR: verify=y option specified but ${misobasedir}/${arch}/${fs}.sfs.sig not found"
-                    launch_interactive_shell
-                fi
-            fi
-        done
-    fi
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Mounting /run/miso/copytoram (tmpfs) filesystem, size=${copytoram_size}"
-        mkdir -p /run/miso/copytoram
-        mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /run/miso/copytoram
-    fi
-
-    if [[ -n "${cow_device}" ]]; then
-        _mnt_dev "${cow_device}" "/run/miso/cowspace" "-r" "${cow_flags}"
-        echo $(readlink -f ${cow_device}) >> /run/miso/used_block_devices
-        mount -o remount,rw "/run/miso/cowspace"
-    else
-        msg ":: Mounting /run/miso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..."
-        mkdir -p /run/miso/cowspace
-        mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace /run/miso/cowspace
-    fi
-    mkdir -p -m 0700 "/run/miso/cowspace/${cow_directory}"
-
-    msg -n ":: Mounting overlay root (tmpfs) filesystem, size=${overlay_root_size}..."
-    mkdir -p /run/miso/overlay_root
-    mount -t tmpfs -o "size=${overlay_root_size}",mode=0755 overlay_root /run/miso/overlay_root
-
-    local src="/run/miso/bootmnt/${misobasedir}/${arch}"
-    local dest_sfs="/run/miso/sfs" dest_img="/run/miso/img"
-    local lower_dir
-
-    for sfs in livefs desktopfs rootfs;do
-        if [[ -f "${src}/${sfs}.sfs" ]]; then
-            _mnt_sfs "${src}/${sfs}.sfs" "${dest_sfs}/${sfs}"
-            if [[ -f "${dest_sfs}/${sfs}/${sfs}.img" ]]; then
-                mkdir -p ${dest_img}
-                lower_dir=${lower_dir:-}${lower_dir:+:}"${dest_img}/${sfs}"
-                _mnt_dmsnapshot "${dest_sfs}/${sfs}/${sfs}.img" "${dest_img}/${sfs}"
-            else
-                lower_dir=${lower_dir:-}${lower_dir:+:}"${dest_sfs}/${sfs}"
-            fi
-        fi
-    done
-
-    _mnt_overlayfs "${lower_dir}" "${newroot}" "/"
-
-    if [[ "${copytoram}" == "y" ]]; then
-        umount -d /run/miso/bootmnt
-        mkdir -p /run/miso/bootmnt/${misobasedir}/${arch}
-        mount -o bind /run/miso/copytoram /run/miso/bootmnt/${misobasedir}/${arch}
-    fi
-}
-
-# vim:ft=sh:ts=4:sw=4:et:

initcpio/hooks/miso_loop_mnt

@@ -1,35 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}"
-    [[ -z "${img_flags}" ]] && img_flags="defaults"
-    if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then
-        mount_handler="miso_loop_mount_handler"
-    fi
-}
-
-miso_loop_mount_handler () {
-    newroot="${1}"
-
-    local _dev_loop
-
-    msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
-    _mnt_dev "${img_dev}" "/run/miso/img_dev" "-r" "${img_flags}"
-    if [[ "${copytoram}" != "y" ]]; then
-        echo $(readlink -f ${img_dev}) >> /run/miso/used_block_devices
-    fi
-
-    if _dev_loop=$(losetup --find --show --read-only "/run/miso/img_dev/${img_loop}"); then
-        misodevice="${_dev_loop}"
-    else
-        echo "ERROR: Setting loopback device for file '/run/miso/img_dev/${img_loop}'"
-        launch_interactive_shell
-    fi
-
-    miso_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        losetup -d ${_dev_loop} 2>/dev/null
-        umount /run/miso/img_dev
-    fi
-}

initcpio/hooks/miso_pxe_common

@@ -1,72 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    # Do *not* declare 'bootif_dev' local! We need it in run_latehook().
-    local i net_mac bootif_mac
-    # These variables will be parsed from /tmp/net-*.conf generated by ipconfig
-    local DEVICE
-    local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
-    local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH
-    local filename
-    # /tmp/net-*.conf
-
-    if [[ -n "${ip}" ]]; then
-        if [[ -n "${BOOTIF}" ]]; then
-            bootif_mac=${BOOTIF#01-}
-            bootif_mac=${bootif_mac//-/:}
-            for i in /sys/class/net/*/address; do
-                read net_mac < ${i}
-                if [[ "${bootif_mac}" == "${net_mac}" ]]; then
-                    bootif_dev=${i#/sys/class/net/}
-                    bootif_dev=${bootif_dev%/address}
-                    break
-                fi
-            done
-            if [[ "${ip}" == "dhcp" ]]; then
-               ip=":::::${bootif_dev}:dhcp"
-            else
-               ip="${ip}::${bootif_dev}"
-           fi
-        fi
-
-        # setup network and save some values
-        if ! ipconfig -t 20 "ip=${ip}"; then
-                echo "ERROR; Failed to configure network"
-                echo "   Falling back to interactive prompt"
-                echo "   You can try to fix the problem manually, log out when you are finished"
-                launch_interactive_shell
-        fi
-
-        . /tmp/net-*.conf
-
-        pxeserver=${ROOTSERVER}
-
-        # setup DNS resolver
-        if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then
-            echo "# added by miso_pxe_common hook" > /etc/resolv.conf
-            echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf
-        fi
-        if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then
-            echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf
-        fi
-        if [[ -n "${DNSDOMAIN}" ]]; then
-            echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
-            echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf
-        fi
-    fi
-}
-
-run_latehook () {
-    if [[ -n "${ip}" ]]; then
-        [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
-
-        if [[ "${copytoram}" == "y" ]]; then
-            if [[ -n "${bootif_dev}" ]]; then
-                ip addr flush dev "${bootif_dev}"
-                ip link set "${bootif_dev}" down
-            fi
-        elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
-            cp /etc/resolv.conf /new_root/etc/resolv.conf
-        fi
-    fi
-}

initcpio/hooks/miso_pxe_http

@@ -1,59 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${miso_http_srv}" ]]; then
-
-        # booting with http is always copy-to-ram, so set here to make sure
-        # addresses are flushed and interface is set down
-        copytoram="y"
-
-        miso_http_srv=$(eval echo ${miso_http_srv})
-        [[ -z "${miso_http_spc}" ]] && miso_http_spc="75%"
-
-        mount_handler="miso_pxe_http_mount_handler"
-    fi
-}
-
-# Fetch a file with CURL
-#
-# $1 URL
-# $2 Destination directory inside httpspace/${misobasedir}
-_curl_get() {
-    local _url="${1}"
-    local _dst="${2}"
-
-    msg ":: Downloading '${_url}'"
-    if ! curl -L -f -o "/run/miso/httpspace/${misobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
-        echo "ERROR: Downloading '${_url}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-miso_pxe_http_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Mounting /run/miso/httpspace (tmpfs) filesystem, size='${miso_http_spc}'"
-    mkdir -p "/run/miso/httpspace"
-    mount -t tmpfs -o size="${miso_http_spc}",mode=0755 httpspace "/run/miso/httpspace"
-
-    local _src=${miso_http_srv}${misobasedir}/${arch}
-
-    for sfs in livefs desktopfs rootfs;do
-        if [[ ! -z "$( curl -s --head "${_src}/${sfs}.sfs" | grep "OK" )" ]]; then
-            _curl_get "${_src}/${sfs}.sfs" "/${arch}"
-
-            if [[ "${checksum}" == "y" ]]; then
-                _curl_get "${_src}/${sfs}.md5" "/${arch}"
-            fi
-            if [[ "${verify}" == "y" ]]; then
-                _curl_get "${_src}/${sfs}.sfs.sig" "/${arch}"
-            fi
-        fi
-    done
-    mkdir -p "/run/miso/bootmnt"
-    mount -o bind /run/miso/httpspace /run/miso/bootmnt
-
-    miso_mount_handler ${newroot}
-}

initcpio/hooks/miso_pxe_nbd

@@ -1,47 +0,0 @@
-# vim: set ft=sh:
-
-run_earlyhook() {
-    if [[ -n "${ip}" && -n "${miso_nbd_srv}" ]]; then
-        # Module autoloading like with loop devices does not work, doing manually...
-        modprobe nbd 2> /dev/null
-    fi
-}
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${miso_nbd_srv}" ]]; then
-
-        miso_nbd_srv=$(eval echo ${miso_nbd_srv})
-        [[ -z "${miso_nbd_name}" ]] && miso_nbd_name="miso"
-
-        mount_handler="miso_pxe_nbd_mount_handler"
-    fi
-}
-
-miso_pxe_nbd_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Waiting for boot device..."
-    while ! poll_device /dev/nbd0 30; do
-        echo "ERROR: boot device didn't show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    msg ":: Setup NBD from ${miso_nbd_srv} at /dev/nbd0"
-    if [[ "${copytoram}" != "n" ]]; then
-        nbd-client ${miso_nbd_srv} -N ${miso_nbd_name} /dev/nbd0
-        copytoram="y"
-    else
-        nbd-client ${miso_nbd_srv} -N ${miso_nbd_name} -persist /dev/nbd0
-    fi
-
-    misodevice=/dev/nbd0
-
-    miso_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Disconnect NBD from ${miso_nbd_srv} at /dev/nbd0"
-        nbd-client -d /dev/nbd0
-    fi
-}

initcpio/hooks/miso_pxe_nfs

@@ -1,30 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${miso_nfs_srv}" ]]; then
-
-        miso_nfs_srv=$(eval echo ${miso_nfs_srv})
-        [[ -n "${miso_nfs_opt}" ]] && miso_nfs_opt="-o ${miso_nfs_opt}"
-
-        mount_handler="miso_nfs_mount_handler"
-    fi
-}
-
-miso_nfs_mount_handler() {
-    newroot="${1}"
-    mkdir -p "/run/miso/bootmnt"
-    msg ":: Mounting '${miso_nfs_srv}'"
-    # Do not put "${miso_nfs_opt}" nfsmount fails!
-    if ! nfsmount ${miso_nfs_opt} "${miso_nfs_srv}" "/run/miso/bootmnt"; then
-        echo "ERROR: Mounting '${miso_nfs_srv}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-
-    if [[ "${copytoram}" != "n" ]]; then
-        copytoram="y"
-    fi
-
-    miso_mount_handler ${newroot}
-}

initcpio/hooks/miso_shutdown

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

initcpio/install/artix_kms

@@ -7,16 +7,6 @@ build() {
     add_module "via-agp"
     add_module "sis-agp"
     add_module "intel-agp"
-
-    if [[ $(uname -m) == i686 ]]; then
-        add_module "amd64-agp"
-        add_module "ati-agp"
-        add_module "sworks-agp"
-        add_module "ali-agp"
-        add_module "amd-k7-agp"
-        add_module "nvidia-agp"
-        add_module "efficeon-agp"
-    fi
 }
 
 help() {

initcpio/install/miso

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "cdrom"
-    add_module "loop"
-    add_module "dm-snapshot"
-    add_module "overlay"
-
-    add_runscript
-
-    add_binary /usr/lib/udev/cdrom_id
-    add_binary blockdev
-    add_binary dmsetup
-    add_binary losetup
-    add_binary mountpoint
-    add_binary truncate
-    add_binary gpg
-    add_binary grep
-
-    add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
-    add_file /usr/lib/udev/rules.d/10-dm.rules
-    add_file /usr/lib/udev/rules.d/95-dm-notify.rules
-    add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
-    if [[ $MISO_GNUPG_FD ]]; then
-        mkdir -p "$BUILDROOT$dest"/gpg
-        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$MISO_GNUPG_FD
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_kms

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "radeon"
-    add_module "nouveau"
-    add_module "i915"
-    add_module "via-agp"
-    add_module "sis-agp"
-    add_module "intel-agp"
-
-    if [[ $(uname -m) == i686 ]]; then
-        add_module "amd64-agp"
-        add_module "ati-agp"
-        add_module "sworks-agp"
-        add_module "ali-agp"
-        add_module "amd-k7-agp"
-        add_module "nvidia-agp"
-        add_module "efficeon-agp"
-    fi
-}
-
-help() {
-    cat << HELPEOF
-Adds all common KMS drivers to the initramfs image.
-HELPEOF
-}

initcpio/install/miso_loop_mnt

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via loop device.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_common

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig
-
-    # Add hosts support files+dns
-    add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_files.so.2)
-    add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_dns.so.2)
-
-    add_dir /etc
-    echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_http

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-
-    add_binary curl
-
-    add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and HTTP.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_nbd

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nbd"
-
-    add_runscript
-
-    add_binary nbd-client
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NBD.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_nfs

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nfs"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/nfsmount /bin/nfsmount
-}
-
-help() {
-    cat <<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NFS.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_shutdown

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary cp
-
-    add_runscript
-
-    add_file /etc/initcpio/miso_shutdown /shutdown
-}
-
-help() {
-    cat <<HELPEOF
-This hook will create a shutdown initramfs in /run/initramfs
-that we can pivot to on shutdown in order to unmount / and
-and others mount points, dm-snapshot devices and loopback devices.
-Mostly usefull for dm-snapshot persistent.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/script/miso_shutdown

@@ -1,38 +0,0 @@
-#!/bin/ash
-
-# /oldroot depends on things inside /oldroot/run/miso...
-mkdir /oldrun
-mount -n --move /oldroot/run /oldrun
-
-# Unmount all mounts now.
-#umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)
-umount $(mount | awk '$3 ~/^\/oldroot/ {if($3 != "/run/miso/bootmnt") print $3}' | sort -r)
-
-# Remove all dm-snapshot devices.
-dmsetup remove_all
-
-# Remove all loopback devices.
-for _lup in $(grep ^/dev/loop /oldrun/miso/used_block_devices | tac); do
-    if ! losetup -d ${_lup} 2> /dev/null; then
-        umount -d ${_lup}
-    fi
-done
-
-# Unmount the space used to store *.cow.
-umount /oldrun/miso/cowspace
-
-# Unmount boot device if needed (no copytoram=y used)
-if [[ ! -d /oldrun/miso/copytoram ]]; then
-    if [[ -d /oldrun/miso/img_dev ]]; then
-        umount /oldrun/miso/img_dev
-    else
-        umount /oldrun/miso/bootmnt
-    fi
-fi
-
-# reboot / poweroff / halt, depending on the argument passed by init
-# if something invalid is passed, we halt
-case "$1" in
-  reboot|poweroff|halt) "$1" -f ;;
-  *) halt -f;;
-esac

lib/base/chroot.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+is_btrfs() {
+    [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
+}
+
+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 "$1")" ]]
+}
+
+subvolume_delete_recursive() {
+    local subvol
+
+    is_subvolume "$1" || return 0
+
+    while IFS= read -d $'\0' -r subvol; do
+        if ! subvolume_delete_recursive "$subvol"; then
+            return 1
+        fi
+    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
+}
+
+# $1: chroot
+kill_chroot_process(){
+    local prefix="$1" flink pid name
+    for root_dir in /proc/*/root; do
+        flink=$(readlink $root_dir)
+        if [ "x$flink" != "x" ]; then
+            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
+                # this process is in the chroot...
+                pid=$(basename $(dirname "$root_dir"))
+                name=$(ps -p $pid -o comm=)
+                info "Killing chroot process: %s (%s)" "$name" "$pid"
+                kill -9 "$pid"
+            fi
+        fi
+    done
+}

lib/base/fstab.sh

@@ -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,10 @@
 declare -A pseudofs_types=([anon_inodefs]=1
                         [autofs]=1
                         [bdev]=1
+                        [bpf]=1
                         [binfmt_misc]=1
                         [cgroup]=1
+                        [cgroup2]=1
                         [configfs]=1
                         [cpuset]=1
                         [debugfs]=1
@@ -20,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
@@ -72,7 +79,7 @@ valid_number_of_base() {
 mangle() {
     local i= chr= out=
 
-    unset {a..f} {A..F}
+    local {a..f}= {A..F}=
 
     for (( i = 0; i < ${#1}; i++ )); do
         chr=${1:i:1}
@@ -91,7 +98,7 @@ mangle() {
 unmangle() {
     local i= chr= out= len=$(( ${#1} - 4 ))
 
-    unset {a..f} {A..F}
+    local {a..f}= {A..F}=
 
     for (( i = 0; i < len; i++ )); do
         chr=${1:i: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.
@@ -8,61 +12,20 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-export LC_MESSAGES=C
+# export LC_MESSAGES=C
 export LANG=C
 
-declare ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
-
 if [[ -t 2 ]]; then
-    # prefer terminal safe colored and bold text when tput is supported
-    if tput setaf 0 &>/dev/null; then
-        ALL_OFF="$(tput sgr0)"
-        BOLD="$(tput bold)"
-        RED="${BOLD}$(tput setaf 1)"
-        GREEN="${BOLD}$(tput setaf 2)"
-        YELLOW="${BOLD}$(tput setaf 3)"
-        BLUE="${BOLD}$(tput setaf 4)"
-    else
-        ALL_OFF="\e[0m"
-        BOLD="\e[1m"
-        RED="${BOLD}\e[31m"
-        GREEN="${BOLD}\e[32m"
-        YELLOW="${BOLD}\e[33m"
-        BLUE="${BOLD}\e[34m"
-    fi
+    colorize
+else
+    declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-
-plain() {
-    local mesg=$1; shift
-    printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg() {
-    local mesg=$1; shift
-    printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg2() {
-    local mesg=$1; shift
-    printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
 
 info() {
     local mesg=$1; shift
     printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-warning() {
-    local mesg=$1; shift
-    printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
-    local mesg=$1; shift
-    printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
 stat_busy() {
     local mesg=$1; shift
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
@@ -101,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() {
@@ -115,10 +100,28 @@ die() {
     cleanup 255
 }
 
-import(){
-    if [[ -r "$1" ]];then
-        source "$1"
-    else
-        die 'Could not import %s' "$1"
-    fi
+msg_table_header(){
+    local mesg=$1; shift
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_downgrade(){
+    local mesg=$1; shift
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_notify(){
+    local mesg=$1; shift
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row(){
+    local mesg=$1; shift
+#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_upgrade(){
+    local mesg=$1; shift
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
 }

lib/base/mount.sh

@@ -0,0 +1,148 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+ignore_error() {
+    "$@" 2>/dev/null
+    return 0
+}
+
+parse_fstab(){
+    echo $(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' $1/etc/fstab)
+# 	perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^/dev#;' $1/etc/fstab
+# 	perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^LABEL=#;' $1/etc/fstab
+}
+
+detect(){
+    local detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
+    echo ${detected}
+}
+
+# $1: os-prober array
+get_os_name(){
+    local str=$1
+    str="${str#*:}"
+    str="${str#*:}"
+    str="${str%:*}"
+    echo "$str"
+}
+
+chroot_part_mount() {
+    info "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
+}
+
+trap_setup(){
+    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
+    trap "$1" EXIT
+}
+
+chroot_mount() {
+#     info "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
+}
+
+chroot_add_resolv_conf() {
+    local chrootdir=$1 resolv_conf=$1/etc/resolv.conf
+
+    [[ -e /etc/resolv.conf ]] || return 0
+
+    # Handle resolv.conf as a symlink to somewhere else.
+    if [[ -L $chrootdir/etc/resolv.conf ]]; then
+        # readlink(1) should always give us *something* since we know at this point
+        # it's a symlink. For simplicity, ignore the case of nested symlinks.
+        resolv_conf=$(readlink "$chrootdir/etc/resolv.conf")
+        if [[ $resolv_conf = /* ]]; then
+            resolv_conf=$chrootdir$resolv_conf
+        else
+            resolv_conf=$chrootdir/etc/$resolv_conf
+        fi
+
+        # ensure file exists to bind mount over
+        if [[ ! -f $resolv_conf ]]; then
+            install -Dm644 /dev/null "$resolv_conf" || return 1
+        fi
+    elif [[ ! -e $chrootdir/etc/resolv.conf ]]; then
+        # The chroot might not have a resolv.conf.
+        return 0
+    fi
+
+    chroot_mount /etc/resolv.conf "$resolv_conf" --bind
+}
+
+chroot_mount_conditional() {
+    local cond=$1; shift
+    if eval "$cond"; then
+        chroot_mount "$@"
+    fi
+}
+
+chroot_setup(){
+    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(){
+    CHROOT_ACTIVE_PART_MOUNTS=()
+    CHROOT_ACTIVE_MOUNTS=()
+
+    trap_setup chroot_part_umount
+
+    chroot_part_mount "$2" "$1"
+
+    local mounts=$(parse_fstab "$1")
+
+    for entry in ${mounts[@]}; do
+        entry=${entry//UUID=}
+        local dev=${entry%:*} mp=${entry#*:}
+        case "${entry#*:}" in
+            '/'|'swap'|'none') continue ;;
+            *) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
+        esac
+    done
+
+    chroot_setup "$1" true
+    chroot_add_resolv_conf "$1"
+}
+
+chroot_api_mount() {
+    CHROOT_ACTIVE_MOUNTS=()
+    trap_setup chroot_api_umount
+    chroot_setup "$1" false
+}
+
+chroot_api_umount() {
+    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,182 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+get_timer(){
+    echo $(date +%s)
+}
+
+# $1: start timer
+elapsed_time(){
+    echo $(echo $1 $(get_timer) | awk '{ printf "%0.2f",($2-$1)/60 }')
+}
+
+show_elapsed_time(){
+    info "Time %s: %s minutes" "$1" "$(elapsed_time $2)"
+}
+
+load_vars() {
+    local var
+
+    [[ -f $1 ]] || return 1
+
+    for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER CARCH GPGKEY; do
+        [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$1")"
+    done
+
+    return 0
+}
+
+prepare_dir(){
+    [[ ! -d $1 ]] && mkdir -p $1
+}
+
+get_disturl(){
+    . /usr/lib/os-release
+    echo "${HOME_URL}"
+}
+
+get_osname(){
+    . /usr/lib/os-release
+    echo "${NAME}"
+}
+
+init_artools_base(){
+
+    ARCH=$(uname -m)
+
+    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
+
+    WORKSPACE_DIR=${WORKSPACE_DIR:-"/home/${OWNER}/artools-workspace"}
+
+    prepare_dir "${WORKSPACE_DIR}"
+}
+
+init_artools_pkg(){
+
+    DOMAIN='artixlinux.org'
+
+    GIT_DOMAIN="gitea.${DOMAIN}"
+
+    GIT_URL="https://${GIT_DOMAIN}"
+
+    GIT_TOKEN=${GIT_TOKEN:-''}
+
+    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
+
+    [[ -z ${TREE_NAMES_ARTIX[@]} ]] && \
+    TREE_NAMES_ARTIX=(
+        packages
+        community
+        packages-kernel
+        packages-openrc
+        packages-runit
+        packages-xorg
+        packages-python
+        packages-perl
+        packages-qt5
+        packages-ruby
+#         packages-desktop
+#         packages-kde
+#         packages-gnome
+    )
+
+    HOST_TREE_ARTIX=${HOST_TREE_ARTIX:-"gitea@${GIT_DOMAIN}:artixlinux"}
+
+    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
+
+    TREE_NAMES_ARCH=(packages community)
+
+    HOST_TREE_ARCH=${HOST_TREE_ARCH:-'git://git.archlinux.org/svntogit'}
+
+    CHROOTS_PKG="${CHROOTS_DIR}/buildpkg"
+
+    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
+}
+
+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}"
+}
+
+# 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,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.
+
+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}"
+}
+
+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
+        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(){
@@ -19,36 +22,50 @@ prepare_initcpio(){
 
 prepare_initramfs(){
     local mnt="$1"
-    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${os_id}.conf
-    if [[ -n ${gpgkey} ]]; then
-        user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
-        exec 17<>${AT_USERCONFDIR}/gpgkey
+    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-artix.conf
+
+    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 ${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-${os_id}.conf \
+        -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"
-#     cp $src/boot/intel-ucode.img $dest/intel_ucode.img
-#     cp $src/usr/share/licenses/intel-ucode/LICENSE $dest/intel_ucode.LICENSE
+
+    for u in intel amd;do
+        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+    done
+
     cp $src/boot/memtest86+/memtest.bin $dest/memtest
     cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
 }
 
+configure_grub(){
+    local conf="$1/boot/grub/kernels.cfg"
+    sed -e "s|@iso_label@|${iso_label}|" -i $conf
+}
+
 prepare_grub(){
     local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
-        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
+        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub
 
     prepare_dir ${grub}/${platform}
 
@@ -62,16 +79,8 @@ prepare_grub(){
 
     cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
 
-    case ${target_arch} in
-        'i686')
-            platform=i386-efi
-            img=bootia32.efi
-        ;;
-        'x86_64')
-            platform=x86_64-efi
-            img=bootx64.efi
-        ;;
-    esac
+    platform=x86_64-efi
+    img=bootx64.efi
 
     prepare_dir ${efi}
     prepare_dir ${grub}/${platform}
@@ -83,10 +92,17 @@ prepare_grub(){
     grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
 
     prepare_dir ${grub}/themes
-    cp -r ${theme}/themes/${os_id} ${grub}/themes/
-    cp ${data}/unicode.pf2 ${grub}
+    cp -r ${theme}/themes/artix ${grub}/themes/
     cp -r ${theme}/{locales,tz} ${grub}
 
+    if [[ -f /usr/share/grub/unicode.pf2 ]];then
+        msg2 "Copying %s ..." "unicode.pf2"
+        cp /usr/share/grub/unicode.pf2 ${grub}/unicode.pf2
+    else
+        msg2 "Creating %s ..." "unicode.pf2"
+        grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+    fi
+
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${efi_img}"

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

@@ -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.
@@ -34,7 +37,7 @@ track_fs() {
     mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
 }
 
-mount_fs(){
+mount_overlay(){
     FS_ACTIVE_MOUNTS=()
     local lower= upper="$1" work="$2" pkglist="$3"
     local fs=${upper##*/}
@@ -55,7 +58,7 @@ mount_fs(){
     track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
 }
 
-umount_fs(){
+umount_overlay(){
     if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
         info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
         umount "${FS_ACTIVE_MOUNTS[@]}"

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,cdrom,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,162 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+get_local_head(){
+    echo $(git log --pretty=%H ...refs/heads/master^ | head -n 1)
+}
+
+get_remote_head(){
+    echo $(git ls-remote origin -h refs/heads/master | cut -f1)
+}
+
+get_pkg_org(){
+    local pkg="$1" org= sub=
+    case ${pkg} in
+        ruby-*) org=${pkg:0:6}; sub="${org:5}"; echo "packagesRuby" ;;
+        perl-*) org=${pkg:0:6}; sub="${org:5}"; echo "packagesPerl" ;;
+        python-*) org=${pkg:0:8}; sub="${org:7}"; echo "packagesPython" ;;
+        python2-*) org=${pkg:0:9}; sub="${org:8}"; echo "packagesPython" ;;
+        lib32*) org=${pkg:0:7}; sub="${org:6}"; echo "packagesL" ;; #"packages${sub^^}" ;;
+#         lib*) org=${pkg:0:4}; sub="${org:3}"; echo "packagesLib${sub^^}" ;;
+        *) org=${pkg:0:1}; echo "packages${org^^}" ;;
+    esac
+}
+
+subrepo_push(){
+    local pkg="$1"
+    msg2 "Push (%s)" "$pkg"
+    git subrepo push "$pkg"
+}
+
+subrepo_clean(){
+    local pkg="$1"
+    msg2 "Clean (%s)" "$pkg"
+    git subrepo clean "$pkg"
+}
+
+subrepo_pull(){
+    local pkg="$1"
+    msg2 "Pull (%s)" "$pkg"
+    git subrepo pull "$pkg"
+}
+
+subrepo_clone(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    msg2 "Clone [%s] from (%s)" "$pkg" "$org/$gitname"
+    git subrepo clone gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git "$pkg"
+}
+
+clone_tree(){
+    local timer=$(get_timer) url="$1" tree="$2" os="${3:-$(get_osname)}"
+
+    msg "Cloning (%s) ..." "$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,202 @@
+#!/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
+}
+
+find_tree(){
+    local tree="$1" pkg="$2"
+    local result=$(find $tree -mindepth 2 -maxdepth 2 -type d -name "$pkg")
+    result=${result%/*}
+    echo ${result##*/}
+}
+
+find_repo(){
+    local pkg="$1" stag="$2" unst="$3" repo=
+    local repos=(core extra testing community community-testing multilib multilib-testing)
+
+    $stag && repos+=(staging community-staging multilib-staging)
+    $unst && repos+=(gnome-unstable kde-unstable)
+
+    for r in ${repos[@]};do
+        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
+    done
+    echo $repo
+}
+
+get_cases(){
+    local pkglist="${DATADIR}/pkglists/$1.list"
+    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
+
+    local pkgs=($(sed "$_com_rm" "$pkglist" | sed "$_space" | sed "$_clean"))
+
+    local cases=
+    for p in ${pkgs[@]};do
+        cases=${p:+}${p:-|}${p}
+    done
+    echo $cases
+}
+
+get_artix_tree(){
+    local pkg="$1" artix_tree="${2:-$3}" tree
+    case $pkg in
+        $(get_cases kernel)) tree=packages-kernel ;;
+        python-*|python2-*) tree=packages-python ;;
+        perl-*) tree=packages-perl ;;
+        ruby-*) tree=packages-ruby ;;
+        xorg*|xf86*|$(get_cases xorg)) tree=packages-xorg ;;
+        *-openrc) tree=packages-openrc ;;
+        *-runit) tree=packages-runit ;;
+        qt5-*) tree=packages-qt5 ;;
+        lxqt*|$(get_cases lxqt)) tree=packages-lxqt ;;
+#         $(get_cases freedesktop)) tree=packages-desktop ;;
+#         $(get_cases kde)) tree=packages-kde ;;
+#         $(get_cases gnome)) tree=packages-gnome ;;
+        *) 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 ]] && 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
+}
+
+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_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

@@ -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,22 +12,14 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+CHROOTVERSION=@chroot_version@
 
-LIBDIR='@libdir@'
+. @datadir@/makepkg/util.sh
 
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
+DATADIR=${DATADIR:-'@datadir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 
-load_user_info
-
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-load_vars /etc/makepkg.conf
-
-if [ ! -e "$1" ]; then
-    error "%s does not exist!" "$1"
-    exit 1
-fi
-
-msg2 "Signing [%s] with key %s" "${1##*/}" "${GPGKEY}..."
-gpg --detach-sign --use-agent -u "${GPGKEY}" "$1"
+for baselib in ${LIBDIR}/base/*.sh; do
+    . $baselib
+done

lib/util-chroot.sh

@@ -1,119 +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.
-
-copy_mirrorlist(){
-    cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
-}
-
-copy_keyring(){
-    if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $1/etc/pacman.d/gnupg ]]; then
-        cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d/"
-    fi
-}
-
-create_min_fs(){
-    msg "Creating install root at %s" "$1"
-    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}
-}
-
-is_btrfs() {
-	[[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
-}
-
-subvolume_delete_recursive() {
-    local subvol
-
-    is_btrfs "$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"
-            return 1
-        fi
-    done < <(find "$1" -xdev -depth -inum 256 -print0)
-
-    return 0
-}
-
-default_locale(){
-    local action="$1" mnt="$2"
-    if [[ $action == "set" ]];then
-        if [[ ! -f "$mnt/etc/locale.gen.bak" ]];then
-            info "Setting locale ..."
-            mv "$mnt/etc/locale.gen" "$mnt/etc/locale.gen.bak"
-            printf '%s.UTF-8 UTF-8\n' en_US > "$mnt/etc/locale.gen"
-            printf 'LANG=%s.UTF-8\n' en_US > "$mnt/etc/locale.conf"
-            printf 'LC_MESSAGES=C\n' >> "$mnt/etc/locale.conf"
-        fi
-    elif [[ $action == "reset" ]];then
-        if [[ -f "$mnt/etc/locale.gen.bak" ]];then
-            info "Resetting locale ..."
-            mv "$mnt/etc/locale.gen.bak" "$mnt/etc/locale.gen"
-            rm "$mnt/etc/locale.conf"
-        fi
-    fi
-}
-
-default_mirror(){
-    local mnt="$1" mirror="$2"'/$repo/os/$arch'
-    [[ -f $mnt/etc/pacman.d/mirrorlist ]] && mv "$mnt"/etc/pacman.d/mirrorlist "$mnt"/etc/pacman.d/mirrorlist.bak
-    echo "Server = $mirror" > $mnt/etc/pacman.d/mirrorlist
-}
-
-create_chroot(){
-    local timer=$(get_timer)
-    setarch "${target_arch}" \
-        mkchroot "$@"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-delete_chroot() {
-    local copydir=$1
-    local copy=${1:-$2}
-
-    stat_busy "Removing chroot copy [%s]" "$copy"
-    if is_btrfs "$chrootdir" && ! mountpoint -q "$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
-
-    # remove lock file
-    rm -f "$copydir.lock"
-    stat_done
-}
-
-# $1: chroot
-# kill_chroot_process(){
-#     # enable to have more debug info
-#     #msg "machine-id (etc): $(cat $1/etc/machine-id)"
-#     #[[ -e $1/var/lib/dbus/machine-id ]] && msg "machine-id (lib): $(cat $1/var/lib/dbus/machine-id)"
-#     #msg "running processes: "
-#     #lsof | grep $1
-#
-#     local prefix="$1" flink pid name
-#     for root_dir in /proc/*/root; do
-#         flink=$(readlink $root_dir)
-#         if [ "x$flink" != "x" ]; then
-#             if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
-#                 # this process is in the chroot...
-#                 pid=$(basename $(dirname "$root_dir"))
-#                 name=$(ps -p $pid -o comm=)
-#                 info "Killing chroot process: %s (%s)" "$name" "$pid"
-#                 kill -9 "$pid"
-#             fi
-#         fi
-#     done
-# }