Makefile: update 0.14

remove initcpio

Makefile

@@ -1,6 +1,6 @@
-VERSION=0.17
+VERSION=0.14
 
-CHROOT_VERSION=0.10
+CHROOT_VERSION=0.9
 
 TOOLS = artools
 PREFIX ?= /usr
@@ -8,10 +8,9 @@ SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
-CPIODIR = $(SYSCONFDIR)/initcpio
 
-BASE_CONF = \
-	data/conf/artools-base.conf
+CONF = \
+	data/artools.conf
 
 BASE_BIN = \
 	bin/base/signfile \
@@ -27,10 +26,7 @@ BASE_LIBS = \
 BASE_UTIL = lib/util-base.sh
 
 BASE_DATA = \
-	$(wildcard data/pacman/pacman*.conf)
-
-PKG_CONF = \
-	data/conf/artools-pkg.conf
+	$(wildcard data/base/pacman*.conf)
 
 PKG_BIN = \
 	bin/pkg/buildpkg \
@@ -41,11 +37,7 @@ PKG_BIN = \
 	bin/pkg/pkg2yaml \
 	bin/pkg/buildtree \
 	bin/pkg/lddd \
-	bin/pkg/links-add \
-	bin/pkg/checkpkg \
-	bin/pkg/finddeps \
-	bin/pkg/find-libdeps \
-	bin/pkg/batchpkg
+	bin/pkg/links-add
 
 LN_COMMITPKG = \
 	extrapkg \
@@ -92,17 +84,17 @@ LN_DEPLOYPKG = \
 PKG_LIBS = \
 	$(wildcard lib/pkg/*)
 
+PKG_LISTS = \
+	$(wildcard data/pkglists/*.list)
+
 PKG_UTIL = lib/util-pkg.sh
 
 PKG_DATA = \
-	data/pacman/makepkg.conf
+	data/pkg/makepkg.conf
 
 PATCHES = \
 	$(wildcard data/patches/*.patch)
 
-ISO_CONF = \
-	data/conf/artools-iso.conf
-
 ISO_BIN = \
 	bin/iso/buildiso \
 	bin/iso/deployiso
@@ -116,6 +108,8 @@ ISO_LIBS = \
 
 ISO_UTIL = lib/util-iso.sh
 
+DRACUT = \
+	data/dracut.conf
 
 DIRMODE = -dm0755
 FILEMODE = -m0644
@@ -156,7 +150,7 @@ clean:
 
 install_base:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(BASE_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install $(FILEMODE) $(CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)
@@ -169,14 +163,9 @@ install_base:
 	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_pkg:
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(PKG_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(PKG_BIN) $(DESTDIR)$(BINDIR)
 
-	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
-
 	$(LN) links-add $(DESTDIR)$(BINDIR)/links-remove
 
 	for l in $(LN_COMMITPKG); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
@@ -193,13 +182,10 @@ install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 
-install_cpio:
-	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
-
-install_iso: install_cpio
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(ISO_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
+	install $(FILEMODE) $(PKG_LISTS) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
 
+install_iso:
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(ISO_BIN) $(DESTDIR)$(BINDIR)
 
@@ -209,6 +195,9 @@ install_iso: install_cpio
 	install $(FILEMODE) $(ISO_UTIL) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 	install $(FILEMODE) $(ISO_LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
 
+	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/dracut.cond.d
+	install $(FILEMODE) $(DRACUT) $(DESTDIR)$(SYSCONFDIR)/dracut.cond.d/90-artix-live.conf
+
 install: install_base install_pkg install_iso
 
 .PHONY: all clean install install_base install_pkg install_iso

README.md

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

bin/base/artools-chroot.in

@@ -46,6 +46,10 @@ select_os(){
     fi
 }
 
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
 automount=false
 
 usage() {

bin/base/basestrap.in

@@ -36,17 +36,18 @@ copy_keyring(){
 
 create_min_fs(){
     msg "Creating install root at %s" "$1"
-    mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,run,etc/pacman.d}
-    mkdir -m 1777 -p $1/tmp
+    mkdir -m 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=0
-copykeyring=1
-copymirrorlist=1
-pacmode=-Sy
+hostcache=false
+copykeyring=true
+copymirrorlist=true
+directory=false
+interactive=false
 
 usage() {
     echo "usage: ${0##*/} [options] root [packages...]"
@@ -55,7 +56,6 @@ usage() {
     echo " -G               Avoid copying the host's pacman keyring to the target"
     echo " -i               Avoid auto-confirmation of package selections"
     echo " -M               Avoid copying the host's mirrorlist to the target"
-    echo ' -U               Use pacman -U to install packages'
     echo " -h               Print this help message"
     echo ''
     echo ' basestrap installs packages to the specified new root directory.'
@@ -67,16 +67,15 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts=':C:cGiMU'
+opts=':C:cGiM'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf=$OPTARG ;;
-        c) hostcache=1 ;;
-        i) interactive=1 ;;
-        G) copykeyring=0 ;;
-        M) copymirrorlist=0 ;;
-        U) pacmode=-U ;;
+        c) hostcache=true ;;
+        i) interactive=true ;;
+        G) copykeyring=false ;;
+        M) copymirrorlist=false ;;
         :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
         ?) usage 0 ;;
     esac
@@ -89,13 +88,9 @@ check_root
 newroot=$1; shift
 pacman_args=("${@:-base}")
 
-if (( ! hostcache ));then
-    pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
-fi
+${hostcache} || pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
 
-if (( ! interactive )); then
-    pacman_args+=(--noconfirm)
-fi
+${interactive} || pacman_args+=(--noconfirm)
 
 [[ -n $pacman_conf ]] && pacman_args+=(--config="$pacman_conf")
 
@@ -107,16 +102,15 @@ create_min_fs "$newroot"
 # mount API filesystems
 chroot_api_mount "$newroot" || die "failed to setup API filesystems in new root"
 
-if (( copykeyring ));then
-    copy_keyring "$newroot"
-fi
-
 msg2 'Installing packages to %s' "$newroot"
-if ! unshare --fork --pid pacman -r "$newroot" $pacmode "${pacman_args[@]}"; then
+if ! pacman -r "$newroot" -Sy "${pacman_args[@]}"; then
     die 'Failed to install packages to new root'
 fi
 
+if ${copykeyring};then
+    copy_keyring "$newroot"
+fi
 
-if (( copymirrorlist ));then
+if ${copymirrorlist};then
     copy_mirrorlist "$newroot"
 fi

bin/base/chroot-run.in

@@ -16,14 +16,9 @@ chroot_version=0.9
 
 . @libdir@/artools/util-base.sh
 
-# umask might have been changed in /etc/profile
-# ensure that sane default is set again
-umask 0022
-
 working_dir=''
 files=()
-
-mount_args=()
+nosetarch=false
 
 usage() {
     echo "Usage: ${0##*/} [options] working-dir [run arguments]"
@@ -35,24 +30,26 @@ usage() {
     echo '    -c <dir>      Set pacman cache'
     echo '    -f <file>     Copy file from the host to the chroot'
     echo '    -s            Do not run setarch'
-    echo '    -b <list>     Bind mountargs'
-    echo '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]'
+    echo '    -r <list>     Bind mountargs ro'
+    echo '    -w <list>     Bind mountargs rw'
+    echo '                  List format [src1:target1 ... srcN:targetN]'
     echo '    -h            This message'
     exit 1
 }
 
 orig_argv=("$0" "$@")
 
-opts='hC:M:c:b:f:s'
+opts='hC:M:c:r:w:f:s'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf="$OPTARG" ;;
         M) makepkg_conf="$OPTARG" ;;
-        c) cache_dirs+=("$OPTARG") ;;
+        c) cache_dir="$OPTARG" ;;
         f) files+=("$OPTARG") ;;
-        s) nosetarch=1 ;;
-        b) bindmounts=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
+        s) nosetarch=true ;;
+        r) bindmounts_ro=("$OPTARG") ;;
+        w) bindmounts_rw=("$OPTARG") ;;
         h|?) usage ;;
         *) error "invalid argument '$arg'"; usage ;;
     esac
@@ -68,42 +65,23 @@ shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
-if (( ${#cache_dirs[@]} == 0 )); then
-    mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+if [[ -z $cache_dir ]]; then
+    cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+else
+    cache_dirs=("$cache_dir")
 fi
 
+pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
 host_mirrors=($($pacconf_cmd --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
-
-for host_mirror in "${host_mirrors[@]}"; do
-    if [[ $host_mirror == *file://* ]]; then
-        host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
-        info "host mirror: %s" "$host_mirror"
-        in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
-    fi
-done
-
-while read -r line; do
-    mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
-        --repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
-    for line in "${lines[@]}"; do
-        if [[ $line = file://* ]]; then
-            line=${line#file://}
-            in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
-        fi
-    done
-done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
-
+    
 copy_hostconf () {
-    unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
-    pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
-
+    cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d"
+    
     printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
+    
+    [[ -n $pacman_conf ]] && cp $pacman_conf "$1/etc/pacman.conf"
 
-    [[ -n $pacman_conf ]] && cp $pacman_conf "${working_dir}/etc/pacman.conf"
-
-    [[ -n $makepkg_conf ]] && cp $makepkg_conf "${working_dir}/etc/makepkg.conf"
+    [[ -n $makepkg_conf ]] && cp $makepkg_conf "$1/etc/makepkg.conf"
 
     local file
     for file in "${files[@]}"; do
@@ -111,31 +89,33 @@ copy_hostconf () {
         cp -T "$file" "$working_dir$file"
     done
 
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "${working_dir}/etc/pacman.conf"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$1/etc/pacman.conf"
 }
 
-mount_args+=("-B:${cache_dirs[0]//:/\\:}:${cache_dirs[0]//:/\\:}" "-B:/etc/hosts:/etc/hosts")
-
-for cache_dir in "${cache_dirs[@]:1}"; do
-    mount_args+=("-Br:${cache_dir//:/\\:}:${cache_dir//:/\\:}")
-done
-
 chroot_extra_mount() {
-    chroot_add_resolv_conf "${working_dir}"
+    chroot_add_resolv_conf "$1"
+    chroot_mount "/etc/hosts" "$1/etc/hosts" -B
+#     chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
+    chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 
-    for arg in ${mount_args[@]}; do
-        local flag=${arg%%:*}
-        local dest=${arg##*:}
-        local src=${arg%:*}
-        src=${src#*:}
-        chroot_mount "${src}" "${working_dir}${dest}" "${flag}"
+    for cache_dir in ${cache_dirs[@]:1}; do
+        chroot_mount "$cache_dir" "$1${cache_dir}" -Br
     done
-}
 
-sync_host_localtime(){
-    if [[ -e /etc/localtime ]]; then
-        cp -L /etc/localtime "${working_dir}"/etc/localtime
-    fi
+    for m in ${bindmounts_ro[@]}; do
+        chroot_mount "${m%%:*}" "$1${m##*:}" -Br
+    done
+
+    for m in ${bindmounts_rw[@]}; do
+        chroot_mount "${m%%:*}" "$1${m##*:}" -B
+    done
+    
+    for host_mirror in "${host_mirrors[@]}"; do
+        if [[ $host_mirror == *file://* ]]; then
+            host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+            chroot_mount "$host_mirror_path" "$1$host_mirror_path" -Br
+        fi
+    done
 }
 
 umask 0022
@@ -147,17 +127,15 @@ elif [[ $(cat "$working_dir/.artools") != ${CHROOTVERSION} ]]; then
     die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "${CHROOTVERSION}"
 fi
 
-sync_host_localtime
-
 chroot_api_mount "${working_dir}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"
 
-chroot_extra_mount
+chroot_extra_mount "${working_dir}"
 
-copy_hostconf
+copy_hostconf "${working_dir}"
 
 eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
 
-[[ -z $nosetarch ]] || unset CARCH
+${nosetarch} && unset CARCH
 
 ${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
 

bin/base/fstabgen.in

@@ -215,7 +215,7 @@ done
         [[ $device = *'\040(deleted)' ]] && continue
 
         if [[ $type = file ]]; then
-            printf '%-20s' "${device#${root%/}}"
+            printf '%-20s' "$device"
         elif [[ $device = /dev/dm-+([0-9]) ]]; then
             # device mapper doesn't allow characters we need to worry
             # about being mangled, and it does the escaping of dashes

bin/base/mkchroot.in

@@ -15,19 +15,20 @@
 . @libdir@/artools/util-base.sh
 
 working_dir=''
-umode=''
-
 files=()
-chroot_args=()
+
+nosetarch=false
+copy_mirrorlist=true
+basestrap_args=(-Gc)
 
 usage() {
     echo "Usage: ${0##*/} [options] working-dir package-list..."
     echo ' options:'
-    echo '    -U            Use pacman -U to install packages'
     echo '    -C <file>     Location of a pacman config file'
     echo '    -M <file>     Location of a makepkg config file'
     echo '    -c <dir>      Set pacman cache'
     echo '    -f <file>     Copy file from the host to the chroot'
+    echo '    -m            Do not copy mirrorlist to the chroot'
     echo '    -s            Do not run setarch'
     echo '    -h            This message'
     exit 1
@@ -35,23 +36,19 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='hUC:M:c:f:s'
+opts='hC:M:c:f:sm'
 
 while getopts ${opts} arg; do
     case "${arg}" in
-        U) umode=U ;;
         C) pacman_conf="$OPTARG" ;;
         M) makepkg_conf="$OPTARG" ;;
         c) cache_dir="$OPTARG" ;;
         f) files+=("$OPTARG") ;;
-        s) nosetarch=1 ;;
+        s) nosetarch=true ;;
+        m) copy_mirrorlist=false; basestrap_args+=(-M) ;;
         h|?) usage ;;
         *) error "invalid argument '%s'" "$arg"; usage ;;
     esac
-    if [[ $arg != U ]]; then
-        chroot_args+=("-$arg")
-        [[ -v OPTARG ]] && chroot_args+=("$OPTARG")
-    fi
 done
 shift $(($OPTIND - 1))
 
@@ -64,10 +61,10 @@ shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
-if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <($pacconf_cmd CacheDir)
+if [[ -z $cache_dir ]]; then
+    cache_dirs=($(pacman -v $cache_conf 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+else
+    cache_dirs=(${cache_dir})
 fi
 
 umask 0022
@@ -93,15 +90,26 @@ for f in "${files[@]}"; do
     cp "$f" "$working_dir$f"
 done
 
-basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
-    ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
+_env=()
+while read -r varname; do
+    _env+=("$varname=${!varname}")
+done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
+env -i "${_env[@]}" \
+basestrap "${basestrap_args[@]}" ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
 
-printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
-echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
 echo "${CHROOTVERSION}" > "$working_dir/.artools"
 
+if [[ ! -f "$working_dir/etc/locale.gen.orig" ]];then
+    mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.orig"
+fi
+printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
+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})
+
 exec chroot-run \
     "${chroot_args[@]}" \
     "$working_dir" locale-gen

bin/base/signfile.in

@@ -14,7 +14,10 @@
 
 . @libdir@/artools/util-base.sh
 
-load_makepkg_config
+load_user_info
+
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
 
 file_to_sign="$1"
 

bin/iso/buildiso.in

@@ -12,29 +12,13 @@
 # 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_artools
-
-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
-}
-
 prepare_build(){
     timer_start=$(get_timer)
 
-    load_profile
+    load_profile "${PROFILE}"
 
     local pacman_conf pac_file="pacman-default.conf"
 
@@ -43,24 +27,19 @@ prepare_build(){
     esac
 
     pacman_conf="${DATADIR}/$pac_file"
-    [[ -f ${USER_CONF_DIR}/$pac_file ]] && pacman_conf="${USER_CONF_DIR}/$pac_file"
+    [[ -f ${USERCONFDIR}/artools/$pac_file ]] && pacman_conf="${USERCONFDIR}/artools/$pac_file"
 
     iso_file=$(gen_iso_fn).iso
 
     iso_label="ARTIX_$(date +%Y%m)"
 
-    basestrap_args+=(-C ${pacman_conf})
-    work_dir=${CHROOTS_ISO}/${PROFILE}/artix
-
-    prepare_dir "${ISO_POOL}"
+    mkchroot_args+=(-C ${pacman_conf} -m)
+    work_dir=${CHROOTS_ISO}/${PROFILE}/${ARCH}
 
     iso_dir="${ISO_POOL}/${PROFILE}"
 
     iso_root=${CHROOTS_ISO}/${PROFILE}/iso
-    live_dir=/LiveOS
-
     mnt_dir=${CHROOTS_ISO}/${PROFILE}/mnt
-
     prepare_dir "${mnt_dir}"
     prepare_dir "${iso_dir}"
     prepare_dir "${iso_root}"
@@ -79,44 +58,6 @@ display_settings(){
     show_profile
 }
 
-mk_squash(){
-    local timer=$(get_timer)
-    make_sfs "${work_dir}/rootfs"
-    [[ -d "${work_dir}/livefs" ]] && make_sfs "${work_dir}/livefs"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-mk_iso(){
-    touch "${iso_root}/.artix"
-    msg "Making bootable image"
-    # Sanity checks
-    [[ ! -d "${iso_root}" ]] && return 1
-    if [[ -f "${iso_dir}/${iso_file}" ]]; then
-        msg2 "Removing existing bootable image..."
-        rm -rf "${iso_dir}/${iso_file}"
-    fi
-    assemble_iso
-    chown -R "${OWNER}:$(id --group ${OWNER})" "${iso_dir}"
-}
-
-mk_boot(){
-    local timer=$(get_timer)
-    run_safe "make_bootfs"
-    run_safe "make_grub"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-mk_chroots(){
-    local timer=$(get_timer)
-    load_pkgs "${ROOT_LIST}" "${INITSYS}"
-    run_safe "make_rootfs"
-    if [[ -n ${LIVE_LIST} ]]; then
-        load_pkgs "${LIVE_LIST}" "${INITSYS}"
-        run_safe "make_livefs"
-    fi
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
 build(){
     msg "Start building [%s]" "${PROFILE}"
     if ${clean_first};then
@@ -132,52 +73,38 @@ build(){
         lock_close 9
 
         rm -rf --one-file-system "${work_dir}"
-
-        msg "Deleting isoroot [%s] ..." "${iso_root##*/}"
-        rm -rf --one-file-system "${iso_root}"
+        clean_iso_root "${iso_root}"
     fi
 
-    case true in
-        ${chroot_only})
-            mk_chroots
-            warning "Continue squash: %s -p %s -sc ..." "${cmd}" "${PROFILE}"
-            exit 1
-        ;;
-        ${boot_only})
-            mk_boot
-            warning "Continue iso: %s -p %s -zc ..." "${cmd}" "${PROFILE}"
-            exit 1
-        ;;
-        ${squash_only})
-            mk_squash
-            warning "Continue boot: %s -p %s -bc ..." "${cmd}" "${PROFILE}"
-            exit 1
-        ;;
-        ${iso_only})
-            [[ ! -d ${work_dir} ]] && die "Create chroot: %s -p %s -x" "${cmd}" "${PROFILE}"
-            mk_iso
-        ;;
-        *)
-            mk_chroots
-            mk_boot
-            mk_squash
-            mk_iso
-        ;;
-    esac
+    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
-chroot_only=false
+images_only=false
 iso_only=false
+log=false
 persist=false
-use_dracut=false
-squash_only=false
-boot_only=false
 
-basestrap_args=(-GMc)
+mkchroot_args=()
 cmd=${0##*/}
 
 REPOSITORY=${cmd##*-}
@@ -191,16 +118,14 @@ usage() {
     echo "                       [default: ${ISO_POOL}]"
     echo '    -i <name>          Init system to use'
     echo "                       [default: ${INITSYS}]"
-    echo '    -g <key>           The gpg key for img signing'
+    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 chroot only'
-    echo '    -s                 Squash chroot only'
-    echo '    -b                 Generate iso boot only'
+    echo '    -x                 Build images only'
     echo '    -z                 Generate iso only'
     echo '                       Requires pre built images (-x)'
-    echo '    -d                 Use dracut instead of mkinitcpio for iso initramfs'
+    echo '    -l                 Log to file'
     echo '    -q                 Query settings and pretend build'
     echo '    -h                 This help'
     echo ''
@@ -210,7 +135,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:r:t:i:g:czsbxmdqh'
+opts='p:r:t:i:g:czxmlqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -220,12 +145,10 @@ while getopts "${opts}" arg; do
         i) INITSYS="$OPTARG" ;;
         g) GPG_KEY="$OPTARG" ;;
         c) clean_first=false ;;
-        x) chroot_only=true ;;
+        x) images_only=true ;;
         z) iso_only=true ;;
-        s) squash_only=true ;;
-        b) boot_only=true ;;
         m) persist=true ;;
-        d) use_dracut=true ;;
+        l) log=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;

bin/iso/deployiso.in

@@ -12,9 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-iso.sh
-
-prepare_artools
+. @libdir@/artools/util-base.sh
 
 connect(){
     echo "${ACCOUNT}@${FILE_HOST}:${FILE_HOME}"
@@ -32,6 +30,10 @@ sync_dir(){
     show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
 update=false
 verbose=false
 

bin/pkg/batchpkg.in

@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-. /usr/lib/artools/util-pkg.sh
-
-prepare_artools
-
-batch_move() {
-    local name="${1:-pkg_moves}"
-    local pkglist=${TREE_DIR_ARTIX}/$name.list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read entry;do
-        local pkg=${entry##*:}
-        local src=${entry%:*}
-        src=${src#*:}
-        local dest=${entry%%:*}
-        if ${runlist}; then
-            "${dest}"pkg -s "${src}" -u -p "${pkg}"
-        else
-            msg "%s" "${dest}pkg -s ${src} -u -p ${pkg}"
-        fi
-    done < $pkglist
-}
-
-# batch_upgrade() {
-#     local pkglist=${TREE_DIR_ARTIX}/pkg_upgrades.list
-#     [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-#     while read entry;do
-#         local pkg=${entry#*:}
-#         local dest=${entry%:*}
-#         echo "buildtree -i -p ${pkg}"
-#         echo "${dest}pkg -u -p ${pkg}"
-#     done < $pkglist
-# }
-
-usage() {
-    echo "Usage: ${0##*/} [optional listname]"
-    echo '    -r                 Run generated commands'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-movelistname=pkg_moves
-runlist=false
-
-opts='rh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) runlist=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-movelistname="$1"; shift
-
-batch_move "$movelistname"

bin/pkg/buildpkg.in

@@ -12,14 +12,14 @@
 # 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
 
-prepare_artools
+load_user_info
+
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
 create_first=false
-rebuild=false
-no_check=false
-is_checkpkg=false
 
 mkchrootpkg_args=(-c -n)
 
@@ -27,13 +27,22 @@ 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 '    -m                 Major rebuild'
-    echo '    -N                 Disable check() function'
-    echo '    -C                 Run checkpkg after built'
     echo '    -h                 This help'
     echo ''
     echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
@@ -43,36 +52,17 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='hcCNmr:'
+opts='hcr:'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         r) CHROOTS_PKG="$OPTARG" ;;
         c) create_first=true ;;
-        m) rebuild=true ;;
-        C) is_checkpkg=true; mkchrootpkg_args+=(-C) ;;
-        N) no_check=true; mkchrootpkg_args+=(-N) ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
     esac
 done
 
-if ${rebuild};then
-    repo='default'
-else
-    case ${repo} in
-        system|world|galaxy) repo='default' ;;
-        lib32*) base_devel+=('multilib-devel') ;;
-        galaxy-gremlins|galaxy-goblins) repo=${repo#*-} ;;
-    esac
-fi
-
-pacman_conf="${DATADIR}/pacman-${repo}.conf"
-[[ -f ${USER_CONF_DIR}/pacman-${repo}.conf ]] && pacman_conf="${USER_CONF_DIR}/pacman-${repo}.conf"
-
-makepkg_conf="${DATADIR}/makepkg.conf"
-[[ -f ${USER_CONF_DIR}/makepkg.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.conf"
-
 check_root SOURCE_DATE_EPOCH
 
 mkchrootpkg_args+=("${@:$OPTIND}")
@@ -92,7 +82,7 @@ if ${create_first} || [[ ! -d "${CHROOTS_PKG}/${repo}-${ARCH}" ]];then
     lock_close 9
 
     rm -rf --one-file-system "${CHROOTS_PKG}/${repo}-${ARCH}"
-    (umask 0022; mkdir -p "${CHROOTS_PKG}/${repo}-${ARCH}")
+    mkdir -p "${CHROOTS_PKG}/${repo}-${ARCH}"
     setarch "${ARCH}" mkchroot \
         -C "${pacman_conf}" \
         -M "${makepkg_conf}" \
@@ -104,7 +94,7 @@ else
         -C "${pacman_conf}" \
         -M "${makepkg_conf}" \
         "${CHROOTS_PKG}/${repo}-${ARCH}/root" \
-        pacman -Syuu --noconfirm || abort
+        pacman -Syu --noconfirm || abort
 fi
 
 # Always build official packages reproducibly

bin/pkg/buildtree.in

@@ -12,41 +12,9 @@
 # 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
 
-prepare_artools
-
-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
-        ;;
-        linux|linux-lts)
-            sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i $pkg/trunk/PKGBUILD
-            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i $pkg/trunk/config
-        ;;
-        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-*|licenses)
-            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
-                -e 's|(Arch Linux)|(Artix Linux)|' \
-                -i $pkg/trunk/PKGBUILD
-        ;;
-    esac
-}
-
 pull_tree_arch(){
     cd ${TREE_DIR_ARCH}
     for tree in ${TREE_NAMES_ARCH[@]};do
@@ -61,9 +29,8 @@ pull_tree_arch(){
 }
 
 pull_tree_artix(){
-    local repos=("$1")
     cd ${TREE_DIR_ARTIX}
-    for tree in ${repos[@]};do
+    for tree in ${TREE_NAMES_ARTIX[@]};do
         if [[ -d ${tree} ]];then
             config_tree "${tree}"
             cd ${tree}
@@ -90,7 +57,7 @@ show_deps(){
 
     [[ $arch == 'any' ]] && CARCH=any
 
-    local archver=$(get_full_version)
+    local archver=$(get_full_version $pkg)
 
     msg2 "repo: %s" "$repo"
     [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
@@ -105,42 +72,20 @@ show_deps(){
     [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
 }
 
-subrepo_new(){
-    local group="${1:-$GROUP}" team="${2:-$TEAM}"
-    local dest=${TREE_DIR_ARTIX}/$group/${PACKAGE}/trunk
-
-    cd ${TREE_DIR_ARTIX}/$group
-
-    local org=$(get_pkg_org "${PACKAGE}")
-
-    create_repo "${PACKAGE}" "$org"
-
-    add_repo_to_team "${PACKAGE}" "$org" "$team"
-
-    subrepo_clone "${PACKAGE}" "$org"
-
-    prepare_dir "$dest"
-
-    commit_jenkins_files "${PACKAGE}"
-}
-
 from_arch(){
-    local src= dest=
+    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"
 
-    cd ${TREE_DIR_ARTIX}
-
-    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-
-    local package=${TREE_DIR_ARCH}/$git_tree_arch/${PACKAGE}
-    local repo=$(find_repo "$package" "${staging}" "${unstable}")
+    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}" "${PACKAGE}")
-    local tree_dir=$(get_artix_tree "${PACKAGE}" "$git_tree_artix" "$git_tree_arch")
+    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/${PACKAGE}/trunk
+    dest=${TREE_DIR_ARTIX}/$tree_dir/$pkg/trunk
 
     msg "tree: %s" "$tree_dir"
     show_deps "$src" "$repo"
@@ -150,54 +95,42 @@ from_arch(){
         cd ${TREE_DIR_ARTIX}/$git_tree_artix
 
         . $dest/PKGBUILD 2>/dev/null
-        local artixver=$(get_full_version)
+        local artixver=$(get_full_version $pkg)
 
         msg2 "Artix Version: %s" "$artixver"
     else
-        subrepo_new "$tree_dir" "$git_tree_arch"
+        subrepo_new "$pkg" "$tree_dir" "$git_tree_arch"
     fi
 
-    msg "Sync (%s) from [%s] to [%s]" "${PACKAGE}" "$git_tree_arch" "$tree_dir"
+    msg "Sync (%s) from [%s] to [%s]" "$pkg" "$git_tree_arch" "$tree_dir"
 
     sync_pkg "$src" "$dest"
-    patch_pkg "${PACKAGE}"
+    patch_pkg "$pkg"
 }
 
 view_build(){
-    local src=
-    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+    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/${PACKAGE}
-    local repo=$(find_repo "$pkg_path" "${staging}" "${unstable}")
+    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"
 }
 
-check_tree(){
-    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
-    local tree_dir=$(get_artix_tree "${PACKAGE}" "$git_tree_artix" "$git_tree_arch")
-    msg "tree_dir: %s" "$tree_dir"
-    [[ -z $git_tree_artix ]] && msg2 "exists: %s" "no"
-    [[ -n $git_tree_artix ]] && msg2 "exists: %s" "yes"
-}
-
 sync_repos(){
     ${sync_arch} && pull_tree_arch
-    if ${sync_artix};then
-        if ${sync_group}; then
-            pull_tree_artix "${GROUP}"
-        else
-            pull_tree_artix "${TREE_NAMES_ARTIX[*]}"
-        fi
-    fi
+    ${sync_artix} && pull_tree_artix
 }
 
-load_makepkg_config
+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
@@ -206,10 +139,6 @@ import=false
 view=false
 createnew=false
 conf=false
-unstable=false
-staging=true
-sync_group=false
-check=false
 
 PACKAGE=''
 
@@ -221,17 +150,14 @@ usage() {
     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 or -s)'
+    echo '    -g <group>    Group name, the superrepo (only with -n)'
     echo "                  [default: ${GROUP}]"
     echo "    -s            Clone or pull repos"
     echo "    -z            Don't clone or pull arch repos"
     echo "    -y            Don't clone or pull artix repos"
     echo '    -i            Import a package from arch repos'
     echo '    -n            Make new remote subrepo and clone it'
-    echo '    -u            Include kde & gnome unstable (only with -i)'
-    echo '    -w            Exclude staging (only with -i)'
-    echo '    -v            Check if a package is in the artix tree(s)'
-    echo '    -c            View package depends'
+    echo '    -v            View package depends'
     echo '    -h            This help'
     echo ''
     echo ''
@@ -240,21 +166,18 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:t:g:uwsinzycvh'
+opts='p:t:g:sinzyvh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) PACKAGE="$OPTARG" ;;
         t) TEAM="$OPTARG" ;;
-        g) GROUP="$OPTARG"; sync_group=true ;;
+        g) GROUP="$OPTARG" ;;
         s) sync=true ;;
         z) sync_arch=false ;;
         y) sync_artix=false ;;
         i) import=true ;;
         n) createnew=true ;;
-        w) staging=false ;;
-        u) unstable=true ;;
-        c) check=true ;;
         v) view=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -268,10 +191,8 @@ prepare_dir "${TREE_DIR_ARCH}"
 
 ${sync} && sync_repos
 
-${view} && view_build
+${view} && view_build "${PACKAGE}"
 
-${check} && check_tree
+${import} && from_arch "${PACKAGE}"
 
-${import} && from_arch
-
-${createnew} && subrepo_new
+${createnew} && subrepo_new "${PACKAGE}" "${GROUP}" "${TEAM}"

bin/pkg/checkpkg.in

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

bin/pkg/commitpkg.in

@@ -12,26 +12,9 @@
 # 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
 
-prepare_artools
-
-get_path(){
-    local repo="$1" pkg=trunk/PKGBUILD
-    if [[ $repo != trunk ]]; then
-        [[ -f repos/$repo-${ARCH}/PKGBUILD ]] && pkg=repos/$repo-${ARCH}/PKGBUILD
-        [[ -f repos/$repo-any/PKGBUILD ]] && pkg=repos/$repo-any/PKGBUILD
-    fi
-    echo $pkg
-}
-
-prepare_commit(){
-    local dest="$1"
-    [[ -d repos/$dest ]] && git rm -r repos/$dest
-    [[ ! -d repos ]] && mkdir repos
-    [[ ! -d repos/$dest ]] && mkdir repos/$dest
-}
-
 commit_pkg(){
     local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
     if [[ -n ${git_tree} ]];then
@@ -42,13 +25,9 @@ commit_pkg(){
 
         cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
 
-        local pkgbuild=$(get_path "${REPO_SRC}")
-
-        . $pkgbuild
+        . trunk/PKGBUILD
         [[ $arch == 'any' ]] && CARCH=any
-
-        local version=$(get_full_version)
-
+        local ver=$(get_full_version "${PACKAGE}")
         local commit_msg=""
 
         if ${remove};then
@@ -57,14 +36,14 @@ commit_pkg(){
                 local pkg=${PACKAGE}
                 git rm -r trunk
             else
-                local pkg="${PACKAGE}-$version"
+                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}-$version' ${action}"
+            commit_msg="[${REPO_SRC}] '${PACKAGE}-$ver' ${action}"
             msg "Action: %s" "$commit_msg"
             git add .
 
@@ -75,7 +54,7 @@ commit_pkg(){
 
         ${push} && pull_tree "${git_tree}" "$head"
 
-#         subrepo_pull "${PACKAGE}"
+        subrepo_pull "${PACKAGE}"
         subrepo_push "${PACKAGE}"
         subrepo_clean "${PACKAGE}"
 
@@ -97,18 +76,17 @@ symlink_commit_pkg(){
 
         cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
 
-        local pkgbuild=$(get_path "${REPO_SRC}")
-
-        . $pkgbuild
+        . trunk/PKGBUILD
         [[ $arch == 'any' ]] && CARCH=any
-
-        local version=$(get_full_version)
+        local ver=$(get_full_version "${PACKAGE}")
 
         if [[ ${REPO_SRC} == 'trunk' ]];then
             local action='add'
             local dest="${REPO_DEST}-$CARCH"
 
-            prepare_commit "$dest"
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
 
             cp trunk/* repos/$dest/
         else
@@ -116,12 +94,14 @@ symlink_commit_pkg(){
             local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"
 
             [[ ! -f repos/$src/PKGBUILD ]] && die "%s does not exist!" "repos/$src/PKGBUILD"
-            prepare_commit "$dest"
+            [[ -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}-$version' ${action}"
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$ver' ${action}"
         msg "Action: %s" "$commit_msg"
 
         git add .
@@ -131,7 +111,7 @@ symlink_commit_pkg(){
 
         ${push} && pull_tree "${git_tree}" "$head"
 
-#         subrepo_pull "${PACKAGE}"
+        subrepo_pull "${PACKAGE}"
         subrepo_push "${PACKAGE}"
         subrepo_clean "${PACKAGE}"
 
@@ -143,7 +123,11 @@ symlink_commit_pkg(){
     fi
 }
 
-load_makepkg_config
+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=''

bin/pkg/comparepkg.in

@@ -12,21 +12,20 @@
 # 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
 
-prepare_artools
-
 compare(){
-    local pkgpath="$1" group="$2"
+    local pkgpath="$1"
     local pkg=${pkgpath##*/}
-    local artixrepo=$(find_repo "$pkgpath" "${staging}" "${unstable}")
+    local artixrepo=$(find_repo "$package" "${staging}" "${unstable}")
     local artixshow=${artixrepo%-*}
     local pkgbuild=$pkgpath/repos/$artixrepo/PKGBUILD
 
     if [[ -f $pkgbuild ]];then
 
         . $pkgbuild 2>/dev/null
-        local artixver=$(get_full_version)
+        local artixver=$(get_full_version $pkg)
 
         local archpath=$(get_import_path $pkg)
 
@@ -37,7 +36,7 @@ compare(){
 
         if [[ -f $pkgbuild ]];then
             . $pkgbuild 2>/dev/null
-            local archver=$(get_full_version)
+            local archver=$(get_full_version $pkg)
         fi
 
         local result=$(vercmp "$artixver" "$archver")
@@ -51,13 +50,9 @@ compare(){
                 case $artixrepo in
                     *testing*|*staging*)
                         if $repomatch;then
-                            msg_row "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "${group#*-}"
+                            msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                         else
-                            msg_row_notify "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "${group#*-}"
-
-                            if [[ -n "$archshow" ]]; then
-                                printf "%s\n" "$archshow:$artixshow:$pkg" >> ${TREE_DIR_ARTIX}/pkg_moves.list
-                            fi
+                            msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                         fi
                     ;;
                 esac
@@ -66,16 +61,14 @@ compare(){
         elif ${upgrades};then
 
             if [ $result -eq -1 ];then
-                msg_row_upgrade "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "${group#*-}"
-
-                printf "%s\n" "$archshow:$pkg" >> ${TREE_DIR_ARTIX}/pkg_upgrades.list
+                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 "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "${group#*-}"
+                    msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                 fi
             fi
 
@@ -87,7 +80,7 @@ compare(){
 
 is_db_entry() {
     local pkgname="$1" repo="$(arch2artix $2)"
-    if [[ -d ${db_cache_dir}/${LINKSDBEXT}/${ARCH}/$repo/$pkgname ]];then
+    if [[ -d ${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/$repo/$pkgname ]];then
         return 0
     fi
     return 1
@@ -108,7 +101,7 @@ check_db(){
             if [[ -f $pkgbuild ]];then
 
                 . $pkgbuild 2>/dev/null
-                local artixver=$(get_full_version)
+                local artixver=$(get_full_version $pkg)
                 local is_entry=false
 
                 for name in ${pkgname[@]};do
@@ -117,7 +110,7 @@ check_db(){
                         is_entry=true
                     fi
                     if ! $is_entry; then
-                        msg_row "${tableU}" "$repo" "$name" "$artixver" "$is_entry"
+                        msg_row "%-20s %-35s %-20s %-10s" "$repo" "$name" "$artixver" "$is_entry"
                     fi
                 done
                 unset artixver is_entry pkgbuild pkgver epoch pkgname pkgbase
@@ -129,27 +122,28 @@ check_db(){
 update_db_cache(){
     msg "Updating database cache"
     for repo in "${searchrepos[@]}"; do
-        local cachedir=${db_cache_dir}/${LINKSDBEXT}/${ARCH}/${repo}
+        local cachedir=${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/${repo}
         rm -rf "$cachedir"
         mkdir -p "$cachedir"
         msg2 "%s" "$repo"
-        curl -L -s "${REPOS_MIRROR}/${repo}/os/${ARCH}/${repo}.${LINKSDBEXT}" \
+        curl -s "${REPOS_MIRROR}/${repo}/os/${ARCH}/${repo}.${LINKSDBEXT}" \
             | bsdtar -xf - -C "$cachedir"
     done
     msg "Done"
 }
 
 query_db() {
+    msg_table_header "%-20s %-45s %s" "Repo" "Package" "Library"
     for repo in "${searchrepos[@]}"; do
         local prefix=
-        local db=${db_cache_dir}/${LINKSDBEXT}/${ARCH}/${repo}/
+        local db=${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/${repo}/
         if [[ -d ${db} ]]; then
             while read -rd '' pkg; do
                 read -r match
                 pkg=${pkg#${db}}
                 pkg="${pkg%/*}"
 
-                msg_row "${tableQ}" "${repo}" "${pkg}" "${match}"
+                msg_row "%-20s %-45s %s" "${repo}" "${pkg}" "${match}"
             done < <(grep -rZ "${library}" "${db}") | sort -u
         fi
     done
@@ -160,36 +154,33 @@ show_version_table(){
 
     if ${check};then
         ${sync} && update_db_cache
-        msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
+        msg_table_header "%-20s %-35s %-20s %-10s" "Repo" "Package" "Version" "Database"
     elif ${query};then
         ${sync} && update_db_cache
-        msg_table_header "${tableQ}" "Repo" "Package" "Library"
         query_db
     else
-        msg_table_header "${table}" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version" "Group"
-    fi
-
-    if ${move} && [[ -f ${TREE_DIR_ARTIX}/pkg_moves.list ]]; then
-        rm ${TREE_DIR_ARTIX}/pkg_moves.list
-    elif ${upgrades} && [[ -f ${TREE_DIR_ARTIX}/pkg_upgrades.list ]]; then
-        rm ${TREE_DIR_ARTIX}/pkg_upgrades.list
+        msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
     fi
 
     for tree in ${TREE_NAMES_ARTIX[@]};do
+
         local git=$(find ${TREE_DIR_ARTIX}/$tree/ -mindepth 1 -maxdepth 1 -type d)
+
         for package in ${git[@]}; do
             if ${check};then
                 check_db "$package"
             else
-                compare "$package" "$tree"
+                compare "$package"
             fi
         done
     done
 }
 
-db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
+load_user_info
 
-load_makepkg_config
+load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
 
 unstable=false
 staging=true
@@ -207,10 +198,6 @@ artix_repos=(
     'gnome-wobble' 'kde-wobble'
 )
 
-readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"
-readonly tableU="%-20s %-35s %-30s %-10s"
-readonly tableQ="%-20s %-45s %s"
-
 searchrepos=(${artix_repos[@]})
 
 usage() {

bin/pkg/deploypkg.in

@@ -12,83 +12,9 @@
 # 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
 
-prepare_artools
-
-find_cached_pkgfile() {
-    local searchdirs=("$PKGDEST" "$PWD") results=()
-    local pkg="$1"
-    local search=${pkg%.*}
-    for dir in "${searchdirs[@]}"; do
-        [[ -d $dir ]] || continue
-        results+=$(find "$dir" -type f -name "$search.*" ! -path '*.sig')
-    done
-    case ${#results[*]} in
-        0)
-            return 1
-        ;;
-        1)
-            printf '%s\n' "${results[0]}"
-            return 0
-        ;;
-        *)
-            error 'Multiple packages found:'
-            printf '\t%s\n' "${results[@]}" >&2
-            return 1
-        ;;
-    esac
-}
-
-get_pkgbasename(){
-    local pkg="$1"
-    local pkgbasename name ver rel arch
-
-    pkgbasename=${pkg%.pkg.tar.?z}
-    arch=${pkgbasename##*-}
-    pkgbasename=${pkgbasename%-"$arch"}
-
-    rel=${pkgbasename##*-}
-    pkgbasename=${pkgbasename%-"$rel"}
-
-    ver=${pkgbasename##*-}
-
-    name=${pkgbasename%-"$ver"}
-    echo $name
-}
-
-update_repo2(){
-    local repo="$1"
-    local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
-
-    for name in ${passfiles[@]}; do
-        if pkgfile=$(find_cached_pkgfile "$name");then
-            info "Found: %s" "$name"
-            if ${add_pkg};then
-                local action='add'
-                packages+=("$name")
-                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+=("$(get_pkgbasename "$name")")
-                [[ -e $repo_path/$name ]] && rm $repo_path/$name
-                [[ -e $repo_path/$name.sig ]] && rm $repo_path/$name.sig
-            fi
-        fi
-    done
-    cd $repo_path
-    if [[ -n $action ]]; then
-        repo-$action -R $repo.${PKGDBEXT} ${packages[@]}
-        ${linksdb} && links-$action $repo.${LINKSDBEXT} ${packages[@]}
-    fi
-
-    return 0
-}
-
 update_repo(){
     local repo="$1" pkgfile ver
     local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
@@ -103,13 +29,14 @@ update_repo(){
 
     for name in ${pkgsearch[@]}; do
         pkgarch=$(get_pkg_arch "$name")
-        ver=$(get_full_version)
+        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}
@@ -132,7 +59,11 @@ update_repo(){
     return 0
 }
 
-load_makepkg_config
+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
@@ -169,12 +100,6 @@ done
 
 shift $(($OPTIND - 1))
 
-passfiles="$@"
-
 prepare_dir "${REPOS_ROOT}"
 
-if [[ -n ${passfiles[@]} ]]; then
-    update_repo2 "${dest_repo}"
-else
-    update_repo "${dest_repo}"
-fi
+update_repo "${dest_repo}"

bin/pkg/find-libdeps.in

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

bin/pkg/finddeps.in

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

bin/pkg/links-add.in

@@ -33,7 +33,6 @@ REPO_DB_PREFIX=
 REPO_DB_SUFFIX=
 LOCKFILE=
 CLEAN_LOCK=0
-# PREVENT_DOWNGRADE=0
 
 . @libdir@/artools/util-base.sh
 
@@ -53,7 +52,6 @@ Multiple packages to add can be specified on the command line.\n"
         printf -- "\n"
         printf -- "Options:\n"
         printf -- "  -n, --new         only add packages that are not already in the database\n"
-#         printf -- "$(gettext "  -p, --prevent-downgrade  do not add package to database if a newer version is already present\n")"
     elif [[ $cmd == "links-remove" ]] ; then
         printf -- "Usage: links-remove [options] <path-to-db> <packagename> ...\n"
         printf -- "\n"
@@ -201,18 +199,6 @@ db_write_entry() {
         if (( ONLYADDNEW )); then
             return 0
         fi
-#     else
-#         pkgentry=$(find_pkgentry "$pkgname")
-#         if [[ -n $pkgentry ]]; then
-#
-#             local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc")
-#             if (( $(vercmp "$version" "$pkgver") > 0 )); then
-#                 warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname"
-#                 if (( PREVENT_DOWNGRADE )); then
-#                     return 0
-#                 fi
-#             fi
-#         fi
     fi
 
     # remove an existing entry if it exists, ignore failures
@@ -473,7 +459,6 @@ while (( $# )); do
         -s|--sign) SIGN=1 ;;
         -k|--key) KEY=1 ; shift; GPGKEY=$1 ;;
         -v|--verify) VERIFY=1 ;;
-#         -p|--prevent-downgrade) PREVENT_DOWNGRADE=1 ;;
         *) args+=("$1") ;;
     esac
     shift

bin/pkg/mkchrootpkg.in

@@ -16,30 +16,6 @@
 
 shopt -s nullglob
 
-default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-makepkg_args=("${default_makepkg_args[@]}")
-verifysource_args=()
-chrootdir=
-passeddir=
-makepkg_user=
-declare -a install_pkgs
-declare -i ret=0
-
-keepbuilddir=0
-update_first=0
-clean_first=0
-run_namcap=0
-run_checkpkg=0
-temp_chroot=0
-run_nocheck=0
-
-bindmounts=()
-
-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'
@@ -74,8 +50,6 @@ usage() {
     echo '           Useful for maintaining multiple copies'
     echo "           Default: $copy"
     echo '-n         Run namcap on the package'
-    echo '-C         Run checkpkg on the package'
-    echo '-N         Disable check() function'
     echo '-T         Build in a temporary directory'
     echo '-U         Run makepkg as a specified user'
     exit 1
@@ -83,31 +57,37 @@ usage() {
 
 # {{{ functions
 
-# Usage: sync_chroot $chrootdir $copydir [$copy]
+# Usage: sync_chroot $rootdir $copydir [$copy]
 sync_chroot() {
-    local chrootdir=$1
+    local rootdir=$1
     local copydir=$2
     local copy=${3:-$2}
 
-    if [[ "$chrootdir/root" -ef "$copydir" ]]; then
+    if [[ "$rootdir" -ef "$copydir" ]]; then
         error 'Cannot sync copy with itself: %s' "$copydir"
         return 1
     fi
 
     # Get a read lock on the root chroot to make
     # sure we don't clone a half-updated chroot
-    slock 8 "$chrootdir/root.lock" \
-        "Locking clean chroot [%s]" "$chrootdir/root"
+    slock 8 "$rootdir.lock" \
+        "Locking clean chroot [%s]" "$rootdir"
 
-    stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copy"
-    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
 
@@ -138,7 +118,11 @@ delete_chroot() {
     stat_done
 }
 
+# Usage: install_packages $copydir $pkgs...
 install_packages() {
+    local copydir=$1
+    local install_pkgs=("${@:2}")
+
     local -a pkgnames
     local ret
 
@@ -146,21 +130,31 @@ install_packages() {
 
     cp -- "${install_pkgs[@]}" "$copydir/root/"
     chroot-run \
-        -b "${bindmounts[@]}" \
+        -r "${bindmounts_ro[@]}" \
+        -r "${bindmounts_rw[@]}" \
         "$copydir" \
-        bash -c 'yes y | pacman -U -- "$@"' -bash "${pkgnames[@]/#//root/}"
+        pacman -U --noconfirm -- "${pkgnames[@]/#//root/}"
     ret=$?
     rm -- "${pkgnames[@]/#/$copydir/root/}"
 
     return $ret
 }
 
+# Usage: prepare_chroot $copydir $HOME $keepbuilddir $run_namcap
+# Globals:
+#  - MAKEFLAGS
+#  - PACKAGER
 prepare_chroot() {
-    (( keepbuilddir )) || rm -rf "$copydir/build"
+    local copydir=$1
+    local USER_HOME=$2
+    local keepbuilddir=$3
+    local run_namcap=$4
+
+    [[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
 
     local builduser_uid builduser_gid
-    builduser_uid="$(id -u "$makepkg_user")"
-    builduser_gid="$(id -g "$makepkg_user")"
+    builduser_uid="${SUDO_UID:-$UID}"
+    builduser_gid="$(id -g "$builduser_uid")"
     local install="install -o $builduser_uid -g $builduser_gid"
     local x
 
@@ -195,7 +189,7 @@ EOF
         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
@@ -236,18 +230,39 @@ _chrootnamcap() {
     done
 }
 
+# Usage: download_sources $copydir $makepkg_user
+# Globals:
+#  - SRCDEST
 download_sources() {
+    local copydir=$1
+    local makepkg_user=$2
+
+#     local builddir
+#     builddir="$(mktemp -d)"
+#     chown "$makepkg_user:" "$builddir"
+
     setup_workdir
     chown "$makepkg_user:" "$WORKDIR"
 
     # Ensure sources are downloaded
     sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
         env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
-        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
+        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
         die "Could not download sources."
+
+    # Clean up garbage from verifysource
+#     rm -rf "$builddir"
 }
 
+# Usage: move_products $copydir $owner
+# Globals:
+#  - PKGDEST
+#  - LOGDEST
+#  - SRCPKGDEST
 move_products() {
+    local copydir=$1
+    local src_owner=$2
+
     local pkgfile
     for pkgfile in "$copydir"/pkgdest/*; do
         chown "$src_owner" "$pkgfile"
@@ -280,145 +295,142 @@ move_products() {
 
 orig_argv=("$0" "$@")
 
-opts='hcur:I:l:nNCTb:U:'
+main() {
+    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
 
-while getopts "${opts}" arg; do
-    case "$arg" in
-        c) clean_first=1 ;;
-        b) bindmounts+=("$OPTARG") ;;
-        u) update_first=1 ;;
-        r) passeddir="$OPTARG" ;;
-        I) install_pkgs+=("$OPTARG") ;;
-        l) copy="$OPTARG" ;;
-        n) run_namcap=1; makepkg_args+=(--install) ;;
-        N) run_nocheck=1; makepkg_args+=(--nocheck) ;;
-        C) run_checkpkg=1 ;;
-        T) temp_chroot=1; copy+="-$$" ;;
-        U) makepkg_user="$OPTARG" ;;
-        h|*) usage ;;
-    esac
-done
+    bindmounts_ro=()
+    bindmounts_rw=()
 
-[[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
-[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
-makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
+    copy=$USER
+    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+    [[ -z "$copy" || $copy = root ]] && copy=copy
+    src_owner=${SUDO_USER:-$USER}
 
-check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+    local opts='hcur:I:l:nTD:d:U:'
 
-# Canonicalize chrootdir, getting rid of trailing /
-chrootdir=$(readlink -e "$passeddir")
-[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
-[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkchroot %s/root base-devel" "$chrootdir"
-
-if [[ ${copy:0:1} = / ]]; then
-    copydir=$copy
-else
-    copydir="$chrootdir/$copy"
-fi
-
-# Pass all arguments after -- right to makepkg
-makepkg_args+=("${@:$OPTIND}")
-
-# See if -R or -e was passed to makepkg
-for arg in "${@:$OPTIND}"; do
-    case ${arg%%=*} in
-        --skip*|--holdver) verifysource_args+=("$arg") ;;
-        --repackage|--noextract) keepbuilddir=1 ;;
-        --*) ;;
-        -*R*|-*e*) keepbuilddir=1 ;;
-    esac
-done
-
-umask 0022
-
-ORIG_HOME=$HOME
-IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
-load_makepkg_config
-HOME=$ORIG_HOME
-
-# Use PKGBUILD directory if these don't exist
-[[ -d $PKGDEST ]]    || PKGDEST=$PWD
-[[ -d $SRCDEST ]]    || SRCDEST=$PWD
-[[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD
-[[ -d $LOGDEST ]]    || LOGDEST=$PWD
-
-# Lock the chroot we want to use. We'll keep this lock until we exit.
-lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
-
-if [[ ! -d $copydir ]] || (( clean_first )); then
-    sync_chroot "$chrootdir" "$copydir" "$copy"
-fi
-
-bindmounts+=("-B:${PWD}:/startdir" "-B:${SRCDEST}:/srcdest")
-
-(( update_first )) && chroot-run \
-        -b "${bindmounts[*]}" \
-        "$copydir" \
-        pacman -Syuu --noconfirm
-
-if [[ -n ${install_pkgs[*]:-} ]]; then
-    install_packages
-    ret=$?
-    # If there is no PKGBUILD we are done
-    [[ -f PKGBUILD ]] || exit $ret
-fi
-
-if [[ "$(id -u "$makepkg_user")" == 0 ]]; then
-    error "Running makepkg as root is not allowed."
-    exit 1
-fi
-
-download_sources
-
-prepare_chroot
-
-if chroot-run \
-    -b "${bindmounts[*]}" \
-    "$copydir" \
-    /chrootbuild "${makepkg_args[@]}"
-then
-    pkgnames=()
-    for pkgfile in "$copydir"/pkgdest/*; do
-        pkgfile=${pkgfile##*/};
-        pkgnames+=("${pkgfile%-*-*-*}");
+    while getopts "${opts}" arg; do
+        case "$arg" in
+            c) clean_first=true ;;
+            D) bindmounts_ro+=("$OPTARG") ;;
+            d) bindmounts_rw+=("$OPTARG") ;;
+            u) update_first=true ;;
+            r) passeddir="$OPTARG" ;;
+            I) install_pkgs+=("$OPTARG") ;;
+            l) copy="$OPTARG" ;;
+            n) run_namcap=true; makepkg_args+=(--install) ;;
+            T) temp_chroot=true; copy+="-$$" ;;
+            U) makepkg_user="$OPTARG" ;;
+            h|*) usage ;;
+        esac
     done
-    move_products
-else
-    (( ret += 1 ))
-fi
 
-(( temp_chroot )) && delete_chroot "$copydir" "$copy"
+    [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
+    [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
+    makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-if (( ret != 0 )); then
-    if (( temp_chroot )); then
-        die "Build failed"
+    check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+
+    # Canonicalize chrootdir, getting rid of trailing /
+    chrootdir=$(readlink -e "$passeddir")
+    [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
+    [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkchroot %s/root base-devel" "$chrootdir"
+
+    if [[ ${copy:0:1} = / ]]; then
+        copydir=$copy
     else
-        die "Build failed, check %s/build" "$copydir"
+        copydir="$chrootdir/$copy"
     fi
-else
-    if (( run_checkpkg )); then
-        msg "Running checkpkg"
-        # sync off-site databases for up-to-date queries
-        trap 'rm -rf $dbpath; cleanup' EXIT INT TERM QUIT
-        dbpath=$(mktemp -d --tmpdir makechrootpkg-database.XXXXXXXXXX)
-        mkdir -p "$dbpath"
-        pacman -Sy --dbpath "$dbpath" --logfile /dev/null
 
-        # query current package locations
-        remotepkgs=($(pacman -Sddp --dbpath "$dbpath" --logfile /dev/null "${pkgnames[@]}"))
-        if (( $? )); then
-            warning "Skipped checkpkg due to missing repo packages"
-            exit 0
-        fi
-        # download package files if any non-local location exists
-        for remotepkg in "${remotepkgs[@]}"; do
-            [[ $remotepkg == file://* ]] && continue
-            msg2 "Downloading current versions"
-            pacman --noconfirm -Swdd --dbpath "$dbpath" --logfile /dev/null "${pkgnames[@]}"
-            break
-        done
-        msg2 "Checking packages"
-        sudo -u "$makepkg_user" checkpkg --rmdir --warn
+    # Pass all arguments after -- right to makepkg
+    makepkg_args+=("${@:$OPTIND}")
+
+    # See if -R or -e was passed to makepkg
+    for arg in "${makepkg_args[@]}"; do
+        case ${arg%%=*} in
+            --repackage|--noextract) keepbuilddir=true; break ;;
+            --repackage|--noextract) keepbuilddir=true; break ;;
+            --*) ;;
+            -*R*|-*e*) keepbuilddir=true; break ;;
+        esac
+    done
+
+    load_user_info
+
+    umask 0022
+
+    load_vars "${USERCONFDIR}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+    load_vars /etc/makepkg.conf
+
+    # Use PKGBUILD directory if these don't exist
+    [[ -d $PKGDEST ]]    || PKGDEST=$PWD
+    [[ -d $SRCDEST ]]    || SRCDEST=$PWD
+    [[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD
+    [[ -d $LOGDEST ]]    || LOGDEST=$PWD
+
+    # Lock the chroot we want to use. We'll keep this lock until we exit.
+    lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
+
+    if [[ ! -d $copydir ]] || $clean_first; then
+        sync_chroot "$chrootdir/root" "$copydir" "$copy"
     fi
-    true
-fi
+
+    bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
+
+    $update_first && chroot-run \
+            -r "${bindmounts_ro[*]}" \
+            -w "${bindmounts_rw[*]}" \
+            "$copydir" \
+            pacman -Syu --noconfirm
+
+    if [[ -n ${install_pkgs[*]:-} ]]; then
+        install_packages "$copydir" "${install_pkgs[@]}"
+        ret=$?
+        # If there is no PKGBUILD we have done
+        [[ -f PKGBUILD ]] || return $ret
+    fi
+
+    if [[ "$(id -u "$makepkg_user")" == 0 ]]; then
+        error "Running makepkg as root is not allowed."
+        exit 1
+    fi
+
+    download_sources "$copydir" "$makepkg_user"
+
+    prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
+
+    if chroot-run \
+        -r "${bindmounts_ro[*]}" \
+        -w "${bindmounts_rw[*]}" \
+        "$copydir" \
+        /chrootbuild "${makepkg_args[@]}"
+    then
+        move_products "$copydir" "$src_owner"
+    else
+        (( ret += 1 ))
+    fi
+
+    $temp_chroot && delete_chroot "$copydir" "$copy"
+
+    if (( ret != 0 )); then
+        if $temp_chroot; then
+            die "Build failed"
+        else
+            die "Build failed, check %s/build" "$copydir"
+        fi
+    else
+        true
+    fi
+}
+
+main "$@"

bin/pkg/pkg2yaml.in

@@ -144,6 +144,6 @@ PACKAGE="$1"/PKGBUILD; shift
 
 . "$PACKAGE"
 
-load_makepkg_config
+. /etc/makepkg.conf
 
 write_pkg_yaml

data/artools.conf

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

data/base/pacman-default.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/base/pacman-gnome-wobble.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/base/pacman-goblins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/base/pacman-gremlins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/base/pacman-kde-wobble.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/base/pacman-lib32-goblins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/base/pacman-lib32-gremlins.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/base/pacman-lib32.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

data/conf/artools-base.conf

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

data/conf/artools-iso.conf

@@ -1,21 +0,0 @@
-#############################################
-################ artools-iso ################
-#############################################
-
-# the iso storage directory
-# ISO_POOL="${WORKSPACE_DIR}/iso"
-
-# the dist release; default: auto
-# ISO_VERSION=$(date +%Y%m%d)
-
-# possible values: openrc, runit, s6
-# INITSYS="openrc"
-
-# gpg key; leave empty or commented to skip img signing
-# GPG_KEY=""
-
-# set upload bandwidth limit in kB/s
-# UPLIMIT=1000
-
-# the server user
-# ACCOUNT=[SetUser]

data/conf/artools-pkg.conf

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

data/pkg/makepkg.conf

@@ -132,18 +132,18 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
-COMPRESSZST=(zstd -c -T0 --ultra -20 -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
-COMPRESSLZ4=(lz4 -q)
-COMPRESSLZ=(lzip -c -f)
 
 #########################################################################
 # EXTENSION DEFAULTS
 #########################################################################
 #
-PKGEXT='.pkg.tar.zst'
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
 
 # 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

initcpio/Makefile

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

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

initcpio/hooks/artix_loop_mnt

@@ -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="artix_loop_mount_handler"
-    fi
-}
-
-artix_loop_mount_handler () {
-    newroot="${1}"
-
-    local _dev_loop
-
-    msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
-    _mnt_dev "${img_dev}" "${live_root}/img_dev" "-r" "${img_flags}"
-    if [[ "${copytoram}" != "y" ]]; then
-        echo $(readlink -f ${img_dev}) >> ${live_root}/used_block_devices
-    fi
-
-    if _dev_loop=$(losetup --find --show --read-only "${live_root}/img_dev/${img_loop}"); then
-        artixdevice="${_dev_loop}"
-    else
-        echo "ERROR: Setting loopback device for file '${live_root}/img_dev/${img_loop}'"
-        launch_interactive_shell
-    fi
-
-    artix_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        losetup -d ${_dev_loop} 2>/dev/null
-        umount ${live_root}/img_dev
-    fi
-}

initcpio/hooks/artix_pxe_common

@@ -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 artix_pxe_common hook" > /etc/resolv.conf
-            echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf
-        fi
-        if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then
-            echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf
-        fi
-        if [[ -n "${DNSDOMAIN}" ]]; then
-            echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
-            echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf
-        fi
-    fi
-}
-
-run_latehook () {
-    if [[ -n "${ip}" ]]; then
-        [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
-
-        if [[ "${copytoram}" == "y" ]]; then
-            if [[ -n "${bootif_dev}" ]]; then
-                ip addr flush dev "${bootif_dev}"
-                ip link set "${bootif_dev}" down
-            fi
-        elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
-            cp /etc/resolv.conf /new_root/etc/resolv.conf
-        fi
-    fi
-}

initcpio/hooks/artix_pxe_http

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

initcpio/hooks/artix_pxe_nbd

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

initcpio/hooks/artix_pxe_nfs

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

initcpio/hooks/artix_shutdown

@@ -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

@@ -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 [[ $ARTIX_GNUPG_FD ]]; then
-        mkdir -p "$BUILDROOT$dest"/gpg
-        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$ARTIX_GNUPG_FD
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix_kms

@@ -1,16 +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"
-}
-
-help() {
-    cat << HELPEOF
-Adds all common KMS drivers to the initramfs image.
-HELPEOF
-}

initcpio/install/artix_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/artix_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/artix_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/artix_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/artix_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/artix_shutdown

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

initcpio/script/artix_shutdown

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

lib/base/message.sh

@@ -15,7 +15,7 @@
 # export LC_MESSAGES=C
 export LANG=C
 
-if [[ -t 2 && "$TERM" != dumb ]]; then
+if [[ -t 2 ]]; then
     colorize
 else
     declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''

lib/base/util.sh

@@ -25,15 +25,158 @@ show_elapsed_time(){
     info "Time %s: %s minutes" "$1" "$(elapsed_time $2)"
 }
 
+load_vars() {
+    local var
+
+    [[ -f $1 ]] || return 1
+
+    for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER CARCH GPGKEY; do
+        [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$1")"
+    done
+
+    return 0
+}
+
 prepare_dir(){
     [[ ! -d $1 ]] && mkdir -p $1
 }
 
+get_disturl(){
+    . /usr/lib/os-release
+    echo "${HOME_URL}"
+}
+
 get_osname(){
     . /usr/lib/os-release
     echo "${NAME}"
 }
 
+init_artools_base(){
+
+    ARCH=$(uname -m)
+
+    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
+
+    WORKSPACE_DIR=${WORKSPACE_DIR:-"/home/${OWNER}/artools-workspace"}
+
+    prepare_dir "${WORKSPACE_DIR}"
+}
+
+init_artools_pkg(){
+
+    DOMAIN='artixlinux.org'
+
+    GIT_DOMAIN="gitea.${DOMAIN}"
+
+    GIT_URL="https://${GIT_DOMAIN}"
+
+    GIT_TOKEN=${GIT_TOKEN:-''}
+
+    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
+
+    [[ -z ${TREE_NAMES_ARTIX[@]} ]] && \
+    TREE_NAMES_ARTIX=(
+        packages
+        community
+        packages-kernel
+        packages-openrc
+        packages-runit
+        packages-xorg
+        packages-python
+        packages-perl
+        packages-qt5
+        packages-ruby
+#         packages-desktop
+#         packages-kde
+#         packages-gnome
+    )
+
+    HOST_TREE_ARTIX=${HOST_TREE_ARTIX:-"gitea@${GIT_DOMAIN}:artixlinux"}
+
+    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
+
+    TREE_NAMES_ARCH=(packages community)
+
+    HOST_TREE_ARCH=${HOST_TREE_ARCH:-'git://git.archlinux.org/svntogit'}
+
+    CHROOTS_PKG="${CHROOTS_DIR}/buildpkg"
+
+    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
+
+    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
+
+    DBEXT=${DBEXT:-'xz'}
+
+    LINKSDBEXT=${LINKSDBEXT:-"links.tar.${DBEXT}"}
+
+    PKGDBEXT=${PKGDBEXT:-"db.tar.${DBEXT}"}
+}
+
+init_artools_iso(){
+    CHROOTS_ISO="${CHROOTS_DIR}/buildiso"
+
+    ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
+
+    prepare_dir "${ISO_POOL}"
+
+    PROFILE='base'
+
+    ISO_VERSION=${ISO_VERSION:-"$(date +%Y%m%d)"}
+
+    INITSYS=${INITSYS:-'openrc'}
+
+    UPLIMIT=${UPLIMIT:-1000}
+
+    FILE_HOST="download.${DOMAIN}"
+
+    FILE_HOME=${FILE_HOME:-'/srv/iso'}
+
+    FILE_PORT=${FILE_PORT:-65432}
+
+    ACCOUNT=${ACCOUNT:-'naughtyISOuploader'}
+}
+
+load_config(){
+
+    local conf="$1"
+
+    [[ -f "$conf" ]] || return 1
+
+    [[ -r "$conf" ]] && . "$conf"
+
+    init_artools_base
+
+    init_artools_pkg
+
+    init_artools_iso
+
+    return 0
+}
+
+user_own(){
+    local flag=$2
+    chown ${flag} "${OWNER}:$(id --group ${OWNER})" "$1"
+}
+
+user_run(){
+    su ${OWNER} -c "$@"
+}
+
+load_user_info(){
+    OWNER=${SUDO_USER:-$USER}
+
+    if [[ -n $SUDO_USER ]]; then
+        eval "USER_HOME=~$SUDO_USER"
+    else
+        USER_HOME=$HOME
+    fi
+
+    USERCONFDIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}"
+    prepare_dir "${USERCONFDIR}"
+
+    USERCACHEDIR="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
+}
+
 # orig_argv=("$0" "$@")
 check_root() {
     local keepenv=$1

lib/iso/chrootcfg.sh

@@ -12,42 +12,20 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-add_svc_openrc(){
-    local mnt="$1" names="$2" rlvl="${3:-default}"
-    for svc in $names; do
-        if [[ -f $mnt/etc/init.d/$svc ]];then
-            msg2 "Setting %s ..." "$svc"
-            [[ $svc == "xdm" ]] && set_xdm "$mnt"
-            chroot $mnt rc-update add $svc $rlvl &>/dev/null
-        fi
-    done
+add_svc_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" names="$2" rlvl="${3:-default}"
-    for svc in $names; do
-        if [[ -d $mnt/etc/runit/sv/$svc ]]; then
-            msg2 "Setting %s ..." "$svc"
-            chroot $mnt ln -s /etc/runit/sv/$svc /etc/runit/runsvdir/$rlvl &>/dev/null
-        fi
-    done
-}
-
-add_svc_s6(){
-    local mnt="$1" names="$2" valid="" rlvl="${3:-default}"
-    for svc in $names; do
-        if [[ -d $mnt/etc/s6/sv/$svc ]]; then
-            msg2 "Setting %s ..." "$svc"
-            valid=${valid:-}${valid:+' '}${svc}
-        fi
-    done
-    chroot $mnt s6-rc-bundle -c /etc/s6/rc/compiled add $rlvl $valid
-
-    # rebuild s6-linux-init binaries
-    chroot $mnt rm -r /etc/s6/current
-    chroot $mnt s6-linux-init-maker -1 -N -f etc/s6/skel -G "/usr/bin/agetty -L -8 tty1 115200" -c /etc/s6/current /etc/s6/current
-    chroot $mnt mv /etc/s6/current/bin/init /etc/s6/current/bin/s6-init
-    chroot $mnt cp -a /etc/s6/current/bin /usr
+    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(){
@@ -73,19 +51,42 @@ configure_logind(){
 
 configure_services(){
     local mnt="$1"
-    info "Configuring [%s] services" "${INITSYS}"
-    add_svc_${INITSYS} "$mnt" "${SERVICES[*]} ${SERVICES_LIVE[*]}"
-    info "Done configuring [%s] services" "${INITSYS}"
+    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"
-    configure_logind "$mnt" "elogind"
+    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
@@ -107,55 +108,41 @@ write_users_conf(){
     printf '%s' "${yaml}"
 }
 
-write_services_conf(){
-    local key1="$1" val1="$2" key2="$3" val2="$4"
+write_servicescfg_conf(){
     local yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 "$key1" "$val1")
-    yaml+=$(write_yaml_map 0 "$key2" "$val2")
-    yaml+=$(write_yaml_map 0 'services')
-    for svc in ${SERVICES[@]};do
-        yaml+=$(write_yaml_seq 2 "$svc")
-    done
+    yaml+=$(write_empty_line)
+    case "${INITSYS}" in
+        'runit')
+            yaml+=$(write_yaml_map 0 'svDir' '/etc/runit/sv')
+            yaml+=$(write_yaml_map 0 'runsvDir' '/etc/runit/runsvdir')
+            yaml+=$(write_yaml_map 0 'services')
+            yaml+=$(write_yaml_map 2 'enabled')
+            for svc in ${SERVICES[@]};do
+                yaml+=$(write_yaml_seq_map 4 'name' "$svc")
+                yaml+=$(write_yaml_map 6 'runlevel' 'default')
+            done
+        ;;
+        'openrc')
+            yaml+=$(write_yaml_map 0 'initdDir' '/etc/init.d')
+            yaml+=$(write_yaml_map 0 'runlevelsDir' '/etc/runlevels')
+            yaml+=$(write_yaml_map 0 'services')
+            for svc in ${SERVICES[@]};do
+                yaml+=$(write_yaml_seq_map 2 'name' "$svc")
+                yaml+=$(write_yaml_map 4 'runlevel' 'default')
+            done
+        ;;
+    esac
     yaml+=$(write_empty_line)
     printf '%s' "${yaml}"
 }
 
-write_services_openrc_conf(){
-    local conf="$1"/services-openrc.conf
-    write_services_conf 'initdDir' '/etc/init.d' 'runlevelsDir' '/etc/runlevels' > "$conf"
-}
-
-write_services_runit_conf(){
-    local conf="$1"/services-runit.conf
-    write_services_conf 'svDir' '/etc/runit/sv' 'runsvDir' '/etc/runit/runsvdir' > "$conf"
-}
-
-write_services_s6_conf(){
-    local conf="$1"/services-s6.conf
-    write_services_conf 'svDir' '/etc/s6/sv' 'dbDir' '/etc/s6/rc/compiled' > "$conf"
-}
-
-write_postcfg(){
+write_unpackfs_conf(){
     local yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 'keyrings')
-    for k in archlinux artix;do
-        yaml+=$(write_yaml_seq 2 "$k")
-    done
     yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
-}
-
-write_unpackfs() {
-    local yaml=$(write_yaml_header)
     yaml+=$(write_yaml_map 0 'unpack')
-#     if ${persist}; then
-#         yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
-#         yaml+=$(write_yaml_map 4 'sourcefs' '"ext4"')
-#     else
-    yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
-    yaml+=$(write_yaml_map 4 'sourcefs' '"squashfs"')
-#     fi
-    yaml+=$(write_yaml_map 4 'destination' '""')
+    yaml+=$(write_yaml_seq_map 2 'source' "/run/artix/bootmnt/artix/x86_64/rootfs.sfs")
+    yaml+=$(write_yaml_map 4 'sourcefs' 'squashfs')
+    yaml+=$(write_yaml_map 4 'destination' '')
     yaml+=$(write_empty_line)
     printf '%s' "${yaml}"
 }
@@ -165,60 +152,21 @@ configure_calamares(){
     if [[ -d "$mods" ]];then
         msg2 "Configuring Calamares"
         write_users_conf > "$mods"/users.conf
-        write_services_"${INITSYS}"_conf "$mods"
-        write_postcfg > "$mods"/postcfg.conf
-        write_unpackfs > "$mods"/unpackfs.conf
-        sed -e "s|services-openrc|services-${INITSYS}|" \
-            -i "$1"/etc/calamares/settings.conf
+        write_servicescfg_conf > "$mods"/services-"${INITSYS}".conf
+        write_unpackfs_conf > "$mods"/unpackfs.conf
+        sed -e "s|openrc|${INITSYS}|" -i "$mods"/postcfg.conf
+        sed -e "s|services-openrc|services-${INITSYS}|" -i "$1"/etc/calamares/settings.conf
     fi
 }
 
-configure_chroot(){
+configure_live_image(){
     local fs="$1"
-    msg "Configuring [%s]" "${fs##*/}"
+    msg "Configuring [livefs]"
     configure_hosts "$fs"
     configure_system "$fs"
     configure_services "$fs"
     configure_calamares "$fs"
     [[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
-    msg2 "Writing live.conf"
     write_live_session_conf > "$fs/etc/artools/live.conf"
-    msg "Done configuring [%s]" "${fs##*/}"
-}
-
-clean_up_chroot(){
-    local path mnt="$1"
-    msg2 "Cleaning [%s]" "${mnt##*/}"
-
-    path=$mnt/boot
-    if [[ -d "$path" ]]; then
-        find "$path" -name 'initramfs*.img' -delete &> /dev/null
-    fi
-    path=$mnt/var/lib/pacman/sync
-    if [[ -d $path ]];then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/cache/pacman/pkg
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/log
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-    path=$mnt/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
-    if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
-        rm $mnt/boot/grub/grub.cfg
-    fi
-    if [[ -f "$mnt/etc/machine-id" ]]; then
-        rm $mnt/etc/machine-id
-    fi
+    msg "Done configuring [livefs]"
 }

lib/iso/grub.sh

@@ -12,8 +12,15 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+prepare_initramfs(){
+    local src="$1" dest="$2"
+    local kver=$(cat $src/usr/lib/modules/extramodules-ARTIX/version)
+
+    dracut -fqM $dest/initramfs-${ARCH}.img $kver
+}
+
 prepare_boot_extras(){
-    local src="$1" dest=${iso_root}/boot
+    local src="$1" dest="$2"
 
     for u in intel amd;do
         cp $src/boot/$u-ucode.img $dest/$u-ucode.img
@@ -24,121 +31,29 @@ prepare_boot_extras(){
     cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
 }
 
-##################dracut##################
-
-prepare_initramfs_dracut(){
-    local mnt="$1"
-    local kver=$(<"$mnt"/usr/src/linux/version)
-
-    printf "%s\n" 'add_dracutmodules+=" dmsquash-live"' > "$mnt"/etc/dracut.conf.d/50-live.conf
-
-    msg "Starting build: %s" "${kver}"
-    artools-chroot "$mnt" dracut -fqM /boot/initramfs.img "$kver"
-    msg "Image generation successful"
-
-    cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${ARCH}".img
-
-    prepare_boot_extras "$mnt"
-}
-
-configure_grub_dracut(){
-    msg "Configuring grub kernel options ..."
-    local kopts=(
-        "root=live:LABEL=${iso_label}"
-        'rd.live.squashimg=rootfs.img'
-        'rd.live.image'
-        'rootflags=auto'
-    )
-    [[ "${PROFILE}" != 'base' ]] && kopts+=("rd.live.join=livefs.img")
-
-    local ro_opts=()
-    local rw_opts=()
-#         'rd.writable.fsimg=1'
-
-    sed -e "s|@kopts@|${kopts[*]}|" \
-        -e "s|@ro_opts@|${ro_opts[*]}|" \
-        -e "s|@rw_opts@|${rw_opts[*]}|" \
-        -i ${iso_root}/boot/grub/kernels.cfg
-}
-
-#############################################
-
-write_mkinitcpio_conf() {
-    msg2 "Writing mkinitcpio.conf ..."
-    local conf="$1/etc/mkinitcpio-artix.conf"
-    printf "%s\n" 'MODULES=(loop dm-snapshot)' > $conf
-    printf "%s\n" 'COMPRESSION="xz"' >> $conf
-    if [[ "${PROFILE}" == 'base' ]];then
-        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
-                            artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs
-                            artix_kms modconf block filesystems keyboard keymap)' >> $conf
-    else
-        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
-                            artix_kms modconf block filesystems keyboard keymap)' >> $conf
-    fi
-}
-
-prepare_initcpio(){
-    msg2 "Copying initcpio ..."
-    local dest="$1"
-    cp /etc/initcpio/hooks/artix* $dest/etc/initcpio/hooks
-    cp /etc/initcpio/install/artix* $dest/etc/initcpio/install
-    cp /etc/initcpio/artix_shutdown $dest/etc/initcpio
-}
-
-prepare_initramfs(){
-    local mnt="$1"
-
-    prepare_initcpio "$mnt"
-
-    write_mkinitcpio_conf "$mnt"
-
-    if [[ -n ${GPG_KEY} ]]; then
-        su ${OWNER} -c "gpg --export ${GPG_KEY} >/tmp/GPG_KEY"
-        exec 17<>/tmp/GPG_KEY
-    fi
-    local _kernel=$(<"$mnt"/usr/src/linux/version)
-    ARTIX_GNUPG_FD=${GPG_KEY:+17} artools-chroot "$mnt" \
-        /usr/bin/mkinitcpio -k ${_kernel} \
-        -c /etc/mkinitcpio-artix.conf \
-        -g /boot/initramfs.img
-
-    if [[ -n ${GPG_KEY} ]]; then
-        exec 17<&-
-    fi
-    if [[ -f /tmp/GPG_KEY ]]; then
-        rm /tmp/GPG_KEY
-    fi
-
-    cp $mnt/boot/initramfs.img ${iso_root}/boot/initramfs-${ARCH}.img
-    prepare_boot_extras "$mnt"
-}
-
 configure_grub(){
-    msg "Configuring grub kernel options ..."
-    local ro_opts=()
-    local rw_opts=()
-    local kopts=("label=${iso_label}")
+    local conf="$1/boot/grub/kernels.cfg"
+    sed -e "s|@iso_label@|${iso_label}|" -i $conf
 
-    [[ "${PROFILE}" != 'base' ]] && kopts+=('overlay=livefs')
-
-    sed -e "s|@kopts@|${kopts[*]}|" \
-        -e "s|@ro_opts@|${ro_opts[*]}|" \
-        -e "s|@rw_opts@|${rw_opts[*]}|" \
-        -i ${iso_root}/boot/grub/kernels.cfg
+#     rd.vconsole.keymap=
+#     rd.live.overlay.size=
+#     root=live:<URL>
+#     rd.live.ram=1
+#     rd.live.overlay.readonly
+#     rd.live.overlay=none
+#     rd.writable.fsimg=1
+#      rd.live.dir=<path>
+#       rd.live.squashimg=<filename of SquashFS image>
+#       rd.live.overlay.overlayfs=1
 }
 
 prepare_grub(){
-    local platform=i386-pc img='core.img' prefix=/boot/grub
-    local lib="$1"/usr/lib/grub
-    local theme="$1"/usr/share/grub
-    local livecfg="$2"/usr/share/grub
-    local grub=${iso_root}/boot/grub efi=${iso_root}/efi/boot
-
+    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
 
     prepare_dir ${grub}/${platform}
 
-    cp ${livecfg}/cfg/*.cfg ${grub}
+    cp ${theme}/cfg/*.cfg ${grub}
 
     cp ${lib}/${platform}/* ${grub}/${platform}
 
@@ -161,9 +76,8 @@ prepare_grub(){
     grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
 
     prepare_dir ${grub}/themes
-
-    cp -r ${theme}/themes/artix ${grub}/themes
-    cp -r ${livecfg}/{locales,tz} ${grub}
+    cp -r ${theme}/themes/artix ${grub}/themes/
+    cp -r ${theme}/{locales,tz} ${grub}
 
     if [[ -f /usr/share/grub/unicode.pf2 ]];then
         msg2 "Copying %s ..." "unicode.pf2"
@@ -173,7 +87,7 @@ prepare_grub(){
         grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
     fi
 
-    local size=4M mnt="${mnt_dir}/efiboot" efi_img="${iso_root}/boot/efi.img"
+    local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${efi_img}"
     mkfs.fat -n ARTIX_EFI "${efi_img}" &>/dev/null

lib/iso/iso.sh

@@ -12,120 +12,99 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-make_sig () {
-    local file="$1"
-    msg2 "Creating signature file..."
-    cd ${iso_root}${live_dir}
-    chown "${OWNER}:$(id --group ${OWNER})" "${iso_root}${live_dir}"
-    su ${OWNER} -c "gpg --detach-sign --default-key ${GPG_KEY} $file"
-    chown -R root "${iso_root}${live_dir}"
-    cd ${OLDPWD}
+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
 }
 
-make_checksum(){
-    local file="$1"
-    msg2 "Creating md5sum ..."
-    cd ${iso_root}${live_dir}
-    md5sum $file > $file.md5
-    cd ${OLDPWD}
-}
-
-make_ext_img(){
-    local src="$1"
-    local size=32G
-    local mnt="${mnt_dir}/${src##*/}"
-    mkdir -p ${work_dir}/embed${live_dir}
-    local extimg=${work_dir}/embed${live_dir}/${src##*/}.img
-
-    msg2 "Creating ext4 image of %s ..." "${size}"
-    truncate -s ${size} "${extimg}"
-    local ext4_args=()
-    ext4_args+=(-O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0)
-    mkfs.ext4 ${ext4_args[@]} -F "${extimg}" &>/dev/null
-    tune2fs -c 0 -i 0 "${extimg}" &> /dev/null
-    mount_img "${extimg}" "${mnt}"
-    msg2 "Copying %s ..." "${src}/"
-    cp -aT "${src}/" "${mnt}/"
-    umount_img "${mnt}"
-}
-
-has_changed(){
-    local src="$1" dest="$2"
-    if [[ -f "${dest}" ]]; then
-        local has_changes=$(find ${src} -newer ${dest})
-        if [[ -n "${has_changes}" ]]; then
-            msg2 "Possible changes for %s ..." "${src}"
-            msg2 "%s" "${has_changes}"
-            msg2 "SquashFS image %s is not up to date, rebuilding..." "${dest}"
-            rm "${dest}"
-        else
-            msg2 "SquashFS image %s is up to date, skipping." "${dest}"
-            return 1
-        fi
-    fi
+clean_iso_root(){
+    local dest="$1"
+    msg "Deleting isoroot [%s] ..." "${dest##*/}"
+    rm -rf --one-file-system "$dest"
 }
 
 # $1: image path
 make_sfs() {
-    local sfs_in="$1"
-    if [[ ! -e "${sfs_in}" ]]; then
-        error "The path %s does not exist" "${sfs_in}"
+    local src="$1"
+    if [[ ! -e "${src}" ]]; then
+        error "The path %s does not exist" "${src}"
         retrun 1
     fi
-
-    mkdir -p ${iso_root}${live_dir}
-
-    local img_name=${sfs_in##*/}.img
-    local img_file=${sfs_in}.img
-
-    local sfs_out="${iso_root}${live_dir}/${img_name}"
-
-    if has_changed "${sfs_in}" "${sfs_out}"; then
-
-        msg "Generating SquashFS image for %s" "${sfs_in}"
-
-        local mksfs_args=()
-
-        if ${persist};then
-            make_ext_img "${sfs_in}"
-            mksfs_args+=("${work_dir}/embed")
+    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
-            mksfs_args+=("${sfs_in}")
+            msg2 "SquashFS image %s is up to date, skipping." "${sfs}"
+            return
         fi
-
-        mksfs_args+=("${sfs_out}")
-
-        mksfs_args+=(-comp xz -b 256K -Xbcj x86 -noappend)
-
-        mksquashfs "${mksfs_args[@]}"
-
-        if ! ${use_dracut}; then
-            make_checksum "${img_name}"
-            if [[ -n ${GPG_KEY} ]];then
-                make_sig "${img_name}"
-            fi
-        fi
-        ${persist} && rm -r "${work_dir}/embed"
     fi
-}
 
-get_disturl(){
-    . /usr/lib/os-release
-    echo "${HOME_URL}"
+    if ${persist};then
+        local size=32G
+        local mnt="${mnt_dir}/${name}"
+        msg2 "Creating ext4 image of %s ..." "${size}"
+        truncate -s ${size} "${src}.img"
+        local ext4_args=()
+        ext4_args+=(-O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0)
+        mkfs.ext4 ${ext4_args[@]} -F "${src}.img" &>/dev/null
+        tune2fs -c 0 -i 0 "${src}.img" &> /dev/null
+        mount_img "${work_dir}/${name}.img" "${mnt}"
+        msg2 "Copying %s ..." "${src}/"
+        cp -aT "${src}/" "${mnt}/"
+        umount_img "${mnt}"
+
+    fi
+
+    msg2 "Creating SquashFS image, this may take some time..."
+    local mksfs_args=()
+    if ${persist};then
+        mksfs_args+=(${work_dir}/${name}.img)
+    else
+        mksfs_args+=(${src})
+    fi
+
+    mksfs_args+=(${sfs} -noappend)
+
+    local highcomp="-b 256K -Xbcj x86" comp='xz'
+
+    mksfs_args+=(-comp ${comp} ${highcomp})
+
+    mksquashfs "${mksfs_args[@]}"
+
+    ${persist} && rm "${src}.img"
+
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
 assemble_iso(){
     msg "Creating ISO image..."
     local mod_date=$(date -u +%Y-%m-%d-%H-%M-%S-00  | sed -e s/-//g)
-    local appid="$(get_osname) Live/Rescue CD"
-    local publisher="$(get_osname) <$(get_disturl)>"
 
     xorriso -as mkisofs \
         --modification-date=${mod_date} \
         --protective-msdos-label \
         -volid "${iso_label}" \
-        -appid "${appid}" \
-        -publisher "${publisher}" \
+        -appid "$(get_osname) Live/Rescue CD" \
+        -publisher "$(get_osname) <$(get_disturl)>" \
         -preparer "Prepared by artools/${0##*/}" \
         -r -graft-points -no-pad \
         --sort-weight 0 / \
@@ -136,11 +115,10 @@ assemble_iso(){
         -c boot.catalog \
         -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info \
         -eltorito-alt-boot \
-        -append_partition 2 0xef ${iso_root}/boot/efi.img \
+        -append_partition 2 0xef ${iso_root}/efi.img \
         -e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
         -no-emul-boot \
         -iso-level 3 \
         -o ${iso_dir}/${iso_file} \
         ${iso_root}/
 }
-

lib/iso/mount.sh

@@ -37,22 +37,21 @@ track_fs() {
     mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
 }
 
-mount_overlayfs(){
+mount_overlay(){
     FS_ACTIVE_MOUNTS=()
     local lower= upper="$1" work="$2"
+    local fs=${upper##*/}
+    local rootfs="$work/rootfs" livefs="$work/livefs"
     mkdir -p "${mnt_dir}/work"
     mkdir -p "$upper"
-    case $upper in
-        */livefs) lower="$work/rootfs" ;;
-        */bootfs)
-            lower="$work/rootfs"
-            [[ -d "$work/livefs" ]] && lower="$work/livefs":"$work/rootfs"
-        ;;
+    case $fs in
+        livefs) lower="$rootfs" ;;
+        bootfs) lower="$livefs":"$rootfs" ;;
     esac
     track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
 }
 
-umount_overlayfs(){
+umount_overlay(){
     if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
         info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
         umount "${FS_ACTIVE_MOUNTS[@]}"

lib/iso/profile.sh

@@ -12,6 +12,21 @@
 # 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-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}"
@@ -24,18 +39,15 @@ show_profile(){
 }
 
 load_profile(){
-    local profile_dir="${DATADIR}/iso-profiles"
-    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profile_dir=${WORKSPACE_DIR}/iso-profiles
+    local prof="$1"
+    local profdir="${DATADIR}/iso-profiles"
+    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profdir=${WORKSPACE_DIR}/iso-profiles
 
-    ROOT_LIST="$profile_dir/${PROFILE}/Packages-Root"
-    ROOT_OVERLAY="$profile_dir/${PROFILE}/root-overlay"
+    init_profile "$profdir" "$prof"
 
-    [[ -f "$profile_dir/${PROFILE}/Packages-Live" ]] && LIVE_LIST="$profile_dir/${PROFILE}/Packages-Live"
-    [[ -d "$profile_dir/${PROFILE}/live-overlay" ]] && LIVE_OVERLAY="$profile_dir/${PROFILE}/live-overlay"
+    [[ -f $profdir/$prof/profile.conf ]] || return 1
 
-    [[ -f $profile_dir/${PROFILE}/profile.conf ]] || return 1
-
-    [[ -r $profile_dir/${PROFILE}/profile.conf ]] && . $profile_dir/${PROFILE}/profile.conf
+    [[ -r $profdir/$prof/profile.conf ]] && . $profdir/$prof/profile.conf
 
     DISPLAYMANAGER=${DISPLAYMANAGER:-'none'}
 
@@ -51,22 +63,25 @@ load_profile(){
     ADDGROUPS=${ADDGROUPS:-"video,power,optical,network,lp,scanner,wheel,users,log"}
 
     if [[ -z ${SERVICES[@]} ]];then
-        SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+        SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
     fi
 
     if [[ ${DISPLAYMANAGER} != "none" ]];then
         case "${INITSYS}" in
             'openrc') SERVICES+=('xdm') ;;
-            'runit'|'s6') SERVICES+=("${DISPLAYMANAGER}") ;;
+            'runit') SERVICES+=("${DISPLAYMANAGER}") ;;
         esac
     fi
 
-    SERVICES_LIVE=('artix-live' 'pacman-init')
+    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}")
@@ -82,7 +97,7 @@ load_pkgs(){
 
     local _init="s|@$init||g"
     case "$init" in
-        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6.*||g" ;;
+        '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

lib/iso/util.sh

@@ -13,17 +13,34 @@
 # 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_overlayfs
+    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
@@ -31,7 +48,11 @@ run_safe() {
     restoretrap=$(trap -p ERR)
     trap 'error_function $func' ERR
 
-    "$func"
+    if ${log};then
+        run_log "$func"
+    else
+        "$func"
+    fi
 
     eval $restoretrap
     set +E
@@ -41,7 +62,7 @@ run_safe() {
 trap_exit() {
     local sig=$1; shift
     error "$@"
-    umount_overlayfs
+    umount_overlay
     trap -- "$sig"
     kill "-$sig" "$$"
 }
@@ -54,6 +75,33 @@ prepare_traps(){
 #     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
@@ -62,6 +110,52 @@ copy_overlay(){
     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)"
@@ -69,15 +163,11 @@ make_rootfs() {
 
         prepare_dir "${rootfs}"
 
-        basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"
+        install_packages "${rootfs}"
 
         copy_overlay "${ROOT_OVERLAY}" "${rootfs}"
 
-        [[ -z ${LIVE_LIST} ]] && configure_chroot "${rootfs}"
-
-        clean_up_chroot "${rootfs}"
-
-        : > ${work_dir}/rootfs.lock
+        clean_up_image "${rootfs}"
 
         msg "Done [Base installation] (rootfs)"
     fi
@@ -90,19 +180,17 @@ make_livefs() {
 
         prepare_dir "${livefs}"
 
-        mount_overlayfs "${livefs}" "${work_dir}"
+        mount_overlay "${livefs}" "${work_dir}"
 
-        basestrap "${basestrap_args[@]}" "${livefs}" "${packages[@]}"
+        install_packages "${livefs}"
 
         copy_overlay "${LIVE_OVERLAY}" "${livefs}"
 
-        configure_chroot "${livefs}"
+        configure_live_image "${livefs}"
 
-        umount_overlayfs
+        umount_overlay
 
-        clean_up_chroot "${livefs}"
-
-        : > ${work_dir}/livefs.lock
+        clean_up_image "${livefs}"
 
         msg "Done [Live installation] (livefs)"
     fi
@@ -111,22 +199,22 @@ make_livefs() {
 make_bootfs() {
     if [[ ! -e ${work_dir}/bootfs.lock ]]; then
         msg "Prepare [/iso/boot]"
+        local boot="${iso_root}/boot"
 
-        prepare_dir "${iso_root}/boot"
+        prepare_dir "${boot}"
 
-        cp ${work_dir}/rootfs/boot/vmlinuz* ${iso_root}/boot/vmlinuz-${ARCH}
+        cp ${work_dir}/rootfs/boot/vmlinuz* ${boot}/vmlinuz-${ARCH}
 
         local bootfs="${work_dir}/bootfs"
 
-        mount_overlayfs "${bootfs}" "${work_dir}"
+        mount_overlay "${bootfs}" "${work_dir}"
 
-        if ${use_dracut}; then
-            prepare_initramfs_dracut "${bootfs}"
-        else
-            prepare_initramfs "${bootfs}"
-        fi
+        prepare_initramfs "${bootfs}" "${boot}"
 
-        umount_overlayfs
+#         cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${ARCH}.img
+        prepare_boot_extras "${bootfs}" "${boot}"
+
+        umount_overlay
 
         rm -R ${bootfs}
         : > ${work_dir}/bootfs.lock
@@ -138,18 +226,32 @@ make_grub(){
     if [[ ! -e ${work_dir}/grub.lock ]]; then
         msg "Prepare [/iso/boot/grub]"
 
-        local layer=${work_dir}/rootfs
-        [[ -n ${LIVE_LIST} ]] && layer=${work_dir}/livefs
+        prepare_grub "${work_dir}/rootfs" "${work_dir}/livefs" "${iso_root}"
 
-        prepare_grub "${work_dir}/rootfs" "$layer"
-
-        if ${use_dracut}; then
-            configure_grub_dracut
-        else
-            configure_grub
-        fi
+        configure_grub "${iso_root}"
 
         : > ${work_dir}/grub.lock
         msg "Done [/iso/boot/grub]"
     fi
 }
+
+compress_images(){
+    local timer=$(get_timer)
+    run_safe "make_iso"
+    user_own "${iso_dir}" "-R"
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+prepare_images(){
+    local timer=$(get_timer)
+    load_pkgs "${ROOT_LIST}" "${INITSYS}"
+    run_safe "make_rootfs"
+    if [[ -f ${LIVE_LIST} ]]; then
+        load_pkgs "${LIVE_LIST}" "${INITSYS}"
+        run_safe "make_livefs"
+    fi
+    run_safe "make_bootfs"
+    run_safe "make_grub"
+
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}

lib/pkg/gitea.sh

@@ -54,10 +54,9 @@ load_team_id(){
 add_repo_to_team(){
     local pkg="$1" org="$2" team="$3"
     local id=$(load_team_id "$org" "$team")
-    local gitname=$(get_compliant_name "$pkg")
 
-    msg2 "Adding package repo [%s] to team (%s)" "$gitname" "$team"
+    msg2 "Adding package repo [%s] to team (%s)" "$pkg" "$team"
 
-    curl -s -X PUT "${GIT_URL}/api/v1/teams/$id/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
+    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

@@ -23,12 +23,14 @@ get_remote_head(){
 get_pkg_org(){
     local pkg="$1" org= sub=
     case ${pkg} in
-        ruby-*) org="packagesRuby" ;;
-        perl-*) org="packagesPerl" ;;
-        python-*|python2-*) org="packagesPython" ;;
-        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
+        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
-    echo $org
 }
 
 subrepo_push(){
@@ -81,7 +83,7 @@ pull_tree(){
     local remote_head=$(get_remote_head)
 
     msg "Checking %s (%s)" "${tree}" "$os"
-    if has_changes "${local_head}" "${remote_head}";then
+    if $(has_changes "${local_head}" "${remote_head}");then
         git pull origin master
     fi
 }
@@ -139,3 +141,22 @@ config_tree(){
         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

@@ -12,8 +12,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-shopt -s extglob
-
 get_compliant_name(){
     local gitname="$1"
     case $gitname in
@@ -22,6 +20,55 @@ get_compliant_name(){
     echo $gitname
 }
 
+patch_pkg(){
+    local pkg="$1"
+    case $pkg in
+        'glibc')
+            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+                -e '/nscd.service/d' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'tp_smapi'|'acpi_call'|'r8168'|'bbswitch'|'broadcom-wl')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+        ;;
+        'nvidia')
+            sed -e 's|-ARCH|-ARTIX|g'  -e 's|for Arch kernel|for Artix kernel|g' \
+                -e 's|for LTS Arch kernel|for LTS Artix kernel|g' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'linux')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
+                -e 's|CONFIG_CRYPTO_SPECK=.*|CONFIG_CRYPTO_SPECK=n|' \
+                -i $pkg/trunk/config
+            cd $pkg/trunk
+                updpkgsums
+            cd ../..
+
+        ;;
+        'licenses')
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' -i $pkg/trunk/PKGBUILD
+        ;;
+        'bash')
+            sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
+            -e "s|etc/bash.|etc/bash/|g" \
+            -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
+            -i $pkg/trunk/PKGBUILD
+
+
+            cd $pkg/trunk
+                patch -Np 1 -i ${DATADIR}/patches/artix-bash.patch
+                updpkgsums
+            cd ../..
+        ;;
+        gstreamer|gst-plugins-*)
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
+                -e 's|(Arch Linux)|(Artix Linux)|' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+    esac
+}
+
 arch2artix(){
     local repo="$1" artix=none
     case "$repo" in
@@ -62,7 +109,7 @@ find_repo(){
     local pkg="$1" stag="$2" unst="$3" repo=
 
     for r in $(arch_repos "$stag" "$unst");do
-        [[ -f $pkg/repos/$r-${ARCH}/PKGBUILD ]] && repo=$r-${ARCH}
+        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
         [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
     done
     echo $repo
@@ -80,8 +127,7 @@ is_valid_repo(){
 }
 
 get_cases(){
-    local pkglist="${SYSCONFDIR}/pkglist.d/$1.list"
-
+    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"))
@@ -97,28 +143,22 @@ get_artix_tree(){
     local pkg="$1" artix_tree="${2:-$3}" tree
     eval "case $pkg in
         $(get_cases kernel)) tree=packages-kernel ;;
-        $(get_cases python)) tree=packages-python ;;
-        $(get_cases perl)) tree=packages-perl ;;
-        $(get_cases ruby)) tree=packages-ruby ;;
-        $(get_cases openrc)) tree=packages-openrc ;;
-        $(get_cases runit)) tree=packages-runit ;;
-        $(get_cases s6)) tree=packages-s6 ;;
-        $(get_cases media)) tree=packages-media ;;
-        $(get_cases xorg)) tree=packages-xorg ;;
-        $(get_cases qt5)) tree=packages-qt5 ;;
-        $(get_cases gtk)) tree=packages-gtk ;;
-        $(get_cases java)) tree=packages-java ;;
-        $(get_cases haskell)) tree=packages-haskell ;;
-        $(get_cases devel)) tree=packages-devel ;;
-        $(get_cases lxqt)) tree=packages-lxqt ;;
-        $(get_cases cinnamon)) tree=packages-cinnamon ;;
-        $(get_cases kde)) tree=packages-kde ;;
-        $(get_cases gnome)) tree=packages-gnome ;;
-        $(get_cases mate)) tree=packages-mate ;;
-        $(get_cases xfce)) tree=packages-xfce ;;
+        python-*|python2-*) tree=packages-python ;;
+        perl-*) tree=packages-perl ;;
+        ruby-*) tree=packages-ruby ;;
+        xorg*|xf86*|$(get_cases xorg)) tree=packages-xorg ;;
+        *-openrc) tree=packages-openrc ;;
+        *-runit) tree=packages-runit ;;
+        qt5-*) tree=packages-qt5 ;;
+        lxqt*|$(get_cases lxqt)) tree=packages-lxqt ;;
         *) tree=$artix_tree
     esac"
     echo $tree
+
+#         $(get_cases freedesktop)) tree=packages-desktop ;;
+#         $(get_cases kde)) tree=packages-kde ;;
+#         $(get_cases gnome)) tree=packages-gnome ;;
+
 }
 
 get_import_path(){
@@ -147,7 +187,7 @@ find_cached_package() {
     for dir in "${searchdirs[@]}"; do
         [[ -d $dir ]] || continue
 
-        for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
+        for pkg in "$dir"/*.pkg.tar.?z; do
             [[ -f $pkg ]] || continue
 
             # avoid adding duplicates of the same inode
@@ -157,7 +197,7 @@ find_cached_package() {
 
             # split apart package filename into parts
             pkgbasename=${pkg##*/}
-            pkgbasename=${pkgbasename%.pkg.tar*}
+            pkgbasename=${pkgbasename%.pkg.tar.?z}
 
             arch=${pkgbasename##*-}
             pkgbasename=${pkgbasename%-"$arch"}

lib/util-base.sh.in

@@ -20,40 +20,6 @@ DATADIR=${DATADIR:-'@datadir@/artools'}
 LIBDIR=${LIBDIR:-'@libdir@/artools'}
 SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 
-OWNER=${SUDO_USER:-$USER}
-
-if [[ -n $SUDO_USER ]]; then
-    eval "USER_HOME=~$SUDO_USER"
-else
-    USER_HOME=$HOME
-fi
-
-USER_CONF_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/artools"
-
 for baselib in ${LIBDIR}/base/*.sh; do
     . $baselib
 done
-
-prepare_artools(){
-    prepare_dir "${WORKSPACE_DIR}"
-    prepare_dir "${USER_CONF_DIR}"
-}
-
-load_base_config(){
-
-    local conf="$1/artools-base.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    [[ -r "$conf" ]] && . "$conf"
-
-    ARCH=$(uname -m)
-
-    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
-
-    WORKSPACE_DIR=${WORKSPACE_DIR:-"/home/${OWNER}/artools-workspace"}
-
-    return 0
-}
-
-load_base_config "${USER_CONF_DIR}" || load_base_config "${SYSCONFDIR}"

lib/util-iso.sh.in

@@ -12,43 +12,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-base.sh
-
 for isolib in ${LIBDIR}/iso/*.sh; do
     . $isolib
 done
-
-load_iso_config(){
-
-    local conf="$1/artools-iso.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    [[ -r "$conf" ]] && . "$conf"
-
-    CHROOTS_ISO="${CHROOTS_DIR}/buildiso"
-
-    ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
-
-    PROFILE='base'
-
-    ISO_VERSION=${ISO_VERSION:-"$(date +%Y%m%d)"}
-
-    INITSYS=${INITSYS:-'openrc'}
-
-    GPG_KEY=${GPG_KEY:-''}
-
-    UPLIMIT=${UPLIMIT:-1000}
-
-    FILE_HOST="download.${DOMAIN}"
-
-    FILE_HOME=${FILE_HOME:-'/srv/iso'}
-
-    FILE_PORT=${FILE_PORT:-65432}
-
-    ACCOUNT=${ACCOUNT:-'naughtyISOuploader'}
-
-    return 0
-}
-
-load_iso_config "${USER_CONF_DIR}" || load_iso_config "${SYSCONFDIR}"

lib/util-pkg.sh.in

@@ -12,76 +12,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-. @libdir@/artools/util-base.sh
-
 for pkglib in ${LIBDIR}/pkg/*.sh; do
     . $pkglib
 done
-
-load_pkg_config(){
-
-    local conf="$1/artools-pkg.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    [[ -r "$conf" ]] && . "$conf"
-
-    DOMAIN='artixlinux.org'
-
-    GIT_DOMAIN="gitea.${DOMAIN}"
-
-    GIT_URL="https://${GIT_DOMAIN}"
-
-    GIT_TOKEN=${GIT_TOKEN:-''}
-
-    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
-
-    [[ -z ${TREE_NAMES_ARTIX[@]} ]] && \
-    TREE_NAMES_ARTIX=(
-            packages
-            community
-            packages-kernel
-            packages-openrc
-            packages-runit
-            packages-s6
-            packages-xorg
-            packages-python
-            packages-perl
-            packages-java
-            packages-qt5
-            packages-devel
-            packages-ruby
-            packages-gtk
-            packages-gnome
-            packages-cinnamon
-            packages-lxqt
-            packages-mate
-            packages-kde
-            packages-xfce
-#             packages-haskell
-    )
-
-    HOST_TREE_ARTIX=${HOST_TREE_ARTIX:-"gitea@${GIT_DOMAIN}:artixlinux"}
-
-    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
-
-    TREE_NAMES_ARCH=(packages community)
-
-    HOST_TREE_ARCH=${HOST_TREE_ARCH:-'git://git.archlinux.org/svntogit'}
-
-    CHROOTS_PKG="${CHROOTS_DIR}/buildpkg"
-
-    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
-
-    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
-
-    DBEXT=${DBEXT:-'xz'}
-
-    LINKSDBEXT=${LINKSDBEXT:-"links.tar.${DBEXT}"}
-
-    PKGDBEXT=${PKGDBEXT:-"db.tar.${DBEXT}"}
-
-    return 0
-}
-
-load_pkg_config "${USER_CONF_DIR}" || load_pkg_config "${SYSCONFDIR}"