buildtree: fix import new pkg

commitpkg: only --clean on subrepo push

.gitignore

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

Makefile

@@ -1,7 +1,14 @@
-Version=0.6
+VERSION=0.10
 
-PREFIX = /usr/local
+CHROOT_VERSION=0.8
+
+TOOLS = artools
+PREFIX ?= /usr/local
 SYSCONFDIR = /etc
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+DATADIR = $(PREFIX)/share
+CPIODIR = $(SYSCONFDIR)/initcpio
 
 SYSCONF = \
 	data/artools.conf
@@ -22,195 +29,126 @@ LIBS_BASE = \
 	lib/util-fstab.sh
 
 SHARED_BASE = \
-	$(wildcard data/pacman-*.conf)
-
-LIST_IMPORT = \
-	$(wildcard data/import.list.d/*.list)
+	$(wildcard data/pacman*.conf)
 
 BIN_PKG = \
 	bin/checkpkg \
 	bin/lddd \
 	bin/finddeps \
-	bin/findupdates \
 	bin/find-libdeps \
 	bin/mkchrootpkg \
 	bin/buildpkg \
 	bin/buildtree \
-	bin/deploypkg
+	bin/deploypkg \
+	bin/commitpkg
 
 LIBS_PKG = \
 	$(wildcard lib/util-pkg*.sh)
 
 SHARED_PKG = \
-	$(wildcard data/makepkg-*.conf)
+	data/makepkg.conf
 
 PATCHES = \
 	$(wildcard data/patches/*.patch)
 
+COMMITPKG_SYMS = \
+	extrapkg \
+	corepkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
+	multilibpkg \
+	multilib-testingpkg \
+	multilib-stagingpkg
+
 BIN_ISO = \
 	bin/buildiso \
-	bin/deployiso \
-	bin/buildyaml
+	bin/deployiso
+
+BIN_ISO_SYMS = \
+	buildiso-gremlins \
+	buildiso-goblins
 
 LIBS_ISO = \
-	$(wildcard lib/util-iso*.sh) \
-	$(wildcard lib/util-yaml*.sh) \
-	lib/util-profile.sh
+	$(wildcard lib/util-iso*.sh)
 
 SHARED_ISO = \
-	data/mkinitcpio.conf \
-	data/linux.preset
+	data/mkinitcpio.conf
 
-CPIOHOOKS = \
-	$(wildcard initcpio/hooks/*)
+DIRMODE = -dm0755
+FILEMODE = -m0644
+MODE =  -m0755
 
-CPIOINST = \
-	$(wildcard initcpio/install/*)
-
-CPIO = \
-	initcpio/script/artix_shutdown
-
-BASE = \
-	$(wildcard data/base/Packages-*) \
-	data/base/profile.conf
-
-LIVE_ETC = \
-	data/base/live-overlay/etc/issue \
-	data/base/live-overlay/etc/fstab
-
-LIVE_ETC_DEFAULT = \
-	$(wildcard data/base/live-overlay/etc/default/*)
-
-LIVE_ETC_PAM = \
-	$(wildcard data/base/live-overlay/etc/pam.d/*)
-
-LIVE_ETC_SUDOERS = \
-	$(wildcard data/base/live-overlay/etc/sudoers.d/*)
+LN = ln -sf
+RM = rm -f
+M4 = m4 -P
+CHMODAW = chmod a-w
+CHMODX = chmod +x
 
 all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
 
-edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
-	-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
-	-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/artools|g" \
-	-e "s|@version@|${Version}|"
+EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g" \
+	-e "s|@version@|$(VERSION)|" \
+	-e "s|@chroot_version@|$(CHROOT_VERSION)|"
 
 %: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@m4 -P $@.in | $(edit) >$@
-	@chmod a-w "$@"
-	@chmod +x "$@"
+	@$(M4) $@.in | $(EDIT) >$@
+	@$(CHMODAW) "$@"
+	@$(CHMODX) "$@"
 
 clean:
-	rm -f $(BIN_BASE) ${BIN_PKG} ${BIN_ISO}
+	$(RM) $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
 
 install_base:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools
-	install -m0644 ${SYSCONF} $(DESTDIR)$(SYSCONFDIR)/artools
+	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install $(FILEMODE) $(SYSCONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_BASE} $(DESTDIR)$(PREFIX)/bin
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(BIN_BASE) $(DESTDIR)$(BINDIR)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_BASE} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(LIBS_BASE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/artools
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(SHARED_BASE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
-	install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(BIN_PKG) $(DESTDIR)$(BINDIR)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
+	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
 
-	ln -sf buildpkg $(DESTDIR)$(PREFIX)/bin/buildpkg-testing
+	for l in $(COMMITPKG_SYMS); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
 
-	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(LIBS_PKG) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_PKG} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(SHARED_PKG) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
+	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
+install_cpio:
+	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/patches
-	install -m0644 ${PATCHES} $(DESTDIR)$(PREFIX)/share/artools/patches
+install_iso: install_cpio
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(BIN_ISO) $(DESTDIR)$(BINDIR)
 
-install_isobase:
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
-	install -m0644 ${BASE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
+	for l in $(BIN_ISO_SYMS); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
-	install -m0644 ${LIVE_ETC} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(LIBS_ISO) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
-	install -m0644 ${LIVE_ETC_DEFAULT} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(SHARED_ISO) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
-	install -m0644 ${LIVE_ETC_PAM} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
+install: install_base install_pkg install_iso
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
-	install -m0644 ${LIVE_ETC_SUDOERS} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
-
-install_iso:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
-
-	ln -sf buildiso $(DESTDIR)$(PREFIX)/bin/buildiso-testing
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/artools
-
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
-	install -m0755 ${CPIOHOOKS} $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
-
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/initcpio/install
-	install -m0755 ${CPIOINST} $(DESTDIR)$(SYSCONFDIR)/initcpio/install
-
-	install -m0755 ${CPIO} $(DESTDIR)$(SYSCONFDIR)/initcpio
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_ISO} $(DESTDIR)$(PREFIX)/share/artools
-
-uninstall_base:
-	for f in ${SYSCONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/$$f; done
-	for f in ${BIN_BASE}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for f in ${SHARED_BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-	for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-
-uninstall_pkg:
-	for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
-	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	rm -f $(DESTDIR)$(PREFIX)/bin/buildpkg-testing
-	for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-	for f in ${PATCHES}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/patches/$$f; done
-	for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-
-uninstall_isobase:
-	for f in ${BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
-	for f in ${LIVE_ETC}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/$$f; done
-	for f in ${LIVE_ETC_DEFAULT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default/$$f; done
-	for f in ${LIVE_ETC_PAM}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d/$$f; done
-	for f in ${LIVE_ETC_SUDOERS}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d/$$f; done
-
-uninstall_iso:
-	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/bin/buildiso-testing
-	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-
-	for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-	for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks/$$f; done
-	for f in ${CPIOINST}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/install/$$f; done
-	for f in ${CPIO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/$$f; done
-
-install: install_base install_pkg install_iso install_isobase
-
-uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_isobase
-
-dist:
-	git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz
-	gpg --detach-sign --use-agent artools-$(Version).tar.gz
-
-.PHONY: all clean install uninstall dist
+.PHONY: all clean install

README.md

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

bin/artools-chroot.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 shopt -s extglob
 
@@ -20,6 +20,36 @@ SYSCONFDIR='@sysconfdir@'
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-mount.sh
 
+select_os(){
+    local os_list=( $(detect) ) count=${#os_list[@]}
+    if [[ ${count} > 1 ]];then
+        msg "Detected systems:"
+        local i=0
+        for os in ${os_list[@]};do
+            local last=${os##*:}
+            case $last in
+                'efi') count=$((count-1)) ;;
+                *) info "$i) $(get_os_name $os)"; i=$((i+1)) ;;
+            esac
+        done
+        i=0
+        msg "Select system to mount [0-%s] : " "$((count-1))"
+        read select
+    else
+        select=0
+    fi
+    local os_str=${os_list[$select]} type
+    type=$os_str
+    root=${os_str%%:*}
+    type=${type##*:}
+    if [[ "${type##*:}" == 'linux' ]];then
+        msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
+        mount_os "$1" "$root"
+    else
+        die "You can't mount %s!" "$select"
+    fi
+}
+
 display_settings(){
     show_version
     show_config
@@ -86,8 +116,8 @@ else
 
     ${pretend} && display_settings && exit 1
 
-    chroot_api_efi_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
-    chroot_mount /etc/resolv.conf "${chrootdir}/etc/resolv.conf" --bind
+    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
+    chroot_add_resolv_conf "${chrootdir}"
 fi
 
 SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}

bin/basestrap.in

@@ -8,7 +8,7 @@
 #  4) A valid mirror appears in /etc/pacman.d/mirrorlist
 #
 
-version=@version@
+VERSION=@version@
 
 shopt -s extglob
 
@@ -20,6 +20,26 @@ import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-mount.sh
 import ${LIBDIR}/util-chroot.sh
 
+copy_mirrorlist(){
+    cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
+}
+
+copy_keyring(){
+    if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $1/etc/pacman.d/gnupg ]]; then
+        cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d/"
+    fi
+}
+
+create_min_fs(){
+    msg "Creating install root at %s" "$1"
+    mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
+    mkdir -m 1777 -p $1/{tmp,run}
+    mkdir -m 0555 -p $1/{sys,proc}
+#     if [[ ! -f $1/etc/machine-id ]];then
+#         touch $1/etc/machine-id
+#     fi
+}
+
 newroot=/mnt
 
 hostcache=false
@@ -32,7 +52,6 @@ usage() {
     echo "usage: ${0##*/} [options] root [packages...]"
     echo " -C <config>      Use an alternate config file for pacman"
     echo " -c               Use the package cache on the host, rather than the target"
-    echo " -d               Allow installation to a non-mountpoint directory"
     echo " -G               Avoid copying the host's pacman keyring to the target"
     echo " -i               Avoid auto-confirmation of package selections"
     echo " -M               Avoid copying the host's mirrorlist to the target"
@@ -47,12 +66,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts=':C:cdGiM'
+opts=':C:cGiM'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf=$OPTARG ;;
-        d) directory=true ;;
         c) hostcache=true ;;
         i) interactive=true ;;
         G) copykeyring=false ;;
@@ -77,10 +95,6 @@ ${interactive} || pacman_args+=(--noconfirm)
 
 [[ -d $newroot ]] || die "%s is not a directory" "$newroot"
 
-if ! mountpoint -q "$newroot" && ! ${directory}; then
-    die '%s is not a mountpoint!' "$newroot"
-fi
-
 # create obligatory directories
 create_min_fs "$newroot"
 

bin/buildiso.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 DATADIR='@datadir@'
@@ -22,48 +22,43 @@ import ${LIBDIR}/util-iso.sh
 prepare_build(){
     timer_start=$(get_timer)
 
-    load_profile "${profile}"
+    load_profile "${PROFILE}"
 
-    local pac_arch='default' pacman_conf pac_conf
-    [[ "${target_arch}" == 'x86_64' ]] && pac_arch='lib32'
+    local pacman_conf pac_file="pacman-default.conf"
 
-    if [[ ${stablility} == 'buildiso' ]];then
-        pac_conf=$pac_arch
-    else
-        pac_conf=$pac_arch-${stablility}
-    fi
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') pac_file="pacman-${REPOSITORY}.conf" ;;
+    esac
 
-    pacman_conf="${DATADIR}/pacman-$pac_conf.conf"
-    [[ -f $AT_USERCONFDIR/pacman-$pac_conf.conf ]] && pacman_conf="$AT_USERCONFDIR/pacman-$pac_conf.conf"
+    pacman_conf="${DATADIR}/$pac_file"
+    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
 
     iso_file=$(gen_iso_fn).iso
 
-    mkchroot_args+=(-C ${pacman_conf})
-    work_dir=${chroots_iso}/${profile}/${target_arch}
+    iso_label="ARTIX_$(date +%Y%m)"
 
-    iso_dir="${cache_dir_iso}/${profile}"
+    mkchroot_args+=(-C ${pacman_conf} -m)
+    work_dir=${CHROOTS_ISO}/${PROFILE}/${ARCH}
 
-    iso_root=${chroots_iso}/${profile}/iso
-    mnt_dir=${chroots_iso}/${profile}/mnt
+    iso_dir="${ISO_POOL}/${PROFILE}"
+
+    iso_root=${CHROOTS_ISO}/${PROFILE}/iso
+    mnt_dir=${CHROOTS_ISO}/${PROFILE}/mnt
     prepare_dir "${mnt_dir}"
     prepare_dir "${iso_dir}"
+    prepare_dir "${iso_root}"
 }
 
 show_profile(){
     msg2 "iso_file: %s" "${iso_file}"
     if ${verbose};then
-        msg2 "autologin: %s" "${autologin}"
-
-        msg2 "netgroups: %s" "$(get_yaml)"
-
-        msg2 "hostname: %s" "${hostname}"
-        msg2 "username: %s" "${username}"
-        msg2 "password: %s" "${password}"
-        msg2 "addgroups: %s" "${addgroups}"
-
-        msg2 "enable_live: %s" "${enable_live[*]}"
-        msg2 "openrc_boot: %s" "${openrc_boot[*]}"
-        msg2 "openrc_default: %s" "${openrc_default[*]}"
+        msg2 "AUTOLOGIN: %s" "${AUTOLOGIN}"
+        msg2 "HOST_NAME: %s" "${HOST_NAME}"
+        msg2 "USER_NAME: %s" "${USER_NAME}"
+        msg2 "PASSWORD: %s" "${PASSWORD}"
+        msg2 "ADDGROUPS: %s" "${ADDGROUPS}"
+        msg2 "SERVICES_LIVE: %s" "${SERVICES_LIVE[*]}"
+        msg2 "SERVICES: %s" "${SERVICES[*]}"
     fi
 }
 
@@ -72,11 +67,10 @@ display_settings(){
     show_config
 
     msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "initsys: %s" "${initsys}"
-    msg2 "kernel: %s" "${kernel}"
-    [[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
+    msg2 "PROFILE: %s" "${PROFILE}"
+    msg2 "INITSYS: %s" "${INITSYS}"
+    [[ -n ${GPG_KEY} ]] && msg2 "GPG_KEY: %s" "${GPG_KEY}"
+    msg2 "REPOSITORY: %s" "${REPOSITORY}"
 
     msg "ARGS:"
     msg2 "clean_first: %s" "${clean_first}"
@@ -85,14 +79,14 @@ display_settings(){
     msg2 "persist: %s" "${persist}"
 
     msg "ISO SETTINGS:"
-    msg2 "iso_version: %s" "${iso_version}"
+    msg2 "ISO_VERSION: %s" "${ISO_VERSION}"
 
     msg "BUILD:"
     show_profile
 }
 
 build(){
-    msg "Start building [%s]" "${profile}"
+    msg "Start building [%s]" "${PROFILE}"
     if ${clean_first};then
         for copy in "${work_dir}"/*; do
             [[ -d $copy ]] || continue
@@ -110,19 +104,19 @@ build(){
     fi
 
     if ${iso_only}; then
-        [[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
+        [[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${PROFILE}"
         compress_images
         exit 1
     fi
     if ${images_only}; then
         prepare_images
-        warning "Continue compress: buildiso -p %s -zc ..." "${profile}"
+        warning "Continue compress: buildiso -p %s -zc ..." "${PROFILE}"
         exit 1
     else
         prepare_images
         compress_images
     fi
-    msg "Finished building [%s]" "${profile}"
+    msg "Finished building [%s]" "${PROFILE}"
     show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
@@ -139,22 +133,20 @@ persist=false
 
 mkchroot_args=()
 cmd=${0##*/}
-stablility=${cmd##*-}
+
+REPOSITORY=${cmd##*-}
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Profile [default: ${profile}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
+    echo "    -p <profile>       Profile [default: ${PROFILE}]"
     echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_iso}]"
+    echo "                       [default: ${CHROOTS_ISO}]"
     echo '    -t <dir>           Target directory'
-    echo "                       [default: ${cache_dir_iso}]"
-    echo '    -k <name>          Kernel to use'
-    echo "                       [default: ${kernel}]"
+    echo "                       [default: ${ISO_POOL}]"
     echo '    -i <name>          Init system to use'
-    echo "                       [default: ${initsys}]"
+    echo "                       [default: ${INITSYS}]"
     echo '    -g <key>           The gpg key for sfs signing'
-    echo "                       [default: ${gpgkey}]"
+    echo "                       [default: ${GPG_KEY}]"
     echo '    -m                 Set SquashFS image mode to persistence'
     echo '    -c                 Disable clean work dir'
     echo '    -x                 Build images only'
@@ -170,17 +162,15 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:t:k:i:g:czxmvqh'
+opts='p:r:t:i:g:czxmvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) profile="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
-        r) chroots_iso="$OPTARG" ;;
-        t) cache_dir_iso="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        g) gpgkey="$OPTARG" ;;
+        p) PROFILE="$OPTARG" ;;
+        r) CHROOTS_ISO="$OPTARG" ;;
+        t) ISO_POOL="$OPTARG" ;;
+        i) INITSYS="$OPTARG" ;;
+        g) GPG_KEY="$OPTARG" ;;
         c) clean_first=false ;;
         x) images_only=true ;;
         z) iso_only=true ;;

bin/buildpkg.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 shopt -s nullglob
 
@@ -20,16 +20,12 @@ SYSCONFDIR='@sysconfdir@'
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-chroot.sh
-import ${LIBDIR}/util-pkg.sh
 
 show_pkg(){
-    check_build "$1"
-    cd $1
-        source PKGBUILD
-        for n in ${pkgname[@]}; do
-            msg2 "%s" "$n"
-        done
-    cd ..
+    source PKGBUILD
+    for n in ${pkgname[@]}; do
+        msg2 "%s" "$n"
+    done
 }
 
 display_settings(){
@@ -37,10 +33,8 @@ display_settings(){
     show_config
 
     msg "OPTIONS:"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "chroots_pkg: %s" "${chroots_pkg}"
-    msg2 "repository: %s" "${repository}"
-    msg2 "stablility: %s" "${stablility}"
+    msg2 "CHROOTS_PKG: %s" "${CHROOTS_PKG}"
+    msg2 "REPOSITORY: %s" "${REPOSITORY}"
 
     msg "ARGS:"
     msg2 "create_first: %s" "${create_first}"
@@ -48,7 +42,7 @@ display_settings(){
     msg2 "mkchrootpkg_args: %s" "${mkchrootpkg_args[*]}"
 
     msg "BUILD:"
-    show_pkg "${package}"
+    show_pkg
 }
 
 load_user_info
@@ -61,62 +55,43 @@ pretend=false
 mkchroot_args=()
 mkchrootpkg_args=(-c -n)
 
-install_pkgs=()
-
-package=''
-cmd=${0##*/}
-stablility=${cmd##*-}
-repository=${PWD##*/}
-base_devel=('base-devel')
+REPOSITORY='default'
 
 prepare_build(){
-    local pac_arch='default' pac_conf=
+    local pac_file= mp_file='makepkg.conf'
 
-    if [[ "${target_arch}" == 'lib32' ]];then
-        pac_arch='lib32'
-        base_devel+=('multilib-devel')
-    fi
+    base_devel=('base-devel')
 
-    if [[ ${stablility} == 'buildpkg' ]];then
-        pac_conf=$pac_arch
-    else
-        pac_conf=$pac_arch-${stablility}
-    fi
+    case ${REPOSITORY} in
+        'system'|'world'|'galaxy') REPOSITORY='default' ;;
+        lib32*) base_devel+=('multilib-devel') ;;
+        galaxy-gremlins|galaxy-goblins) REPOSITORY=${REPOSITORY#*-} ;;
+    esac
+    local pac_file="pacman-${REPOSITORY}.conf"
 
-    [[ "$pac_arch" == 'lib32' ]] && target_arch='x86_64'
+    local pacman_conf="${DATADIR}/$pac_file"
+    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
 
-    local pacman_conf="${DATADIR}/pacman-$pac_conf.conf"
-    [[ -f $AT_USERCONFDIR/pacman-$pac_conf.conf ]] && pacman_conf="$AT_USERCONFDIR/pacman-$pac_conf.conf"
-    work_dir="${chroots_pkg}/${repository}-${target_arch}"
+    work_dir="${CHROOTS_PKG}/${REPOSITORY}-${ARCH}"
 
-    local makepkg_conf="${DATADIR}/makepkg-${target_arch}.conf"
-    [[ -f $AT_USERCONFDIR/makepkg-${target_arch}.conf ]] && makepkg_conf="$AT_USERCONFDIR/makepkg-${target_arch}.conf"
+    local makepkg_conf="${DATADIR}/$mp_file"
+    [[ -f $AT_USERCONFDIR/$mp_file ]] && makepkg_conf="$AT_USERCONFDIR/$mp_file"
 
     mkchroot_args+=(-C "${pacman_conf}" -M "${makepkg_conf}" "${work_dir}/root")
 
     mkchrootpkg_args+=(-r "${work_dir}" "${makepkg_args[@]}")
-
-    timer_start=$(get_timer)
 }
 
 build(){
     local timer_start=$(get_timer)
-    if [[ -f ${package}/PKGBUILD ]];then
-        cd ${package}
-    else
-        die "Directory must contain a PKGBUILD!"
-    fi
-    msg "Start building [%s] (%s)" "${package}" "${repository}"
+
     exec mkchrootpkg "${mkchrootpkg_args[@]}"
     show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }
 
 usage() {
     echo "Usage: ${0##*/} [options] -- [makepkg_args]"
-    echo "    -p <pkg>           Package to build [default: ${package}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
-    echo "    -r <dir>           Chroots directory [default: ${chroots_pkg}]"
-    echo '    -z <repo>          Repo name'
+    echo "    -r <dir>           Repository [default: ${REPOSITORY}]"
     echo '    -c                 Create root chroot'
     echo '    -q                 Query settings and pretend build'
     echo '    -h                 This help'
@@ -128,14 +103,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:z:cqh'
+opts='r:cqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) package="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
-        r) chroots_pkg="$OPTARG" ;;
-        z) repository="$OPTARG" ;;
+        r) REPOSITORY="$OPTARG" ;;
         c) create_first=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
@@ -143,7 +115,6 @@ while getopts "${opts}" arg; do
     esac
 done
 
-# shift $(($OPTIND - 1))
 makepkg_args+=("${@:$OPTIND}")
 
 check_root
@@ -153,7 +124,7 @@ prepare_build
 ${pretend} && display_settings && exit
 
 if ${create_first} || [[ ! -d ${work_dir}/root ]];then
-    msg "Creating chroot for [%s] (%s)..." "${repository}" "${target_arch}"
+    msg "Creating chroot for [%s] (%s)..." "${REPOSITORY}" "${ARCH}"
 
     for copy in "${work_dir}"/*; do
         [[ -d $copy ]] || continue
@@ -168,7 +139,7 @@ if ${create_first} || [[ ! -d ${work_dir}/root ]];then
 
     rm -rf --one-file-system "${work_dir}"
     mkdir -p "${work_dir}"
-    setarch "${target_arch}" mkchroot \
+    setarch "${ARCH}" mkchroot \
         "${mkchroot_args[@]}"  "${base_devel[@]}" || abort
 else
     lock 9 "${work_dir}/root.lock" "Locking clean chroot"
@@ -176,4 +147,4 @@ else
         pacman -Syu --noconfirm || abort
 fi
 
-build "${package}"
+build

bin/buildtree.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'
@@ -18,49 +18,281 @@ DATADIR='@datadir@'
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
-import ${LIBDIR}/util-pkg-tree.sh
+import ${LIBDIR}/util-pkg-gitea.sh
+import ${LIBDIR}/util-pkg-subrepo.sh
+
+pull_tree_arch(){
+    cd ${TREE_DIR_ARCH}
+    for tree in ${tree_names[@]};do
+        if [[ -d ${tree} ]];then
+            cd ${tree}
+            msg "Checking (%s)" "${tree}"
+            pull_tree
+            cd ..
+        else
+            msg "Cloning (%s) ..." "$tree"
+            clone_tree "${HOST_TREE_ARCH}/${tree}"
+        fi
+    done
+}
+
+config_tree(){
+    local tree="$1"
+    cd $tree
+        git config --bool pull.rebase true
+        git config commit.gpgsign true
+        if [[ -n "${GPGKEY}" ]];then
+            git config user.signingkey "${GPGKEY}"
+        else
+            warning "No GPGKEY configured in makepkg.conf!"
+        fi
+    cd ..
+}
+
+pull_tree_artix(){
+    cd ${TREE_DIR_ARTIX}
+    for tree in ${tree_names[@]};do
+        if [[ -d ${tree} ]];then
+            config_tree "${tree}"
+            cd ${tree}
+            msg "Checking (%s)" "${tree}"
+            pull_tree
+            cd ..
+        else
+            msg "Cloning (%s) ..." "$tree"
+            clone_tree "${HOST_TREE_ARTIX}/${tree}"
+            config_tree "${tree}"
+        fi
+    done
+}
+
+show_version_table(){
+    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
+
+    for tree in ${tree_names[@]};do
+
+        local git=$(find ${TREE_DIR_ARTIX}/$tree/ -mindepth 1 -maxdepth 1 -type d)
+
+        for package in ${git[@]}; do
+
+            local pkg=${package##*/}
+            local artixrepo=$(find_repo "$package" "${unstable}" "${staging}")
+            local artixshow=${artixrepo%-*}
+            local pkgbuild=$package/repos/$artixrepo/PKGBUILD
+
+            if [[ -f $pkgbuild ]];then
+
+                source $pkgbuild 2>/dev/null
+                local artixver=$(get_full_version $pkg)
+
+                local archpath=${TREE_DIR_ARCH}/$tree/$pkg
+                local archrepo=$(find_repo "$archpath" "${unstable}" "${staging}")
+                local archshow=${archrepo%-*}
+                pkgbuild=$archpath/repos/$archrepo/PKGBUILD
+
+                if [[ -f $pkgbuild ]];then
+                    source $pkgbuild 2>/dev/null
+                    local archver=$(get_full_version $pkg)
+                fi
+
+                if ${artix};then
+
+                    if [ $(vercmp "$artixver" "$archver") -eq 0 ] || [ $(vercmp "$artixver" "$archver") -gt 0 ];then
+                        case $artixrepo in
+                            *staging*)
+                                if [[ "$archrepo" == "$artixrepo" ]];then
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                                else
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                                fi
+                            ;;
+                            *testing*)
+                                if [[ "$archrepo" == "$artixrepo" ]];then
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                                else
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                                fi
+                            ;;
+                        esac
+                    fi
+
+                else
+
+                    if [ $(vercmp "$artixver" "$archver") -lt 0 ];then
+                        ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                    fi
+
+                    if [ $(vercmp "$artixver" "$archver") -gt 0 ];then
+                        if [[ -n $archver ]] && [[ -n $archrepo ]];then
+                            ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                        fi
+                    fi
+
+                fi
+                unset pkgver epoch pkgrel artixver archver
+
+            fi
+        done
+    done
+}
+
+sync_pkg(){
+    local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
+    local src="$1" dest="$2" tree="$3"
+
+    info "Sync from archlinux (%s)" "$git_tree_arch"
+    rsync "${rsync_args[@]}" $src/ $dest/
+}
+
+show_deps(){
+    local src="$1" repo="$2"
+
+    source $src/PKGBUILD 2>/dev/null
+
+    [[ $arch == 'any' ]] && CARCH=any
+
+    local archver=$(get_full_version $pkg)
+
+    msg "git tree: %s" "$git_tree_arch"
+    msg2 "repo: %s" "$repo"
+    [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
+    msg2 "pkgname: %s" "${pkgname[*]}"
+    [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
+    msg2 "Arch Version: %s" "$archver"
+    msg2 "arch: %s" "$CARCH"
+
+    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
+    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
+}
+
+from_arch(){
+    local pkg="$1" src= dest=
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+
+    local package=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$package" "${unstable}")
+
+    src=$package/repos/$repo
+
+    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "$pkg")
+    dest=${TREE_DIR_ARTIX}/$git_tree_artix/$pkg/trunk
+
+    show_deps "$src" "$repo"
+
+    if [[ -d $dest ]];then
+        cd ${TREE_DIR_ARTIX}/$git_tree_artix
+
+        source $dest/PKGBUILD 2>/dev/null
+        local artixver=$(get_full_version $pkg)
+
+        msg2 "Artix Version: %s" "$artixver"
+        sync_pkg "$src" "$dest" "$git_tree_arch"
+        patch_pkg "$pkg"
+    else
+        [[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
+        [[ $git_tree_arch == 'community' ]] && git_tree_artix=$git_tree_arch
+
+        local pkg_path=${TREE_DIR_ARTIX}/$git_tree_artix/$pkg
+
+        cd ${TREE_DIR_ARTIX}/$git_tree_artix
+
+        local org=$(get_pkg_org "$pkg")
+
+        create_repo "$pkg" "$org"
+
+        add_repo_to_team "$pkg" "$org" "$git_tree_artix"
+
+        subrepo_clone "$pkg" "$org"
+
+        cd $pkg_path
+        commit_jenkins_files
+
+        dest=$pkg_path/trunk
+
+        sync_pkg "$src" "$dest" "$git_tree_arch"
+    fi
+}
+
+view_build(){
+    local pkg="$1" src=
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+
+    local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$pkg_path" "${unstable}")
+
+    src=$pkg_path/repos/$repo
+
+    show_deps "$src" "$repo"
+}
+
+sync_repos(){
+    ${sync_arch} && pull_tree_arch
+    pull_tree_artix
+}
 
 display_settings(){
     show_version
     show_config
 
-    msg "REPOS:"
-    msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
-    msg2 "repo_tree_artix: %s" "${repo_tree_artix[*]}"
+    msg "OPTIONS:"
+    msg2 "PACKAGE: %s" "${PACKAGE}"
 
     msg "ARGS:"
-    msg2 "artix: %s" "${artix}"
-    msg2 "arch: %s" "${arch}"
+    msg2 "sync: %s" "${sync}"
+    msg2 "sync_arch: %s" "${sync_arch}"
     msg2 "compare: %s" "${compare}"
-    msg2 "import_arch: %s" "${import_arch}"
-    msg2 "gitpush: %s" "${gitpush}"
+    msg2 "upgrades: %s" "${upgrades}"
+    msg2 "downgrades: %s" "${downgrades}"
+    msg2 "artix: %s" "${artix}"
+    msg2 "staging: %s" "${staging}"
+    msg2 "unstable: %s" "${unstable}"
+    msg2 "import: %s" "${import}"
+    msg2 "view: %s" "${view}"
 
     msg "PATHS:"
-    msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
-    msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
-    msg2 "patches_dir: %s" "${patches_dir}"
+    msg2 "TREE_DIR_ARTIX: %s" "${TREE_DIR_ARTIX}"
+    msg2 "TREE_DIR_ARCH: %s" "${TREE_DIR_ARCH}"
 }
 
 load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
 
 pretend=false
-arch=false
-artix=false
+sync=false
+sync_arch=true
 compare=false
-import_arch=false
-gitpush=false
+unstable=false
+staging=true
+upgrades=false
+downgrades=false
+artix=false
+import=false
+view=false
 
-rsync_args=(-aWxv --progress --delete-before --no-R --no-implied-dirs)
+PACKAGE=''
+tree_names=(packages community)
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -a            Sync arch tree"
-    echo "    -s            Sync artix tree"
-    echo "    -c            Compare artix and arch versions"
-    echo '    -i            Import arch packages'
-    echo '    -p            Push import packages'
+    echo '    -p <pkg>      Package name'
+    echo "    -s            Clone or pull repos"
+    echo "    -z            Don't clone or pull arch repos"
+    echo '    -c            Compare packages'
+    echo '    -u            Show upgrade packages'
+    echo '    -d            Show downgrade packages'
+    echo '    -a            Show testing packages'
+    echo "    -y            Don't inlcude staging packages"
+    echo '    -x            Include unstable kde and gnome'
+    echo '    -i            Import a package from arch repos'
+    echo "    -w            Don't write Jenkinsfile and agent.yaml on import"
+    echo '    -v            View package depends'
     echo '    -q            Query settings'
     echo '    -h            This help'
     echo ''
@@ -70,15 +302,21 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='aipscqh'
+opts='p:csudayizxvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        a) arch=true ;;
-        s) artix=true ;;
+        p) PACKAGE="$OPTARG" ;;
+        s) sync=true ;;
+        z) sync_arch=false ;;
         c) compare=true ;;
-        i) import_arch=true ;;
-        p) gitpush=true ;;
+        u) upgrades=true ;;
+        d) downgrades=true ;;
+        a) artix=true ;;
+        y) staging=false ;;
+        i) import=true ;;
+        v) view=true ;;
+        x) unstable=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -87,16 +325,15 @@ done
 
 shift $(($OPTIND - 1))
 
-prepare_dir "${tree_dir_artix}"
-prepare_dir "${tree_dir_arch}"
-prepare_dir "${patches_dir}"
+prepare_dir "${TREE_DIR_ARTIX}"
+prepare_dir "${TREE_DIR_ARCH}"
 
 ${pretend} && display_settings && exit 1
 
-${artix} && sync_tree_artix
+${sync} && sync_repos
 
-${arch} && sync_tree_arch
+${view} && view_build "${PACKAGE}"
 
 ${compare} && show_version_table
 
-${import_arch} && import_from_arch ${gitpush}
+${import} && from_arch "${PACKAGE}"

bin/buildyaml.in

@@ -1,107 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-version=@version@
-
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-yaml-check.sh
-import ${LIBDIR}/util-profile.sh
-
-show_profile(){
-    msg2 "yaml_dir: %s" "${yaml_dir}"
-    msg2 "autologin: %s" "${autologin}"
-
-    msg2 "netgroups: %s" "$(get_yaml)"
-
-    msg2 "hostname: %s" "${hostname}"
-    msg2 "username: %s" "${username}"
-    msg2 "password: %s" "${password}"
-    msg2 "addgroups: %s" "${addgroups}"
-
-    msg2 "enable_live: %s" "${enable_live[*]}"
-    msg2 "openrc_boot: %s" "${openrc_boot[*]}"
-    msg2 "openrc_default: %s" "${openrc_default[*]}"
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "initsys: %s" "${initsys}"
-    msg2 "kernel: %s" "${kernel}"
-
-    msg "ARGS:"
-    msg2 "group: %s" "${group}"
-    msg2 "calamares: %s" "${calamares}"
-
-    msg "BUILD:"
-    show_profile
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-pretend=false
-group=false
-cache_dir_netinstall="${workspace_dir}/netinstall"
-calamares=false
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Buildset or profile [default: ${profile}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
-    echo "    -k <name>          Kernel to use[default: ${kernel}]"
-    echo "    -i <name>          Init system to use [default: ${initsys}]"
-    echo '    -g                 Enable pacman group accepted for -p'
-    echo '    -c                 Check also calamares yaml files generated for the profile'
-    echo '    -q                 Query settings'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:a:i:k:gcqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) profile="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
-        g) group=true ;;
-        c) calamares=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-prepare_build
-
-${pretend} && display_settings && exit 1
-
-${group} && write_pacman_group_yaml "${profile}" && exit 0
-
-build

bin/checkpkg.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 

bin/chroot-run.in

@@ -9,7 +9,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
+
+chroot_version=@chroot_version@
 
 LIBDIR='@libdir@'
 
@@ -20,7 +22,6 @@ import ${LIBDIR}/util-mount.sh
 
 working_dir=''
 files=()
-keep_mirrors=false
 nosetarch=false
 
 usage() {
@@ -87,12 +88,13 @@ copy_hostconf () {
         cp -T "$file" "$working_dir$file"
     done
 
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$1/etc/pacman.conf"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$1/etc/pacman.conf"
 }
 
 chroot_extra_mount() {
-    chroot_mount "/etc/resolv.conf" "$1/etc/resolv.conf" -B
-    chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
+    chroot_add_resolv_conf "$1"
+    chroot_mount "/etc/hosts" "$1/etc/hosts" -B
+#     chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
     chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 
     for cache_dir in ${cache_dirs[@]:1}; do
@@ -113,8 +115,8 @@ umask 0022
 # Sanity check
 if [[ ! -f "$working_dir/.artools" ]]; then
     die "'%s' does not appear to be an artix chroot." "$working_dir"
-elif [[ $(cat "$working_dir/.artools") != $version ]]; then
-    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$version"
+elif [[ $(cat "$working_dir/.artools") != $chroot_version ]]; then
+    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$chroot_version"
 fi
 
 chroot_api_mount "${working_dir}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"

bin/commitpkg.in

@@ -0,0 +1,202 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+VERSION=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+DATADIR='@datadir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-pkg.sh
+import ${LIBDIR}/util-pkg-subrepo.sh
+
+is_valid_repo(){
+    local src="$1"
+    case $src in
+        core|extra|community|multilib|testing|staging|community-testing|community-staging|multilib-testing|multilib-staging|trunk) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+commit_pkg(){
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    if [[ -n ${git_tree} ]];then
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
+
+        source trunk/PKGBUILD
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${PACKAGE}")
+        local commit_msg=""
+
+        if ${remove};then
+            local action='remove'
+            if [[ "${REPO_SRC}" == 'trunk' ]];then
+                local pkg=${PACKAGE}
+                git rm -r trunk
+            else
+                local pkg="${PACKAGE}-$ver"
+                git rm -r repos/"${REPO_SRC}-$CARCH"
+            fi
+            commit_msg="[${REPO_SRC}] '$pkg' ${action}"
+            msg "Action: %s" "$commit_msg"
+        else
+            local action='modify'
+            commit_msg="[${REPO_SRC}] '${PACKAGE}-$ver' ${action}"
+            msg "Action: %s" "$commit_msg"
+            git add .
+
+        fi
+        git commit -m "$commit_msg"
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}
+
+        if ${push};then
+            msg2 "Check (%s)" "${git_tree}"
+            git pull origin master
+
+            msg2 "Update (%s)" "${PACKAGE}"
+            subrepo_push "${PACKAGE}"
+#             sleep 1
+            msg2 "Update (%s)" "${git_tree}"
+            git push origin master
+        fi
+        git prune
+    else
+        error "Package '%s' does not exist!" "${PACKAGE}"
+    fi
+}
+
+symlink_commit_pkg(){
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    if [[ -n ${git_tree} ]];then
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
+
+        source trunk/PKGBUILD
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${PACKAGE}")
+
+        if [[ ${REPO_SRC} == 'trunk' ]];then
+            local action='add'
+            local dest="${REPO_DEST}-$CARCH"
+
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp trunk/* repos/$dest/
+        else
+            local action='move'
+            local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"
+
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp repos/$src/* repos/$dest/
+            git rm -r repos/$src
+        fi
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$ver' ${action}"
+        msg "Action: %s" "$commit_msg"
+
+        git add .
+        git commit -m "$commit_msg"
+
+        cd ${TREE_DIR_ARTIX}/${git_tree}
+
+        if ${push};then
+            msg2 "Check (%s)" "${git_tree}"
+            git pull origin master
+
+            msg2 "Update (%s)" "${PACKAGE}"
+            subrepo_push "${PACKAGE}"
+#             sleep 1
+            msg2 "Update (%s)" "${git_tree}"
+            git push origin master
+        fi
+        git prune
+    else
+        error "Package '%s' does not exist!" "${PACKAGE}"
+    fi
+}
+
+display_settings(){
+    show_version
+    show_config
+
+    msg "OPTIONS:"
+    msg2 "REPO_SRC: %s" "${REPO_SRC}"
+    msg2 "REPO_DEST: %s" "${REPO_DEST}"
+    msg2 "PACKAGE: %s" "${PACKAGE}"
+
+    msg "ARGS:"
+    msg2 "remove: %s" "${remove}"
+    msg2 "push: %s" "${push}"
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+REPO_SRC='trunk'
+PACKAGE=''
+remove=false
+push=false
+pretend=false
+
+cmd=${0##*/}
+REPO_DEST=${cmd%pkg}
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -s <name>          Source repository [default:${REPO_SRC}]"
+    echo '    -p <pkg>           Package name'
+    echo '    -r                 Delete from repo (commitpkg only)'
+    echo '    -u                 Push'
+    echo '    -q                 Query settings and pretend'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='p:s:urqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        s) REPO_SRC="$OPTARG" ;;
+        p) PACKAGE="$OPTARG" ;;
+        r) remove=true ;;
+        u) push=true ;;
+        q) pretend=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+${pretend} && display_settings && exit 1
+
+if $(is_valid_repo "${REPO_SRC}");then
+    if [[ "${cmd}" == 'commitpkg' ]];then
+        commit_pkg
+    else
+        symlink_commit_pkg
+    fi
+else
+    error "source repository '%s' is not valid!" "${REPO_SRC}"
+fi

bin/deployiso.in

@@ -9,43 +9,48 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-iso-publish.sh
+
+connect(){
+    echo "${ACCOUNT}@${FILE_HOST}:${FILE_HOME}"
+}
+
+prepare_transfer(){
+    DEST_DIR="/iso/${PROFILE}/"
+    SRC_DIR="${ISO_POOL}/${PROFILE}/"
+}
+
+sync_dir(){
+    msg "Start upload [%s] ..." "${PROFILE}"
+    rsync "${rsync_args[@]}" ${SRC_DIR} $(connect)${DEST_DIR}
+    msg "Done upload [%s]" "${PROFILE}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}
 
 display_settings(){
     show_version
     show_config
 
     msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "uplimit: %s kB/s" "${uplimit}"
+    msg2 "PROFILE: %s" "${PROFILE}"
+    msg2 "UPLIMIT: %s kB/s" "${UPLIMIT}"
 
     msg "ARGS:"
     msg2 "update: %s" "${update}"
     msg2 "verbose: %s" "${verbose}"
-    msg2 "torrent: %s" "${torrent}"
-
-    if ${torrent};then
-        msg2 "tracker_url: %s" "${tracker_url}"
-        msg2 "piece_size: %s" "${piece_size}"
-        msg2 "host_mirrors: %s" "${host_mirrors[*]}"
-        msg2 "torrent_meta: %s" "${torrent_meta}"
-    fi
 
     msg "REMOTE:"
-    msg2 "account: %s" "${account}"
-    msg2 "file_host: %s" "${file_host}"
-    msg2 "project: %s" "${project}"
+    msg2 "ACCOUNT: %s" "${ACCOUNT}"
 
     msg "UPLOAD:"
-    msg2 "src_dir: ${src_dir}"
-    msg2 "target_dir: ${target_dir}"
+    msg2 "SRC_DIR: ${SRC_DIR}"
+    msg2 "DEST_DIR: ${DEST_DIR}"
 }
 
 load_user_info
@@ -55,16 +60,14 @@ load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artoo
 pretend=false
 update=false
 verbose=false
-torrent=false
 
-rsync_args=(-aP --progress -e ssh)
+rsync_args=(-aP --progress -e "ssh -p ${FILE_PORT}")
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -p                 Source folder to upload [default: ${profile}]"
-    echo "    -l                 Limit bandwidth in kB/s [default:${uplimit}]"
+    echo "    -p                 Source folder to upload [default: ${PROFILE}]"
+    echo "    -l                 Limit bandwidth in kB/s [default:${UPLIMIT}]"
     echo '    -u                 Update remote directory'
-    echo '    -t                 Create iso torrent'
     echo '    -q                 Query settings and pretend upload'
     echo '    -v                 Verbose output'
     echo '    -h                 This help'
@@ -73,14 +76,13 @@ usage() {
     exit $1
 }
 
-opts='p:l:uvtqh'
+opts='p:l:uvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) profile="$OPTARG" ;;
-        l) limit="$OPTARG" ;;
+        p) PROFILE="$OPTARG" ;;
+        l) UPLIMIT="$OPTARG" ;;
         u) update=true; rsync_args+=(-u) ;;
-        t) torrent=true ;;
         v) verbose=true; rsync_args+=(-v --stats) ;;
         q) pretend=true; rsync_args+=(-n) ;;
         h|?) usage 0 ;;
@@ -92,7 +94,7 @@ shift $(($OPTIND - 1))
 
 timer_start=$(get_timer)
 
-rsync_args+=(--bwlimit=${uplimit})
+rsync_args+=(--bwlimit=${UPLIMIT})
 
 prepare_transfer
 

bin/deploypkg.in

@@ -9,29 +9,58 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg-publish.sh
+import ${LIBDIR}/util-pkg.sh
+
+update_repo(){
+    local repo="$1" pkgfile ver ext=db.tar.xz
+    local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
+    source PKGBUILD
+    for name in ${pkgname[@]};do
+        [[ $arch == any ]] && CARCH=any
+        ver=$(get_full_version "$name")
+        if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
+            local pkg=${pkgfile##*/}
+            info "Found: %s" "$pkg"
+            if ${add_pkg};then
+                local action='add'
+                packages+=("$pkg")
+                checkpkg "${pkgfile}"
+                if ${sign_pkg};then
+                    [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
+                    signfile ${pkgfile}
+                fi
+                ln -sf ${pkgfile}{,.sig} $repo_path/
+            elif ${del_pkg};then
+                local action='remove'
+                packages+=("$name")
+                [[ -e $repo_path/$pkg ]] && rm $repo_path/$pkg
+                [[ -e $repo_path/$pkg.sig ]] && rm $repo_path/$pkg.sig
+            fi
+        fi
+    done
+    cd $repo_path
+    [[ -n $action ]] && repo-$action -R $repo.$ext ${packages[@]}
+    return 0
+}
 
 display_settings(){
     show_version
     show_config
 
     msg "OPTIONS:"
-    msg2 "repository: %s" "${repository}"
-    msg2 "to_repository: %s" "${to_repository}"
-    msg2 "package: %s" "${package[@]}"
-    msg2 "target_arch: %s" "${target_arch}"
+    msg2 "REPOSITORY: %s" "${REPOSITORY}"
 
     msg "ARGS:"
     msg2 "add_pkg: %s" "${add_pkg}"
     msg2 "del_pkg: %s" "${del_pkg}"
-    msg2 "move_pkg: %s" "${move_pkg}"
+    msg2 "sign_pkg: %s" "${sign_pkg}"
 }
 
 load_user_info
@@ -43,22 +72,15 @@ load_vars /etc/makepkg.conf
 pretend=false
 add_pkg=false
 del_pkg=false
-move_pkg=false
-package=''
-repository=${PWD##*/}
-to_repository=${PWD##*/}
-
-rsync_args=(-rtxisP --progress --delete -e ssh)
+REPOSITORY=
+sign_pkg=false
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -a                 Repository arch [default:${target_arch}]"
-    echo "    -r                 Repository [default:${repository}]"
-    echo "    -t                 Repository to move to [default:${to_repository}]"
-    echo "    -p                 Package name to add/delete"
-    echo '    -x                 Add package to repository'
-    echo '    -y                 Delete package from repository'
-    echo '    -m                 Move packages from source to destination repository'
+    echo "    -d                 Destination repository [default:${REPOSITORY}]"
+    echo '    -a                 Add package(s) to repository'
+    echo '    -r                 Remove package(s) from repository'
+    echo '    -s                 Sign package(s)'
     echo '    -q                 Query settings and pretend upload'
     echo '    -h                 This help'
     echo ''
@@ -68,17 +90,14 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:t:xymqh'
+opts='d:arsqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        a) target_arch="$OPTARG" ;;
-        r) repository="$OPTARG" ;;
-        p) package="$OPTARG" ;;
-        t) to_repository="$OPTARG" ;;
-        m) move_pkg=true ;;
-        x) add_pkg=true ;;
-        y) del_pkg=true ;;
+        d) REPOSITORY="$OPTARG" ;;
+        a) add_pkg=true; del_pkg=false ;;
+        r) del_pkg=true; add_pkg=false ;;
+        s) sign_pkg=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -87,16 +106,8 @@ done
 
 shift $(($OPTIND - 1))
 
-timer_start=$(get_timer)
-
-prepare_dir "${repos_root}"
+prepare_dir "${REPOS_ROOT}"
 
 ${pretend} && display_settings && exit 1
 
-${move_pkg} && move_to_repo "${repository}" "${to_repository}" "${target_arch}"
-
-${del_pkg} && del_from_repo "${repository}" "${target_arch}" "${package}"
-
-${add_pkg} && add_to_repo "${repository}" "${target_arch}" "${package}"
-
-exit 0
+update_repo "${REPOSITORY}"

bin/find-libdeps.in

@@ -9,13 +9,30 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util-pkg.sh
 
+# $1: sofile
+# $2: soarch
+process_sofile() {
+    # extract the library name: libfoo.so
+    local soname="${1%.so?(+(.+([0-9])))}".so
+    # extract the major version: 1
+    soversion="${1##*\.so\.}"
+    if [[ "$soversion" = "$1" ]] && (($IGNORE_INTERNAL)); then
+        continue
+    fi
+    if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then
+    # libfoo.so=1-64
+        msg "${soname}=${soversion}-$2"
+        soobjects+=("${soname}=${soversion}-$2")
+    fi
+}
+
 set -e
 shopt -s extglob
 

bin/finddeps.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 

bin/findupdates.in

@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg.sh
-import ${LIBDIR}/util-pkg-tree.sh
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-declare -A UPDATES
-msg_table_header "%-30s %-30s %-30s %-30s" "Repository" "Package" "Artix version" "Arch version"
-for repo in ${repo_tree_artix[@]}; do
-    for pkg in ${tree_dir_artix}/$repo/*; do
-        if [[ -f $pkg/PKGBUILD ]];then
-            source $pkg/PKGBUILD 2>/dev/null
-            package=${pkg##*/}
-            artixver=$(get_full_version $package)
-            set_import_path "$repo" "$package"
-            if [[ -f $src/PKGBUILD ]];then
-                source $src/PKGBUILD 2>/dev/null
-                archver=$(get_full_version $package)
-            fi
-            if [ $(vercmp $artixver $archver) -lt 0 ];then
-                UPDATES[$package]="$src/PKGBUILD $pkg/PKGBUILD"
-                msg_row_update "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
-            else
-                msg_row "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
-            fi
-        fi
-        unset pkgver epoch pkgrel artixver archver package
-    done
-done
-
-for upd in "${!UPDATES[@]}"; do
-    msg "Diff: %s" "$upd"
-    diff -u ${UPDATES[$upd]}
-done

bin/fstabgen.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 shopt -s extglob
 
@@ -64,6 +64,13 @@ optstring_apply_quirks() {
     # one might install Arch from a Fedora environment), so let's remove it.
     optstring_remove_option "$varname" seclabel
 
+    # Prune 'relatime' option for any pseudofs. This seems to be a rampant
+    # default which the kernel often exports even if the underlying filesystem
+    # doesn't support it. Example: https://bugs.archlinux.org/task/54554.
+    if awk -v fstype="$fstype" '$1 == fstype { exit 1 }' /proc/filesystems; then
+        optstring_remove_option "$varname" relatime
+    fi
+
     case $fstype in
         f2fs)
         # These are Kconfig options for f2fs. Kernels supporting the options will
@@ -86,6 +93,7 @@ usage() {
 usage: ${0##*/} [options] root
 
   Options:
+    -f FILTER      Restrict output to mountpoints matching the prefix FILTER
     -L             Use labels for source identifiers (shortcut for -t LABEL)
     -p             Exclude pseudofs mounts (default behavior)
     -P             Include printing mounts
@@ -105,10 +113,11 @@ if [[ -z $1 || $1 = @(-h|--help) ]]; then
   exit $(( $# ? 0 : 1 ))
 fi
 
-while getopts ':LPpt:U' flag; do
+while getopts ':f:LPpt:U' flag; do
     case $flag in
         L) bytag=LABEL ;;
         U) bytag=UUID ;;
+        f) prefixfilter=$OPTARG ;;
         P) pseudofs=1 ;;
         p) pseudofs=0 ;;
         t) bytag=${OPTARG^^} ;;
@@ -132,6 +141,8 @@ while read -r src target fstype opts fsroot; do
         continue
     fi
 
+    [[ $target = "$prefixfilter"* ]] || continue
+
     # default 5th and 6th columns
     dump=0 pass=2
 

bin/lddd.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 

bin/mkchroot.in

@@ -9,7 +9,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
+
+chroot_version=@chroot_version@
 
 LIBDIR='@libdir@'
 
@@ -20,19 +22,18 @@ import ${LIBDIR}/util-chroot.sh
 working_dir=''
 files=()
 
-build_locales=false
-keep_mirrors=false
-keep_flag=''
 nosetarch=false
+copy_mirrorlist=true
+basestrap_args=(-Gc)
 
 usage() {
     echo "Usage: ${0##*/} [options] working-dir package-list..."
     echo ' options:'
     echo '    -C <file>     Location of a pacman config file'
     echo '    -M <file>     Location of a makepkg config file'
-    echo '    -U <url>      Set a specific mirror'
     echo '    -c <dir>      Set pacman cache'
     echo '    -f <file>     Copy file from the host to the chroot'
+    echo '    -m            Do not copy mirrorlist to the chroot'
     echo '    -s            Do not run setarch'
     echo '    -h            This message'
     exit 1
@@ -40,16 +41,16 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='hC:M:U:c:f:s'
+opts='hC:M:c:f:sm'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf="$OPTARG" ;;
         M) makepkg_conf="$OPTARG" ;;
-        U) mirror="$OPTARG" ;;
         c) cache_dir="$OPTARG" ;;
         f) files+=("$OPTARG") ;;
         s) nosetarch=true ;;
+        m) copy_mirrorlist=false; basestrap_args+=(-M) ;;
         h|?) usage ;;
         *) error "invalid argument '%s'" "$arg"; usage ;;
     esac
@@ -71,9 +72,6 @@ else
     cache_dirs=(${cache_dir})
 fi
 
-basestrap_args=(-Gcd ${pacman_conf:+-C "$pacman_conf"})
-[[ -n ${mirror} ]] && basestrap_args+=(-M)
-
 umask 0022
 
 #[[ -e $working_dir ]] && die "Working directory '%s' already exists" "$working_dir"
@@ -102,17 +100,21 @@ while read -r varname; do
     _env+=("$varname=${!varname}")
 done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
 env -i "${_env[@]}" \
-basestrap "${basestrap_args[@]}" "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
+basestrap "${basestrap_args[@]}" ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
 
-echo "$version" > "$working_dir/.artools"
+echo "$chroot_version" > "$working_dir/.artools"
 
-default_locale "set" "$working_dir"
+if [[ ! -f "$working_dir/etc/locale.gen.orig" ]];then
+    mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.orig"
+fi
+printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
+echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
+
+dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 
 chroot_args=(${pacman_conf:+-C "$pacman_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${cache_dir:+-c "$cache_dir"})
 ${nosetarch} && chroot_args+=(${nosetarch:+-s})
 
-[[ -n ${mirror} ]] && default_mirror "$working_dir" "$mirror"
-
 exec chroot-run \
     "${chroot_args[@]}" \
     "$working_dir" locale-gen

bin/mkchrootpkg.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 
@@ -19,29 +19,6 @@ import ${LIBDIR}/util-chroot.sh
 
 shopt -s nullglob
 
-init_variables() {
-    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-    makepkg_args=("${default_makepkg_args[@]}")
-    keepbuilddir=false
-    update_first=false
-    clean_first=false
-    run_namcap=false
-    temp_chroot=false
-    chrootdir=
-    passeddir=
-    makepkg_user=
-    declare -ga install_pkgs
-    declare -gi ret=0
-
-    bindmounts_ro=()
-    bindmounts_rw=()
-
-    copy=$USER
-    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
-    [[ -z "$copy" || $copy = root ]] && copy=copy
-    src_owner=${SUDO_USER:-$USER}
-}
-
 usage() {
     echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
     echo ' Run this script in a PKGBUILD dir to build a package inside a'
@@ -169,7 +146,7 @@ prepare_chroot() {
     local keepbuilddir=$3
     local run_namcap=$4
 
-    $keepbuilddir || rm -rf "$copydir/build"
+    [[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
 
     local builduser_uid="${SUDO_UID:-$UID}"
     local builduser_gid="$(id -g "$builduser_uid")"
@@ -179,16 +156,17 @@ prepare_chroot() {
     # We can't use useradd without chrooting, otherwise it invokes PAM modules
     # which we might not be able to load (i.e. when building i686 packages on
     # an x86_64 host).
-    sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,group}
+    sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,shadow,group}
     printf >>"$copydir/etc/group"  'builduser:x:%d:\n' $builduser_gid
     printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' $builduser_uid $builduser_gid
+    printf >>"$copydir/etc/shadow" 'builduser:!!:%d::::::\n' "$(( $(date -u +%s) / 86400 ))"
 
     $install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
 
-    for x in .gnupg/pubring.{kbx,gpg}; do
-        [[ -r $USER_HOME/$x ]] || continue
-        $install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
-    done
+#     for x in .gnupg/pubring.{kbx,gpg}; do
+#         [[ -r $USER_HOME/$x ]] || continue
+#         $install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
+#     done
 
     sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
     for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
@@ -208,9 +186,10 @@ EOF
     {
         printf '#!/bin/bash\n'
         declare -f _chrootbuild
+        declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
         printf '_chrootbuild "$@" || exit\n'
 
-        if $run_namcap; then
+        if [[ $run_namcap = true ]]; then
             declare -f _chrootnamcap
             printf '_chrootnamcap || exit\n'
         fi
@@ -221,10 +200,23 @@ EOF
 # These functions aren't run in makechrootpkg,
 # so no global variables
 _chrootbuild() {
-    exec </dev/console
-    export LANG=en_US.UTF-8
+    # No coredumps
+    ulimit -c 0
+
+    # Work around chroot-run not giving a ctty
+    #exec </dev/console
+
     . /etc/profile
-    sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+
+    #export LANG=en_US.UTF-8
+
+    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+
+    ret=$?
+    case $ret in
+        0|14) return 0;;
+        *) return $ret;;
+    esac
 }
 
 _chrootnamcap() {
@@ -241,17 +233,18 @@ _chrootnamcap() {
 #  - USER
 download_sources() {
     local copydir=$1
-    local src_owner=$2
+    local makepkg_user=$2
 
-    local builddir="$(mktemp -d)"
-    chmod 1777 "$builddir"
+    local builddir
+    builddir="$(mktemp -d)"
+#     chmod 1777 "$builddir"
+    chown "$makepkg_user:" "$builddir"
 
     # Ensure sources are downloaded
-    makepkg_user=${makepkg_user:-$SUDO_USER}
-    sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
-    makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
-    die "Could not download sources."
-    (( $? != 0 )) && die "Could not download sources."
+    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
+        env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
+        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
+        die "Could not download sources."
 
     # Clean up garbage from verifysource
     rm -rf "$builddir"
@@ -286,6 +279,11 @@ move_products() {
     for s in "$copydir"/srcpkgdest/*; do
         chown "$src_owner" "$s"
         mv "$s" "$SRCPKGDEST"
+
+        # Fix broken symlink because of temporary chroot SRCPKGDEST /srcpkgdest
+        if [[ "$PWD" != "$SRCPKGDEST" && -L "$PWD/${s##*/}" ]]; then
+            ln -sf "$SRCPKGDEST/${s##*/}"
+        fi
     done
 }
 # }}}
@@ -293,7 +291,26 @@ move_products() {
 orig_argv=("$0" "$@")
 
 main() {
-    init_variables
+    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
+    makepkg_args=("${default_makepkg_args[@]}")
+    keepbuilddir=false
+    update_first=false
+    clean_first=false
+    run_namcap=false
+    temp_chroot=false
+    chrootdir=
+    passeddir=
+    makepkg_user=
+    declare -ga install_pkgs
+    declare -gi ret=0
+
+    bindmounts_ro=()
+    bindmounts_rw=()
+
+    copy=$USER
+    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+    [[ -z "$copy" || $copy = root ]] && copy=copy
+    src_owner=${SUDO_USER:-$USER}
 
     local opts='hcur:I:l:nTD:d:U:'
 
@@ -317,7 +334,7 @@ main() {
     [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
     makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-    check_root
+    check_root SOURCE_DATE_EPOCH,GNUPGHOME
 
     # Canonicalize chrootdir, getting rid of trailing /
     chrootdir=$(readlink -e "$passeddir")
@@ -380,7 +397,7 @@ main() {
 
     download_sources "$copydir" "$src_owner"
 
-    prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir"
+    prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
 
     bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
 

bin/signfile.in

@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+VERSION=@version@
 
 LIBDIR='@libdir@'
 
@@ -18,8 +18,6 @@ import ${LIBDIR}/util.sh
 
 load_user_info
 
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
 load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf
 
@@ -34,9 +32,5 @@ msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
 if [[ -n "${BUILDBOT_GPGP}" ]]; then
     gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
 else
-    if [[ -f /usr/bin/hellhound ]]; then
-        gpg --batch --passphrase $(hellhound retrieve) --detach-sign "$file_to_sign"
-    else
-        gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
-    fi
+    gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
 fi

data/artools.conf

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

data/base/Packages-Live

@@ -1,9 +0,0 @@
-mkinitcpio-nfs-utils
-nbd
->openrc artix-live-openrc
-squashfs-tools
-artix-live-portable-efi
-virtualbox-guest-modules-artix
-virtualbox-guest-utils
-linux-lts-headers
-

data/base/Packages-Root

@@ -1,83 +0,0 @@
-acpi
-b43-fwcutter
-bash
-btrfs-progs
-bzip2
-coreutils
-crda
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-file
-filesystem
-findutils
-gawk
-gcc-libs
-gettext
-glibc
-grep
-grub
-gzip
-inetutils
-#intel-ucode
-iproute2
-iptables
-iputils
-ipw2100-fw
-ipw2200-fw
-jfsutils
-KERNEL
-less
-licenses
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio-openswap
-nano
-net-tools
-ntfs-3g
->openrc acpid-openrc
->openrc cronie-openrc
->openrc cryptsetup-openrc
->openrc dbus-openrc
->openrc device-mapper-openrc
->openrc dhcpcd-openrc
->openrc elogind-openrc
->openrc haveged-openrc
->openrc lvm2-openrc
->openrc mdadm-openrc
->openrc netifrc
->openrc nfs-utils-openrc
->openrc rsync-openrc
->openrc wpa_supplicant-openrc
-os-prober
-pacman
-pciutils
-pcmciautils
-perl
-procps-ng
-psmisc
-reiserfsprogs
-sed
-shadow
-s-nail
-sudo
-sysfsutils
-tar
-texinfo
-usbutils
-util-linux
-which
->x86_64 efibootmgr
-xfsprogs
-zd1211-firmware
-zsh

data/base/live-overlay/etc/default/grub

@@ -1,49 +0,0 @@
-GRUB_DEFAULT=saved
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Artix"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
-GRUB_CMDLINE_LINUX=""
-
-# If you want to enable the save default function, uncomment the following
-# line, and set GRUB_DEFAULT to saved.
-GRUB_SAVEDEFAULT=true
-
-# Preload both GPT and MBR modules so that they are not missed
-GRUB_PRELOAD_MODULES="part_gpt part_msdos"
-
-# Uncomment to enable Hidden Menu, and optionally hide the timeout count
-#GRUB_HIDDEN_TIMEOUT=5
-#GRUB_HIDDEN_TIMEOUT_QUIET=true
-
-# Uncomment to use basic console
-GRUB_TERMINAL_INPUT=console
-
-# Uncomment to disable graphical terminal
-#GRUB_TERMINAL_OUTPUT=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=auto
-
-# Uncomment to allow the kernel use the same resolution used by grub
-GRUB_GFXPAYLOAD_LINUX=keep
-
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_RECOVERY=true
-
-# Uncomment and set to the desired menu colors.  Used by normal and wallpaper
-# modes only.  Entries specified as foreground/background.
-GRUB_COLOR_NORMAL="light-gray/black"
-GRUB_COLOR_HIGHLIGHT="cyan/black"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-GRUB_BACKGROUND="/usr/share/grub/background.png"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-#GRUB_INIT_TUNE="480 440 1"

data/base/live-overlay/etc/fstab

@@ -1,5 +0,0 @@
-#
-# /etc/fstab: static file system information
-#
-# <file system>        <dir>         <type>    <options>          <dump> <pass>
-/dev/mapper/root-image /             auto      defaults           0      0

data/base/live-overlay/etc/issue

@@ -1,13 +0,0 @@
-
-Artix Live ISO (\l) - \s-\r \m
-
-
-
-# Welcome to Artix #
-
-
-login for the live environment:
-    user     'artix'
-    password 'artix'
-
-

data/base/live-overlay/etc/pam.d/su

@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		sufficient	pam_wheel.so trust use_uid
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so

data/base/live-overlay/etc/sudoers.d/g_wheel

@@ -1 +0,0 @@
-%wheel  ALL=(ALL) NOPASSWD: ALL

data/base/profile.conf

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

data/import.list.d/galaxy.list

@@ -1,12 +0,0 @@
-autoconf-archive
-confuse
-libappindicator
-libdbusmenu
-libftdi
-libindicator
-libdbi
-libpgm
-libsodium
-zeromq
-jansson
-libnewt

data/import.list.d/lib32.list

@@ -1,3 +0,0 @@
-lib32-glibc
-gcc-multilib
-llvm

data/import.list.d/system.list

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

data/import.list.d/world.list

@@ -1,232 +0,0 @@
-libasyncns
-libblockdev
-libbytesize
-libcap-ng
-libcroco
-libdaemon
-libdatrie
-libdrm
-libepoxy
-libexif
-libfontenc
-libglvnd
-libgphoto2
-libical
-libice
-libieee1284
-libimobiledevice
-libiscsi
-libjpeg-turbo
-libomxil-bellagio
-libpaper
-libpciaccess
-libplist
-libpng
-libproxy
-librsvg
-libsm
-libthai
-libtiff
-libtxc_dxtn
-libunwind
-libusb-compat
-libusbmuxd
-libwebp
-libx11
-libxau
-libxaw
-libxcb
-libxcomposite
-libxcursor
-libxdamage
-libxdmcp
-libxext
-libxfixes
-libxfont
-libxfont2
-libxft
-libxi
-libxinerama
-libxkbcommon
-libxkbfile
-libxml2
-libxmu
-libxpm
-libxrandr
-libxrender
-libxshmfence
-libxslt
-libxt
-libxtst
-libxxf86vm
-libgusb
-liblouis
-libraqm
-liblqr
-libuv
-libqmi
-glib-networking
-gsettings-desktop-schemas
-slang
-dhcp
-dbus-python
-lirc
-qt5-3d
-qt5-canvas3d
-qt5-charts
-qt5-connectivity
-qt5-datavis3d
-qt5-declarative
-qt5-doc
-qt5-examples
-qt5-gamepad
-qt5-graphicaleffects
-qt5-imageformats
-qt5-location
-qt5-multimedia
-qt5-networkauth
-qt5-quickcontrols
-qt5-quickcontrols2
-qt5-remoteobjects
-qt5-script
-qt5-scxml
-qt5-sensors
-qt5-serialbus
-qt5-serialport
-qt5-speech
-qt5-svg
-qt5-tools
-qt5-translations
-qt5-virtualkeyboard
-qt5-wayland
-qt5-webchannel
-qt5-webengine
-qt5-webkit
-qt5-websockets
-qt5-webview
-qt5-x11extras
-qt5-xmlpatterns
-adwaita-icon-theme
-alsa-lib
-apr
-apr-util
-atk
-at-spi2-atk
-at-spi2-core
-boost
-cairo
-cantarell-fonts
-check
-compositeproto
-damageproto
-dbus-glib
-dconf
-desktop-file-utils
-docbook-dsssl
-docbook-sgml31
-docbook-utils
-docbook-xml
-docbook-xsl
-double-conversion
-doxygen
-eventlog
-fixesproto
-fontconfig
-fontsproto
-freetype2
-gd
-gdk-pixbuf2
-ghostscript
-giflib
-gnome-common
-gobject-introspection
-gptfdisk
-graphite
-graphviz
-gsfonts
-gtk3
-gtk-doc
-gts
-harfbuzz
-hicolor-icon-theme
-ijs
-inputproto
-intltool
-itstool
-jasper
-jbig2dec
-json-glib
-kbproto
-lcms2
-mesa
-mtdev
-net-snmp
-openjade
-opensp
-pango
-parted
-pcre2
-perl-error
-perl-xml-parser
-perl-yaml
-pixman
-python2
-python
-python-appdirs
-python-beaker
-python-mako
-python-markupsafe
-python-packaging
-python-pyparsing
-python-setuptools
-python-six
-randrproto
-recordproto
-renderproto
-serf
-sgml-common
-shared-mime-info
-source-highlight
-speexdsp
-tslib
-v4l-utils
-vala
-valgrind
-volume_key
-vte3
-vte
-wayland
-wayland-protocols
-xcb-proto
-xcb-util
-xcb-util-image
-xcb-util-keysyms
-xcb-util-renderutil
-xcb-util-wm
-xextproto
-xf86vidmodeproto
-xineramaproto
-xkeyboard-config
-xorg-bdftopcf
-xorg-fonts-alias
-xorg-fonts-encodings
-xorg-fonts-misc
-xorg-font-util
-xorg-font-utils
-xorg-mkfontdir
-xorg-mkfontscale
-xorg-setxkbmap
-xorg-xkbcomp
-xproto
-yelp-tools
-yelp-xsl
-cmake
-jemalloc
-jsoncpp
-fribidi
-js
-imagemagick
-poppler
-bc
-xdg-utils
-xf86-input-libinput

data/linux.preset

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

data/makepkg-i686.conf

@@ -1,147 +0,0 @@
-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-#  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -z %u %o'
-          'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/wget
-
-#-- The package required by makepkg to download VCS sources
-#  Format: 'protocol::package'
-VCSCLIENTS=('bzr::bzr'
-            'git::git'
-            'hg::mercurial'
-            'svn::subversion')
-
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
-CARCH="i686"
-CHOST="i686-pc-linux-gnu"
-
-#-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-#-- Make Flags: change this for DistCC/SMP systems
-#MAKEFLAGS="-j2"
-#-- Debugging flags
-DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
-
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-# Defaults: BUILDENV=(!distcc color !ccache check !sign)
-#  A negated environment option will do the opposite of the comments below.
-#
-#-- distcc:   Use the Distributed C/C++/ObjC compiler
-#-- color:    Colorize output messages
-#-- ccache:   Use ccache to cache compilation
-#-- check:    Run the check() function if present in the PKGBUILD
-#-- sign:     Generate PGP signature file
-#
-BUILDENV=(!distcc color !ccache check !sign)
-#
-#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
-#-- specify a space-delimited list of hosts running in the DistCC cluster.
-#DISTCC_HOSTS=""
-#
-#-- Specify a directory for package building.
-#BUILDDIR=/tmp/makepkg
-
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-#   These are default values for the options=() settings
-#########################################################################
-#
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
-#  A negated option will do the opposite of the comments below.
-#
-#-- strip:      Strip symbols from binaries/libraries
-#-- docs:       Save doc directories specified by DOC_DIRS
-#-- libtool:    Leave libtool (.la) files in packages
-#-- staticlibs: Leave static library (.a) files in packages
-#-- emptydirs:  Leave empty directories in packages
-#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge:      Remove files specified by PURGE_TARGETS
-#-- upx:        Compress binary executable files using UPX
-#-- optipng:    Optimize PNG images with optipng
-#-- debug:      Add debugging flags as specified in DEBUG_* variables
-#
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
-
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(md5)
-#-- Options to be used when stripping binaries. See `man strip' for details.
-STRIP_BINARIES="--strip-all"
-#-- Options to be used when stripping shared libraries. See `man strip' for details.
-STRIP_SHARED="--strip-unneeded"
-#-- Options to be used when stripping static libraries. See `man strip' for details.
-STRIP_STATIC="--strip-debug"
-#-- Manual (man and info) directories to compress (if zipman is specified)
-MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
-#-- Doc directories to remove (if !docs is specified)
-DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Files to be removed from all packages (if purge is specified)
-PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
-
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-# Default: put built package and cached source in build directory
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#PKGDEST=/home/packages
-#-- Source cache: specify a fixed directory where source files will be cached
-#SRCDEST=/home/sources
-#-- Source packages: specify a fixed directory where all src packages will be placed
-#SRCPKGDEST=/home/srcpackages
-#-- Log files: specify a fixed directory where all log files will be placed
-#LOGDEST=/home/makepkglogs
-#-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john@doe.com>"
-#-- Specify a key to use for package signing
-#GPGKEY=""
-
-#########################################################################
-# COMPRESSION DEFAULTS
-#########################################################################
-#
-COMPRESSGZ=(gzip -c -f -n)
-COMPRESSBZ2=(bzip2 -c -f)
-COMPRESSXZ=(xz -c -z -)
-COMPRESSLRZ=(lrzip -q)
-COMPRESSLZO=(lzop -q)
-COMPRESSZ=(compress -c -f)
-
-#########################################################################
-# EXTENSION DEFAULTS
-#########################################################################
-#
-# 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/makepkg.conf

@@ -1,3 +1,4 @@
+#!/hint/bash
 #
 # /etc/makepkg.conf
 #
@@ -8,9 +9,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
+          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -34,8 +36,6 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
@@ -50,7 +50,7 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -73,7 +73,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -83,11 +83,9 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- emptydirs:  Leave empty directories in packages
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
-#-- upx:        Compress binary executable files using UPX
-#-- optipng:    Optimize PNG images with optipng
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -103,6 +101,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
 DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+#-- Directory to store source code in for debug packages
+DBGSRCDIR="/usr/src/debug"
 
 #########################################################################
 # PACKAGE OUTPUT
@@ -143,5 +143,3 @@ COMPRESSZ=(compress -c -f)
 #
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:

data/mkinitcpio.conf

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

data/pacman-default.conf

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

data/pacman-goblins.conf

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

data/pacman-gremlins.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,31 +63,46 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # uncommented to enable the repo.
+#
 
-[system-testing]
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-[world-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [world]
 Include = /etc/pacman.d/mirrorlist
 
-[galaxy-testing]
+[galaxy-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
+#
+# ARCHLINUX
+#
+
 [testing]
 Include = /etc/pacman.d/mirrorlist-arch
 
@@ -99,3 +114,9 @@ Include = /etc/pacman.d/mirrorlist-arch
 
 [community]
 Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32-goblins.conf

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

data/pacman-lib32-gremlins.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,20 +63,22 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # uncommented to enable the repo.
+#
 
-[system-testing]
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-[world-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [world]
 Include = /etc/pacman.d/mirrorlist
 
-[galaxy-testing]
+[galaxy-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [galaxy]
@@ -85,7 +87,7 @@ Include = /etc/pacman.d/mirrorlist
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the lib32 repositories as required here.
 
-[lib32-testing]
+[lib32-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [lib32]
@@ -97,6 +99,10 @@ Include = /etc/pacman.d/mirrorlist
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
+#
+# ARCHLINUX
+#
+
 [testing]
 Include = /etc/pacman.d/mirrorlist-arch
 

data/pacman-lib32.conf

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

data/patches/artix-bash.patch

@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/bash/artix.bashrc
++++ b/artix.bashrc
 @@ -0,0 +1,46 @@
 +use_color=true
 +
@@ -47,3 +47,41 @@
 +fi
 +
 +unset use_color safe_term match_lhs sh
+--- a/dot.bashrc
++++ b/dot.bashrc
+@@ -5,5 +5,5 @@
+ # If not running interactively, don't do anything
+ [[ $- != *i* ]] && return
+
+-alias ls='ls --color=auto'
+-PS1='[\u@\h \W]\$ '
++# alias ls='ls --color=auto'
++# PS1='[\u@\h \W]\$ '
+
+--- a/system.bashrc
++++ a/system.bashrc
+@@ -1,5 +1,5 @@
+ #
+-# /etc/bash.bashrc
++# /etc/bash/bashrc
+ #
+
+ # If not running interactively, don't do anything
+@@ -19,4 +19,8 @@
+     ;;
+ esac
+
++for sh in /etc/bash/bashrc.d/*.bashrc ; do
++	[[ -r ${sh} ]] && source "${sh}"
++done
++
+ [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
+
+--- a/system.bash_logout
++++ a/system.bash_logout
+@@ -1,3 +1,3 @@
+ #
+-# /etc/bash.bash_logout
++# /etc/bash/bash_logout
+ #
+

data/patches/dot-bashrc.patch

@@ -1,11 +0,0 @@
---- a/bash/dot.bashrc
-+++ b/bash/dot.bashrc
-@@ -5,5 +5,5 @@
- # If not running interactively, don't do anything
- [[ $- != *i* ]] && return
-
--alias ls='ls --color=auto'
--PS1='[\u@\h \W]\$ '
-+# alias ls='ls --color=auto'
-+# PS1='[\u@\h \W]\$ '
-

data/patches/system-bashrc.patch

@@ -1,19 +0,0 @@
---- a/bash/system.bashrc
-+++ a/bash/system.bashrc
-@@ -1,5 +1,5 @@
- #
--# /etc/bash.bashrc
-+# /etc/bash/bashrc
- #
-
- # If not running interactively, don't do anything
-@@ -19,4 +19,8 @@
-     ;;
- esac
-
-+for sh in /etc/bash/bashrc.d/*.bashrc ; do
-+	[[ -r ${sh} ]] && source "${sh}"
-+done
-+
- [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
-

data/patches/system-bashrc_logout.patch

@@ -1,8 +0,0 @@
---- a/bash/system.bash_logout
-+++ a/bash/system.bash_logout
-@@ -1,3 +1,3 @@
- #
--# /etc/bash.bash_logout
-+# /etc/bash/bash_logout
- #
-

initcpio/Makefile

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

initcpio/hooks/artix

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

initcpio/install/artix_kms

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

initcpio/script/miso_shutdown

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

lib/util-chroot.sh

@@ -8,26 +8,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-copy_mirrorlist(){
-    cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
-}
-
-copy_keyring(){
-    if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $1/etc/pacman.d/gnupg ]]; then
-        cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d/"
-    fi
-}
-
-create_min_fs(){
-    msg "Creating install root at %s" "$1"
-    mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
-    mkdir -m 1777 -p $1/{tmp,run}
-    mkdir -m 0555 -p $1/{sys,proc}
-    if [[ ! -f $1/etc/machine-id ]];then
-        touch $1/etc/machine-id
-    fi
-}
-
 is_btrfs() {
 	[[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
 }
@@ -47,31 +27,6 @@ subvolume_delete_recursive() {
     return 0
 }
 
-default_locale(){
-    local action="$1" mnt="$2"
-    if [[ $action == "set" ]];then
-        if [[ ! -f "$mnt/etc/locale.gen.bak" ]];then
-            info "Setting locale ..."
-            mv "$mnt/etc/locale.gen" "$mnt/etc/locale.gen.bak"
-            printf '%s.UTF-8 UTF-8\n' en_US > "$mnt/etc/locale.gen"
-            printf 'LANG=%s.UTF-8\n' en_US > "$mnt/etc/locale.conf"
-            printf 'LC_MESSAGES=C\n' >> "$mnt/etc/locale.conf"
-        fi
-    elif [[ $action == "reset" ]];then
-        if [[ -f "$mnt/etc/locale.gen.bak" ]];then
-            info "Resetting locale ..."
-            mv "$mnt/etc/locale.gen.bak" "$mnt/etc/locale.gen"
-            rm "$mnt/etc/locale.conf"
-        fi
-    fi
-}
-
-default_mirror(){
-    local mnt="$1" mirror="$2"'/$repo/os/$arch'
-    [[ -f $mnt/etc/pacman.d/mirrorlist ]] && mv "$mnt"/etc/pacman.d/mirrorlist "$mnt"/etc/pacman.d/mirrorlist.bak
-    echo "Server = $mirror" > $mnt/etc/pacman.d/mirrorlist
-}
-
 # $1: chroot
 kill_chroot_process(){
     local prefix="$1" flink pid name

lib/util-fstab.sh

@@ -13,6 +13,7 @@ declare -A pseudofs_types=([anon_inodefs]=1
                         [bdev]=1
                         [binfmt_misc]=1
                         [cgroup]=1
+                        [cgroup2]=1
                         [configfs]=1
                         [cpuset]=1
                         [debugfs]=1
@@ -72,7 +73,7 @@ valid_number_of_base() {
 mangle() {
     local i= chr= out=
 
-    unset {a..f} {A..F}
+    local {a..f}= {A..F}=
 
     for (( i = 0; i < ${#1}; i++ )); do
         chr=${1:i:1}
@@ -91,7 +92,7 @@ mangle() {
 unmangle() {
     local i= chr= out= len=$(( ${#1} - 4 ))
 
-    unset {a..f} {A..F}
+    local {a..f}= {A..F}=
 
     for (( i = 0; i < len; i++ )); do
         chr=${1:i:1}

lib/util-iso-chroot.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-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
-}
-
-set_xdm(){
-    if [[ -f $1/etc/conf.d/xdm ]];then
-        local conf='DISPLAYMANAGER="'${displaymanager}'"'
-        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" $1/etc/conf.d/xdm
-    fi
-}
-
-configure_hosts(){
-    sed -e "s|localhost.localdomain|localhost.localdomain ${hostname}|" -i $1/etc/hosts
-}
-
-configure_logind(){
-    local conf=$1/etc/$2/logind.conf
-    if [[ -e $conf ]];then
-        msg2 "Configuring logind ..."
-        sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
-    fi
-}
-
-configure_services(){
-    local mnt="$1"
-    info "Configuring [%s]" "${initsys}"
-    case ${initsys} in
-        'openrc')
-            for svc in ${openrc_boot[@]}; do
-                add_svc_rc "$mnt" "$svc" "boot"
-            done
-            for svc in ${openrc_default[@]}; do
-                [[ $svc == "xdm" ]] && set_xdm "$mnt"
-                add_svc_rc "$mnt" "$svc" "default"
-            done
-            for svc in ${enable_live[@]}; do
-                add_svc_rc "$mnt" "$svc" "default"
-            done
-        ;;
-    esac
-    info "Done configuring [%s]" "${initsys}"
-}
-
-configure_system(){
-    local mnt="$1"
-    case ${initsys} in
-        'openrc')
-            configure_logind "$mnt" "elogind"
-        ;;
-    esac
-    echo ${hostname} > $mnt/etc/hostname
-}
-
-clean_iso_root(){
-    local dest="$1"
-    msg "Deleting isoroot [%s] ..." "${dest##*/}"
-    rm -rf --one-file-system "$dest"
-}
-
-clean_up_image(){
-    local path mnt="$1"
-    msg2 "Cleaning [%s]" "${mnt##*/}"
-
-    default_locale "reset" "$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
-
-    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
-}

lib/util-iso-grub.sh

@@ -19,36 +19,50 @@ prepare_initcpio(){
 
 prepare_initramfs(){
     local mnt="$1"
-    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${iso_name}.conf
-    if [[ -n ${gpgkey} ]]; then
-        user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
-        exec 17<>${AT_USERCONFDIR}/gpgkey
+    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-artix.conf
+
+    if [[ "${PROFILE}" != 'base' ]];then
+        sed -e 's/artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs //' -i $mnt/etc/mkinitcpio-artix.conf
+    fi
+
+    if [[ -n ${GPG_KEY} ]]; then
+        user_run "gpg --export ${GPG_KEY} >${AT_USERCONFDIR}/gpgkey"
+        exec 17<>${AT_USERCONFDIR}/GPG_KEY
     fi
     local _kernel=$(cat $mnt/usr/lib/modules/*/version)
-    ARTIX_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
+    ARTIX_GNUPG_FD=${GPG_KEY:+17} chroot-run $mnt \
         /usr/bin/mkinitcpio -k ${_kernel} \
-        -c /etc/mkinitcpio-${iso_name}.conf \
+        -c /etc/mkinitcpio-artix.conf \
         -g /boot/initramfs.img
 
-    if [[ -n ${gpgkey} ]]; then
+    if [[ -n ${GPG_KEY} ]]; then
         exec 17<&-
     fi
-    if [[ -f ${AT_USERCONFDIR}/gpgkey ]]; then
-        rm ${AT_USERCONFDIR}/gpgkey
+    if [[ -f ${AT_USERCONFDIR}/GPG_KEY ]]; then
+        rm ${AT_USERCONFDIR}/GPG_KEY
     fi
 }
 
 prepare_boot_extras(){
     local src="$1" dest="$2"
-#     cp $src/boot/intel-ucode.img $dest/intel_ucode.img
-#     cp $src/usr/share/licenses/intel-ucode/LICENSE $dest/intel_ucode.LICENSE
+
+    for u in intel amd;do
+        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+    done
+
     cp $src/boot/memtest86+/memtest.bin $dest/memtest
     cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
 }
 
+configure_grub(){
+    local conf="$1/boot/grub/kernels.cfg"
+    sed -e "s|@iso_label@|${iso_label}|" -i $conf
+}
+
 prepare_grub(){
     local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
-        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
+        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub
 
     prepare_dir ${grub}/${platform}
 
@@ -62,16 +76,8 @@ prepare_grub(){
 
     cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
 
-    case ${target_arch} in
-        'i686')
-            platform=i386-efi
-            img=bootia32.efi
-        ;;
-        'x86_64')
-            platform=x86_64-efi
-            img=bootx64.efi
-        ;;
-    esac
+    platform=x86_64-efi
+    img=bootx64.efi
 
     prepare_dir ${efi}
     prepare_dir ${grub}/${platform}
@@ -83,10 +89,17 @@ prepare_grub(){
     grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
 
     prepare_dir ${grub}/themes
-    cp -r ${theme}/themes/${iso_name} ${grub}/themes/
-    cp ${data}/unicode.pf2 ${grub}
+    cp -r ${theme}/themes/artix ${grub}/themes/
     cp -r ${theme}/{locales,tz} ${grub}
 
+    if [[ -f /usr/share/grub/unicode.pf2 ]];then
+        msg2 "Copying %s ..." "unicode.pf2"
+        cp /usr/share/grub/unicode.pf2 ${grub}/unicode.pf2
+    else
+        msg2 "Creating %s ..." "unicode.pf2"
+        grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+    fi
+
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${efi_img}"

lib/util-iso-mount.sh

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

lib/util-iso-profile.sh

@@ -0,0 +1,115 @@
+#!/bin/bash
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+init_profile(){
+    local profdir="$1" prof="$2"
+
+    ROOT_LIST="$profdir/base/Packages-Root"
+    ROOT_OVERLAY="$profdir/base/root-overlay"
+    LIVE_LIST="$profdir/base/Packages-Live"
+    LIVE_OVERLAY="$profdir/base/live-overlay"
+
+    [[ -f "$profdir/$prof/Packages-Root" ]] && ROOT_LIST="$profdir/$prof/Packages-Root"
+    [[ -d "$profdir/$prof/root-overlay" ]] && ROOT_OVERLAY="$profdir/$prof/root-overlay"
+
+    [[ -f "$profdir/$prof/Packages-Desktop" ]] && DESKTOP_LIST="$profdir/$prof/Packages-Desktop"
+    [[ -d "$profdir/$prof/desktop-overlay" ]] && DESKTOP_OVERLAY="$profdir/$prof/desktop-overlay"
+
+    [[ -f "$profdir/$prof/Packages-Live" ]] && LIVE_LIST="$profdir/$prof/Packages-Live"
+    [[ -d "$profdir/$prof/live-overlay" ]] && LIVE_OVERLAY="$profdir/$prof/live-overlay"
+}
+
+load_profile(){
+    local prof="$1"
+    local profdir="${DATADIR}/iso-profiles"
+    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profdir=${WORKSPACE_DIR}/iso-profiles
+
+    init_profile "$profdir" "$prof"
+
+    [[ -f $profdir/$prof/profile.conf ]] || return 1
+
+    [[ -r $profdir/$prof/profile.conf ]] && source $profdir/$prof/profile.conf
+
+    [[ -z ${DISPLAYMANAGER} ]] && DISPLAYMANAGER="none"
+
+    [[ -z ${AUTOLOGIN} ]] && AUTOLOGIN="true"
+    [[ ${DISPLAYMANAGER} == 'none' ]] && AUTOLOGIN="false"
+
+    [[ -z ${HOST_NAME} ]] && HOST_NAME="artix"
+
+    [[ -z ${USER_NAME} ]] && USER_NAME="artix"
+
+    [[ -z ${PASSWORD} ]] && PASSWORD="artix"
+
+    if [[ -z ${ADDGROUPS} ]];then
+        ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+    fi
+
+    if [[ -z ${SERVICES[@]} ]];then
+        SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+    fi
+
+    if [[ ${DISPLAYMANAGER} != "none" ]];then
+        case "${INITSYS}" in
+            'openrc') SERVICES+=('xdm') ;;
+            'runit') SERVICES+=("${DISPLAYMANAGER}") ;;
+        esac
+    fi
+
+    if [[ -z ${SERVICES_LIVE[@]} ]];then
+        SERVICES_LIVE=('artix-live' 'pacman-init')
+    fi
+
+    return 0
+}
+
+write_live_session_conf(){
+    local path=$1${SYSCONFDIR}
+    [[ ! -d $path ]] && mkdir -p "$path"
+    local conf=$path/live.conf
+    msg2 "Writing %s" "${conf##*/}"
+    echo '# live session configuration' > ${conf}
+    echo '' >> ${conf}
+    echo '# autologin' >> ${conf}
+    echo "AUTOLOGIN=${AUTOLOGIN}" >> ${conf}
+    echo '' >> ${conf}
+    echo '# live user name' >> ${conf}
+    echo "USERNAME=${USERNAME}" >> ${conf}
+    echo '' >> ${conf}
+    echo '# live password' >> ${conf}
+    echo "PASSWORD=${PASSWORD}" >> ${conf}
+    echo '' >> ${conf}
+    echo '# live group membership' >> ${conf}
+    echo "ADDGROUPS='${ADDGROUPS}'" >> ${conf}
+}
+
+load_pkgs(){
+    local pkglist="$1" init="$2"
+    info "Loading Packages: [%s] ..." "${pkglist##*/}"
+
+    local _init="s|@$init||g"
+    case "$init" in
+        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6*||g" ;;
+        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
+        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
+    esac
+
+    local _space="s| ||g" \
+        _clean=':a;N;$!ba;s/\n/ /g' \
+        _com_rm="s|#.*||g"
+
+    packages=($(sed "$_com_rm" "$pkglist" \
+            | sed "$_space" \
+            | sed "$_purge" \
+            | sed "$_init" \
+            | sed "$_init_rm1" \
+            | sed "$_init_rm2" \
+            | sed "$_clean"))
+}

lib/util-iso-publish.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-connect(){
-    local home="/home/frs/project/${project}"
-    echo "${account},${project}@frs.${file_host}:${home}"
-}
-
-gen_webseed(){
-    local webseed seed="$1"
-    for mirror in ${host_mirrors[@]};do
-        webseed=${webseed:-}${webseed:+,}"http://${mirror}.dl.${seed}"
-    done
-    echo ${webseed}
-}
-
-make_torrent(){
-    find ${src_dir} -type f -name "*.torrent" -delete
-
-    if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then
-        for iso in $(ls ${src_dir}/*.iso);do
-            local seed=${file_host}/project/${project}/${target_dir}/${iso##*/}
-            local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed ${seed}))
-            ${verbose} && mktorrent_args+=(-v)
-            msg2 "Creating (%s) ..." "${iso##*/}.torrent"
-            mktorrent ${mktorrent_args[*]} -o ${iso}.torrent ${iso}
-        done
-    fi
-}
-
-prepare_transfer(){
-    target_dir="/iso/${profile}/"
-    src_dir="${cache_dir_iso}/${profile}/"
-    ${torrent} && make_torrent
-}
-
-sync_dir(){
-    msg "Start upload [%s] ..." "${profile}"
-    rsync "${rsync_args[@]}" ${src_dir} $(connect)${target_dir}
-    msg "Done upload [%s]" "${profile}"
-    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-}

lib/util-iso-yaml.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+write_users_conf(){
+    local conf="$1/users.conf"
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo "---" > "$conf"
+    echo "defaultGroups:" >> "$conf"
+    local IFS=','
+    for g in ${ADDGROUPS[@]};do
+        echo "    - $g" >> "$conf"
+    done
+    unset IFS
+    echo "autologinGroup:  autologin" >> "$conf"
+    echo "doAutologin:     false" >> "$conf"
+    echo "sudoersGroup:    wheel" >> "$conf"
+    echo "setRootPassword: true" >> "$conf"
+    echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
+
+#     echo "passwordRequirements:" >> "$conf"
+#     echo "    minLength: -1" >> "$conf"
+#     echo "    maxLength: -1" >> "$conf"
+#     echo "    libpwquality:" >> "$conf"
+#     echo "        - minlen=8" >> "$conf"
+#     echo "        - minclass=80" >> "$conf"
+}
+
+write_servicescfg_conf(){
+    local init="$2"
+    local conf="$1"/services-"$init".conf
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo '---' >  "$conf"
+    case "$init" in
+        'runit')
+            echo 'svDir: /etc/runit/sv' >> "$conf"
+            echo '' >> "$conf"
+            echo 'runsvDir: /etc/runit/runsvdir' >> "$conf"
+            echo '' >> "$conf"
+            echo 'services:' >> "$conf"
+            echo "    enabled:" >> "$conf"
+            for svc in ${SERVICES[@]};do
+                echo "      - name: $svc" >> "$conf"
+                echo '        runlevel: default' >> "$conf"
+            done
+        ;;
+        'openrc')
+            echo 'initdDir: /etc/init.d' >> "$conf"
+            echo '' >> "$conf"
+            echo 'runlevelsDir: /etc/runlevels' >> "$conf"
+            echo '' >> "$conf"
+            echo 'services:' >> "$conf"
+            for svc in ${SERVICES[@]};do
+                echo "      - name: $svc" >> "$conf"
+                echo '        runlevel: default' >> "$conf"
+            done
+        ;;
+    esac
+}
+
+write_postcfg_conf(){
+    local conf="$1/postcfg.conf" init="$2"
+    sed -e "s|openrc|$init|" -i "$conf"
+}
+
+configure_calamares(){
+    local mods="$1/etc/calamares/modules" init="$2"
+    if [[ -d "$mods" ]];then
+        info "Configuring [Calamares]"
+        write_users_conf "$mods"
+        write_servicescfg_conf "$mods" "$init"
+        write_postcfg_conf "$mods" "$init"
+        local name=services-"$init"
+        sed -e "s|services-openrc|$name|" -i "$1"/etc/calamares/settings.conf
+        info "Done configuring [Calamares]"
+    fi
+}

lib/util-iso.sh

@@ -10,11 +10,64 @@
 # GNU General Public License for more details.
 
 import ${LIBDIR}/util-chroot.sh
-import ${LIBDIR}/util-iso-chroot.sh
 import ${LIBDIR}/util-iso-grub.sh
-import ${LIBDIR}/util-yaml.sh
-import ${LIBDIR}/util-iso-mount.sh
-import ${LIBDIR}/util-profile.sh
+import ${LIBDIR}/util-iso-yaml.sh
+import ${LIBDIR}/util-iso-profile.sh
+
+track_img() {
+    info "mount: [%s]" "$2"
+    mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
+}
+
+mount_img() {
+    IMG_ACTIVE_MOUNTS=()
+    mkdir -p "$2"
+    track_img "$1" "$2"
+}
+
+umount_img() {
+    if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
+        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
+        umount "${IMG_ACTIVE_MOUNTS[@]}"
+        unset IMG_ACTIVE_MOUNTS
+        rm -r "$1"
+    fi
+}
+
+track_fs() {
+    info "overlayfs mount: [%s]" "$5"
+    mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
+}
+
+mount_overlay(){
+    FS_ACTIVE_MOUNTS=()
+    local lower= upper="$1" work="$2" pkglist="$3"
+    local fs=${upper##*/}
+    local rootfs="$work/rootfs" desktopfs="$work/desktopfs" livefs="$work/livefs"
+    mkdir -p "${mnt_dir}/work"
+    mkdir -p "$upper"
+    case $fs in
+        desktopfs) lower="$rootfs" ;;
+        livefs)
+            lower="$rootfs"
+            [[ -f $pkglist ]] && lower="$desktopfs":"$rootfs"
+        ;;
+        bootfs)
+            lower="$livefs":"$rootfs"
+            [[ -f $pkglist ]] && lower="$livefs":"$desktopfs":"$rootfs"
+        ;;
+    esac
+    track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
+}
+
+umount_overlay(){
+    if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
+        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
+        umount "${FS_ACTIVE_MOUNTS[@]}"
+        unset FS_ACTIVE_MOUNTS
+        rm -rf "${mnt_dir}/work"
+    fi
+}
 
 error_function() {
     if [[ -p $logpipe ]]; then
@@ -33,9 +86,10 @@ error_function() {
 
 # $1: function
 run_log(){
-    local func="$1"
+    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_dir}/$func.pipe.XXXXXXXX")
+    logpipe=$(mktemp -u "/tmp/$func.pipe.XXXXXXXX")
     mkfifo "$logpipe"
     tee "$logfile" < "$logpipe" &
     local teepid=$!
@@ -78,13 +132,137 @@ prepare_traps(){
 #     trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 }
 
+add_svc_rc(){
+    local mnt="$1" name="$2" rlvl="$3"
+    if [[ -f $mnt/etc/init.d/$name ]];then
+        msg2 "Setting %s ..." "$name"
+        chroot $mnt rc-update add $name $rlvl &>/dev/null
+    fi
+}
+
+add_svc_runit(){
+    local mnt="$1" name="$2"
+    if [[ -d $mnt/etc/runit/sv/$name ]]; then
+        msg2 "Setting %s ..." "$name"
+        chroot $mnt ln -s /etc/runit/sv/$name /etc/runit/runsvdir/default &>/dev/null
+    fi
+}
+
+set_xdm(){
+    if [[ -f $1/etc/conf.d/xdm ]];then
+        local conf='DISPLAYMANAGER="'${DISPLAYMANAGER}'"'
+        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" $1/etc/conf.d/xdm
+    fi
+}
+
+configure_hosts(){
+    sed -e "s|localhost.localdomain|localhost.localdomain ${HOST_NAME}|" -i $1/etc/hosts
+}
+
+configure_logind(){
+    local conf=$1/etc/$2/logind.conf
+    if [[ -e $conf ]];then
+        msg2 "Configuring logind ..."
+        sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
+        sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
+        sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
+    fi
+}
+
+configure_services(){
+    local mnt="$1"
+    info "Configuring [%s]" "${INITSYS}"
+    case ${INITSYS} in
+        'openrc')
+            for svc in ${SERVICES[@]}; do
+                [[ $svc == "xdm" ]] && set_xdm "$mnt"
+                add_svc_rc "$mnt" "$svc" "default"
+            done
+            for svc in ${SERVICES_LIVE[@]}; do
+                add_svc_rc "$mnt" "$svc" "default"
+            done
+        ;;
+        'runit')
+            for svc in ${SERVICES[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+            for svc in ${SERVICES_LIVE[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+        ;;
+    esac
+    info "Done configuring [%s]" "${INITSYS}"
+}
+
+configure_system(){
+    local mnt="$1"
+    case ${INITSYS} in
+        'openrc' | 'runit')
+            configure_logind "$mnt" "elogind"
+        ;;
+    esac
+    echo ${HOST_NAME} > $mnt/etc/hostname
+}
+
+clean_iso_root(){
+    local dest="$1"
+    msg "Deleting isoroot [%s] ..." "${dest##*/}"
+    rm -rf --one-file-system "$dest"
+}
+
+clean_up_image(){
+    local path mnt="$1"
+    msg2 "Cleaning [%s]" "${mnt##*/}"
+
+    if [[ -f "$mnt/etc/locale.gen.orig" ]];then
+        mv "$mnt/etc/locale.gen.orig" "$mnt/etc/locale.gen"
+        rm "$mnt/etc/locale.conf"
+    fi
+    path=$mnt/boot
+    if [[ -d "$path" ]]; then
+        find "$path" -name 'initramfs*.img' -delete &> /dev/null
+    fi
+    path=$mnt/var/lib/pacman/sync
+    if [[ -d $path ]];then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/cache/pacman/pkg
+    if [[ -d $path ]]; then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/log
+    if [[ -d $path ]]; then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/tmp
+    if [[ -d $path ]];then
+        find "$path" -mindepth 1 -delete &> /dev/null
+    fi
+    path=$mnt/tmp
+    if [[ -d $path ]];then
+        find "$path" -mindepth 1 -delete &> /dev/null
+    fi
+
+    if [[ ${mnt##*/} == 'livefs' ]];then
+        rm -rf "$mnt/etc/pacman.d/gnupg"
+    fi
+
+    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
+    if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
+        rm $mnt/boot/grub/grub.cfg
+    fi
+    if [[ -f "$mnt/etc/machine-id" ]]; then
+        rm $mnt/etc/machine-id
+    fi
+}
+
 configure_live_image(){
     local fs="$1"
     msg "Configuring [livefs]"
     configure_hosts "$fs"
     configure_system "$fs"
     configure_services "$fs"
-    configure_calamares "$fs/etc/calamares/modules"
+    configure_calamares "$fs" "${INITSYS}"
     write_live_session_conf "$fs"
     msg "Done configuring [livefs]"
 }
@@ -94,16 +272,16 @@ make_sig () {
     msg2 "Creating signature file..."
     cd "$idir"
     user_own "$idir"
-    user_run "gpg --detach-sign --default-key ${gpgkey} $file.sfs"
+    user_run "gpg --detach-sign --default-key ${GPG_KEY} $file.sfs"
     chown -R root "$idir"
     cd ${OLDPWD}
 }
 
 make_checksum(){
     local idir="$1" file="$2"
-    msg2 "Creating md5sum ..."
+    msg2 "Creating sha512sum ..."
     cd $idir
-    md5sum $file.sfs > $file.md5
+    sha512sum $file.sfs > $file.sha512
     cd ${OLDPWD}
 }
 
@@ -114,15 +292,15 @@ make_sfs() {
         error "The path %s does not exist" "${src}"
         retrun 1
     fi
-    local timer=$(get_timer) dest=${iso_root}/${iso_name}/${target_arch}
+    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_dir}/buildiso.debug
-        msg2 "%s" "${has_changed_dir}" >> ${tmp_dir}/buildiso.debug
+        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}"
@@ -170,7 +348,7 @@ make_sfs() {
     make_checksum "${dest}" "${name}"
     ${persist} && rm "${src}.img"
 
-    if [[ -n ${gpgkey} ]];then
+    if [[ -n ${GPG_KEY} ]];then
         make_sig "${dest}" "${name}"
     fi
 
@@ -198,14 +376,11 @@ assemble_iso(){
         -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info \
         -eltorito-alt-boot \
         -append_partition 2 0xef ${iso_root}/efi.img \
-        -e --interval:appended_partition_2:all:: \
+        -e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
         -no-emul-boot \
         -iso-level 3 \
         -o ${iso_dir}/${iso_file} \
         ${iso_root}/
-
-#         arg to add with xorriso-1.4.7
-#         -iso_mbr_part_type 0x00
 }
 
 # Build ISO
@@ -230,11 +405,14 @@ make_iso() {
 }
 
 gen_iso_fn(){
-    local vars=() name
-    vars+=("${iso_name}")
-    vars+=("${profile}")
-    vars+=("${iso_version}")
-    vars+=("${target_arch}")
+    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
@@ -243,7 +421,7 @@ gen_iso_fn(){
 
 install_packages(){
     local fs="$1"
-    setarch "${target_arch}" mkchroot \
+    setarch "${ARCH}" mkchroot \
         "${mkchroot_args[@]}" "${fs}" "${packages[@]}"
 }
 
@@ -264,7 +442,7 @@ make_rootfs() {
 
         install_packages "${rootfs}"
 
-        copy_overlay "${root_overlay}" "${rootfs}"
+        copy_overlay "${ROOT_OVERLAY}" "${rootfs}"
 
         clean_up_image "${rootfs}"
 
@@ -283,7 +461,7 @@ make_desktopfs() {
 
         install_packages "${desktopfs}"
 
-        copy_overlay "${desktop_overlay}" "${desktopfs}"
+        copy_overlay "${DESKTOP_OVERLAY}" "${desktopfs}"
 
         umount_overlay
         clean_up_image "${desktopfs}"
@@ -299,16 +477,14 @@ make_livefs() {
 
         prepare_dir "${livefs}"
 
-        mount_overlay "${livefs}" "${work_dir}" "${desktop_list}"
+        mount_overlay "${livefs}" "${work_dir}" "${DESKTOP_LIST}"
 
         install_packages "${livefs}"
 
-        copy_overlay "${live_overlay}" "${livefs}"
+        copy_overlay "${LIVE_OVERLAY}" "${livefs}"
 
         configure_live_image "${livefs}"
 
-        pacman -Qr "${livefs}" > ${iso_dir}/$(gen_iso_fn)-pkgs.txt
-
         umount_overlay
 
         clean_up_image "${livefs}"
@@ -324,16 +500,16 @@ make_bootfs() {
 
         prepare_dir "${boot}"
 
-        cp ${work_dir}/rootfs/boot/vmlinuz* ${boot}/vmlinuz-${target_arch}
+        cp ${work_dir}/rootfs/boot/vmlinuz* ${boot}/vmlinuz-${ARCH}
 
         local bootfs="${work_dir}/bootfs"
 
-        mount_overlay "${bootfs}" "${work_dir}" "${desktop_list}"
+        mount_overlay "${bootfs}" "${work_dir}" "${DESKTOP_LIST}"
 
         prepare_initcpio "${bootfs}"
         prepare_initramfs "${bootfs}"
 
-        cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${target_arch}.img
+        cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${ARCH}.img
         prepare_boot_extras "${bootfs}" "${boot}"
 
         umount_overlay
@@ -344,31 +520,13 @@ make_bootfs() {
     fi
 }
 
-configure_grub(){
-    local conf="$1"
-    local default_args="artixbasedir=${iso_name} artixlabel=${iso_label}" boot_args=('quiet')
-
-    sed -e "s|@DIST_NAME@|${iso_name}|g" \
-        -e "s|@ARCH@|${target_arch}|g" \
-        -e "s|@DEFAULT_ARGS@|${default_args}|g" \
-        -e "s|@BOOT_ARGS@|${boot_args[*]}|g" \
-        -e "s|@PROFILE@|${profile}|g" \
-        -i $conf
-}
-
-configure_grub_theme(){
-    local conf="$1"
-    sed -e "s|@DIST@|${iso_name}|" -i "$conf"
-}
-
 make_grub(){
     if [[ ! -e ${work_dir}/grub.lock ]]; then
         msg "Prepare [/iso/boot/grub]"
 
         prepare_grub "${work_dir}/rootfs" "${work_dir}/livefs" "${iso_root}"
 
-        configure_grub "${iso_root}/boot/grub/kernels.cfg"
-        configure_grub_theme "${iso_root}/boot/grub/variable.cfg"
+        configure_grub "${iso_root}"
 
         : > ${work_dir}/grub.lock
         msg "Done [/iso/boot/grub]"
@@ -384,14 +542,14 @@ compress_images(){
 
 prepare_images(){
     local timer=$(get_timer)
-    load_pkgs "${root_list}" "${target_arch}" "${initsys}" "${kernel}"
+    load_pkgs "${ROOT_LIST}" "${INITSYS}"
     run_safe "make_rootfs"
-    if [[ -f "${desktop_list}" ]] ; then
-        load_pkgs "${desktop_list}" "${target_arch}" "${initsys}" "${kernel}"
+    if [[ -f "${DESKTOP_LIST}" ]] ; then
+        load_pkgs "${DESKTOP_LIST}" "${INITSYS}"
         run_safe "make_desktopfs"
     fi
-    if [[ -f ${live_list} ]]; then
-        load_pkgs "${live_list}" "${target_arch}" "${initsys}" "${kernel}"
+    if [[ -f ${LIVE_LIST} ]]; then
+        load_pkgs "${LIVE_LIST}" "${INITSYS}"
         run_safe "make_livefs"
     fi
     run_safe "make_bootfs"

lib/util-mount.sh

@@ -33,56 +33,76 @@ get_os_name(){
     echo "$str"
 }
 
-get_chroot_arch(){
-    local elf=$(file $1/usr/bin/file)
-    elf=${elf//*executable,}
-    echo ${elf%%,*}
-}
-
 chroot_part_mount() {
     info "mount: [%s]" "$2"
     mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
 }
 
-select_os(){
-        local os_list=( $(detect) ) count=${#os_list[@]}
-    if [[ ${count} > 1 ]];then
-                msg "Detected systems:"
-                local i=0
-                for os in ${os_list[@]};do
-            local last=${os##*:}
-            case $last in
-                'efi') count=$((count-1)) ;;
-                *) info "$i) $(get_os_name $os)"; i=$((i+1)) ;;
-            esac
-                done
-                i=0
-        msg "Select system to mount [0-%s] : " "$((count-1))"
-                read select
-        else
-        select=0
-    fi
-    local os_str=${os_list[$select]} type
-    type=$os_str
-    root=${os_str%%:*}
-    type=${type##*:}
-        if [[ "${type##*:}" == 'linux' ]];then
-        msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
-        chroot_mount_partitions "$1" "$root"
-        else
-                die "You can't mount %s!" "$select"
-        fi
+trap_setup(){
+    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
+    trap "$1" EXIT
 }
 
-chroot_mount_partitions(){
+chroot_mount() {
+    info "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
+}
 
+chroot_add_resolv_conf() {
+    local chrootdir=$1 resolv_conf=$1/etc/resolv.conf
+
+    [[ -e /etc/resolv.conf ]] || return 0
+
+    # Handle resolv.conf as a symlink to somewhere else.
+    if [[ -L $chrootdir/etc/resolv.conf ]]; then
+        # readlink(1) should always give us *something* since we know at this point
+        # it's a symlink. For simplicity, ignore the case of nested symlinks.
+        resolv_conf=$(readlink "$chrootdir/etc/resolv.conf")
+        if [[ $resolv_conf = /* ]]; then
+            resolv_conf=$chrootdir$resolv_conf
+        else
+            resolv_conf=$chrootdir/etc/$resolv_conf
+        fi
+
+        # ensure file exists to bind mount over
+        if [[ ! -f $resolv_conf ]]; then
+            install -Dm644 /dev/null "$resolv_conf" || return 1
+        fi
+    elif [[ ! -e $chrootdir/etc/resolv.conf ]]; then
+        # The chroot might not have a resolv.conf.
+        return 0
+    fi
+
+    chroot_mount /etc/resolv.conf "$resolv_conf" --bind
+}
+
+chroot_mount_conditional() {
+    local cond=$1; shift
+    if eval "$cond"; then
+        chroot_mount "$@"
+    fi
+}
+
+chroot_setup(){
+    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
+    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
+    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
+    ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
+        efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
+    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
+    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
+    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
+    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
+    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
+}
+
+mount_os(){
     CHROOT_ACTIVE_PART_MOUNTS=()
     CHROOT_ACTIVE_MOUNTS=()
 
-    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
-    trap 'trap_handler' EXIT
+    trap_setup chroot_part_umount
 
-    chroot_part_mount $2 $1
+    chroot_part_mount "$2" "$1"
 
     local mounts=$(parse_fstab "$1")
 
@@ -95,92 +115,28 @@ chroot_mount_partitions(){
         esac
     done
 
-    local chroot_arch=$(get_chroot_arch $1)
-    [[ ${chroot_arch} == x86-64 ]] && chroot_arch=${chroot_arch/-/_}
-    case ${target_arch} in
-        i686)
-            if [[ ${chroot_arch} == x86_64 ]];then
-                die "You can't chroot from %s host into %s!" "${target_arch}" "${chroot_arch}"
-            fi
-        ;;
-    esac
-
-    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
-    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
-        efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
-    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
-    chroot_mount /etc/resolv.conf "$1/etc/resolv.conf" --bind
-}
-
-chroot_mount() {
-    #info "mount: [%s]" "$2"
-    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
-}
-
-chroot_mount_conditional() {
-    local cond=$1; shift
-    if eval "$cond"; then
-        chroot_mount "$@"
-    fi
-}
-
-chroot_api_efi_mount() {
-    CHROOT_ACTIVE_MOUNTS=()
-    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
-    trap 'chroot_api_efi_umount' EXIT
-
-    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
-    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
-        efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
-    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
+    chroot_setup "$1"
+    chroot_add_resolv_conf "$1"
 }
 
 chroot_api_mount() {
     CHROOT_ACTIVE_MOUNTS=()
-    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
-    trap 'chroot_api_umount' EXIT
+    trap_setup chroot_api_umount
+    chroot_setup "$1"
+}
 
-    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
-    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
+chroot_api_umount() {
+    if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
+        info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+        umount "${CHROOT_ACTIVE_MOUNTS[@]}"
+    fi
+    unset CHROOT_ACTIVE_MOUNTS
 }
 
 chroot_part_umount() {
+    chroot_api_umount
     info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
     umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
     unset CHROOT_ACTIVE_PART_MOUNTS
 }
 
-chroot_api_umount() {
-    #info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_MOUNTS
-}
-
-chroot_api_efi_umount() {
-    #info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_MOUNTS
-}
-
-trap_handler(){
-    chroot_api_umount
-    chroot_part_umount
-}

lib/util-msg.sh

@@ -8,61 +8,22 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-export LC_MESSAGES=C
+# export LC_MESSAGES=C
 export LANG=C
 
-declare ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
+source /usr/share/makepkg/util.sh
 
 if [[ -t 2 ]]; then
-    # prefer terminal safe colored and bold text when tput is supported
-    if tput setaf 0 &>/dev/null; then
-        ALL_OFF="$(tput sgr0)"
-        BOLD="$(tput bold)"
-        RED="${BOLD}$(tput setaf 1)"
-        GREEN="${BOLD}$(tput setaf 2)"
-        YELLOW="${BOLD}$(tput setaf 3)"
-        BLUE="${BOLD}$(tput setaf 4)"
-    else
-        ALL_OFF="\e[0m"
-        BOLD="\e[1m"
-        RED="${BOLD}\e[31m"
-        GREEN="${BOLD}\e[32m"
-        YELLOW="${BOLD}\e[33m"
-        BLUE="${BOLD}\e[34m"
-    fi
+    colorize
+else
+    declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-
-plain() {
-    local mesg=$1; shift
-    printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg() {
-    local mesg=$1; shift
-    printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg2() {
-    local mesg=$1; shift
-    printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
 
 info() {
     local mesg=$1; shift
     printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-warning() {
-    local mesg=$1; shift
-    printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
-    local mesg=$1; shift
-    printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
 stat_busy() {
     local mesg=$1; shift
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
@@ -117,7 +78,17 @@ die() {
 
 msg_table_header(){
     local mesg=$1; shift
-    printf "${GREEN} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_downgrade(){
+    local mesg=$1; shift
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_notify(){
+    local mesg=$1; shift
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
 msg_row(){
@@ -125,9 +96,9 @@ msg_row(){
     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-msg_row_update(){
+msg_row_upgrade(){
     local mesg=$1; shift
-    printf "${RED}${BOLD} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${RED}${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
 }
 
 import(){

lib/util-pkg-gitea.sh

@@ -0,0 +1,221 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+create_repo(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    local json="{ \"auto_init\": true, \"name\":\"$gitname\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
+
+    msg2 "Create package repo [%s] in org (%s)" "${pkg}" "${org}"
+
+    curl -X POST "${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}" \
+        -H "accept: application/json" \
+        -H "content-type: application/json" \
+        -d "$json"
+
+    echo
+}
+
+delete_repo(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+
+    msg2 "Delete package repo [%s] in org (%s)" "${pkg}" "${org}"
+
+    curl -X DELETE "${GIT_URL}/api/v1/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json"
+}
+
+load_team_id(){
+    local org="$1" tree="$2" id=0
+
+    case $org in
+        packagesA)
+            case $tree in
+                packages) id=70 ;;
+                community) id=71 ;;
+            esac
+        ;;
+        packagesB)
+            case $tree in
+                packages) id=72 ;;
+                community) id=73 ;;
+            esac
+        ;;
+        packagesC)
+            case $tree in
+                packages) id=74 ;;
+                community) id=75 ;;
+            esac
+        ;;
+        packagesD)
+            case $tree in
+                packages) id=76 ;;
+                community) id=77 ;;
+            esac
+        ;;
+        packagesE)
+            case $tree in
+                packages) id=78 ;;
+                community) id=79 ;;
+            esac
+        ;;
+        packagesF)
+            case $tree in
+                packages) id=80 ;;
+                community) id=81 ;;
+            esac
+        ;;
+        packagesG)
+            case $tree in
+                packages) id=82 ;;
+                community) id=83 ;;
+            esac
+        ;;
+        packagesH)
+            case $tree in
+                packages) id=84 ;;
+                community) id=85 ;;
+            esac
+        ;;
+        packagesI)
+            case $tree in
+                packages) id=86 ;;
+                community) id=87 ;;
+            esac
+        ;;
+        packagesJ)
+            case $tree in
+                packages) id=88 ;;
+                community) id=89 ;;
+            esac
+        ;;
+        packagesK)
+            case $tree in
+                packages) id=90 ;;
+                community) id=91 ;;
+            esac
+        ;;
+        packagesL)
+            case $tree in
+                packages) id=92 ;;
+                community) id=93 ;;
+            esac
+        ;;
+        packagesM)
+            case $tree in
+                packages) id=94 ;;
+                community) id=95 ;;
+            esac
+        ;;
+        packagesN)
+            case $tree in
+                packages) id=96 ;;
+                community) id=97 ;;
+            esac
+        ;;
+        packagesO)
+            case $tree in
+                packages) id=98 ;;
+                community) id=99 ;;
+            esac
+        ;;
+        packagesP)
+            case $tree in
+                packages) id=100 ;;
+                community) id=101 ;;
+            esac
+        ;;
+        packagesQ)
+            case $tree in
+                packages) id=105 ;;
+                community) id=106 ;;
+            esac
+        ;;
+        packagesR)
+            case $tree in
+                packages) id=107 ;;
+                community) id=108 ;;
+            esac
+        ;;
+        packagesS)
+            case $tree in
+                packages) id=109 ;;
+                community) id=110 ;;
+            esac
+        ;;
+        packagesT)
+            case $tree in
+                packages) id=111 ;;
+                community) id=112 ;;
+            esac
+        ;;
+        packagesU)
+            case $tree in
+                packages) id=113 ;;
+                community) id=114 ;;
+            esac
+        ;;
+        packagesV)
+            case $tree in
+                packages) id=115 ;;
+                community) id=116 ;;
+            esac
+        ;;
+        packagesW)
+            case $tree in
+                packages) id=117 ;;
+                community) id=118 ;;
+            esac
+        ;;
+        packagesX)
+            case $tree in
+                packages) id=119 ;;
+                community) id=120 ;;
+            esac
+        ;;
+        packagesY)
+            case $tree in
+                packages) id=121 ;;
+                community) id=122 ;;
+            esac
+        ;;
+        packagesZ)
+            case $tree in
+                packages) id=123 ;;
+                community) id=124 ;;
+            esac
+        ;;
+        packagesPython)
+            case $tree in
+                packages) id=103 ;;
+                community) id=104 ;;
+            esac
+        ;;
+        packagesPerl)
+            case $tree in
+                packages) id=102 ;;
+                community) id=125 ;;
+            esac
+        ;;
+    esac
+    echo $id
+}
+
+add_repo_to_team(){
+    local pkg="$1" org="$2" tree="$3"
+    local id=$(load_team_id "$org" "$tree")
+
+    msg2 "Adding package repo [%s] to team (%s)" "$pkg" "$tree"
+
+    curl -X PUT "${GIT_URL}/api/v1/teams/$id/repos/$org/$pkg?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json"
+}

lib/util-pkg-publish.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-import ${LIBDIR}/util-pkg.sh
-
-del_from_repo(){
-    local repo="$1" destarch="$2" pkg="$3" ver result
-    local repo_path=${repos_root}/$repo/os/$destarch
-    source $pkg/PKGBUILD
-    for name in ${pkgname[@]};do
-        [[ $arch == any ]] && CARCH=any
-        ver=$(get_full_version $name)
-        if ! result=$(find_cached_package "$name" "$ver" "$CARCH");then
-            cd $repo_path
-            repo-remove -R $repo.db.tar.xz $name
-        fi
-    done
-}
-
-move_to_repo(){
-    local repo_src="$1" repo_dest="$2" repo_arch="$3"
-    local repo_path=${repos_root}/$repo_src/os/$repo_arch
-    local src=$PWD
-    local filelist=${workspace_dir}/$repo_src.files.txt
-    local pkglist=${workspace_dir}/$repo_src.pkgs.txt
-    [[ -n ${PKGDEST} ]] && src=${PKGDEST}
-    cd $repo_path
-    msg "Writing repo lists [%s]" "$repo_src"
-    ls *.pkg.tar.xz{,.sig} > $filelist
-    ls *.pkg.tar.xz > $pkglist
-    # uncomment for local test run
-#     rsync -v --files-from="$filelist" $repo_path "$src"
-    rm -v *
-    repo-add $repo_src.db.tar.xz
-    repo_path=${repos_root}/$repo_dest/os/$repo_arch
-    local move=$(cat $filelist) pkgs=$(cat $pkglist)
-    msg "Reading repo lists [%s]" "$repo_dest"
-    for f in ${move[@]};do
-        ln -sfv $src/$f $repo_path/
-    done
-    cd $repo_path
-    repo-add -R $repo_dest.db.tar.xz ${pkgs[@]}
-}
-
-add_to_repo(){
-    local repo="$1" destarch="$2" pkg="$3" ver pkgfile result
-    local repo_path=${repos_root}/$repo/os/$destarch
-    source $pkg/PKGBUILD
-    local dest=$pkg
-    for name in ${pkgname[@]};do
-        [[ $arch == any ]] && CARCH=any
-        ver=$(get_full_version $name)
-        if ! result=$(find_cached_package "$name" "$ver" "$CARCH"); then
-            pkgfile=$name-$ver-$CARCH.pkg.tar.xz
-            [[ -n ${PKGDEST} ]] && dest=${PKGDEST}/$pkgfile
-            [[ -e $dest.sig ]] && rm $dest.sig
-            signfile $dest
-            ln -sf $dest{,.sig} $repo_path/
-            cd $repo_path
-            repo-add -R $repo.db.tar.xz $pkgfile
-        fi
-    done
-}

lib/util-pkg-subrepo.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+subrepo_push(){
+    local pkg="$1"
+    git subrepo push "$pkg" --clean
+}
+
+subrepo_pull(){
+    local pkg="$1"
+    git subrepo pull "$pkg"
+}
+
+subrepo_clone(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    msg2 "Getting package repo [%s] from org (%s)" "$pkg" "$org/$gitname"
+    git subrepo clone gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git "$pkg"
+}
+
+write_jenkinsfile(){
+    local jenkins=Jenkinsfile
+    echo '@Library(["PackagePipeline", "RepoPackage"]) import org.artixlinux.RepoPackage' > $jenkins
+    echo '' >> $jenkins
+    echo 'PackagePipeline(new RepoPackage(this))' >> $jenkins
+    echo '' >> $jenkins
+}
+
+write_agentyaml(){
+    local agent=.artixlinux/agent.yaml label='master'
+    [[ -d .artixlinux ]] || mkdir .artixlinux
+    echo '%YAML 1.2' > $agent
+    echo '---' >> $agent
+    echo '' >> $agent
+    echo "label: $label" >> $agent
+    echo '' >> $agent
+}
+
+commit_jenkins_files(){
+    write_jenkinsfile
+    write_agentyaml
+    git add Jenkinsfile
+    git add .artixlinux
+    git commit -m "add jenkinsfile & .artixlinux/agent.yaml"
+}

lib/util-pkg-tree.sh

@@ -1,236 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-get_local_head(){
-    echo $(git log --pretty=%H ...refs/heads/$1^ | head -n 1)
-}
-
-get_remote_head(){
-    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
-}
-
-is_dirty() {
-    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
-    return 0
-}
-
-show_version_table(){
-    declare -A UPDATES
-    msg_table_header "%-30s %-30s %-30s %-30s" "Repository" "Package" "Artix version" "Arch version"
-    for repo in ${repo_tree_artix[@]}; do
-        for pkg in ${tree_dir_artix}/$repo/*; do
-            if [[ -f $pkg/PKGBUILD ]];then
-                source $pkg/PKGBUILD 2>/dev/null
-                package=${pkg##*/}
-                artixver=$(get_full_version $package)
-                set_import_path "$repo" "$package"
-                if [[ -f $src/PKGBUILD ]];then
-                    source $src/PKGBUILD 2>/dev/null
-                    archver=$(get_full_version $package)
-                fi
-                if [ $(vercmp $artixver $archver) -lt 0 ];then
-                    UPDATES[$package]="$pkg/PKGBUILD $src/PKGBUILD"
-                    msg_row_update "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
-                fi
-            fi
-            unset pkgver epoch pkgrel artixver archver package
-        done
-    done
-    rm ${patches_dir}/*.patch
-    for upd in "${!UPDATES[@]}"; do
-        msg "Writing %s update patch ..." "$upd"
-        diff -u ${UPDATES[$upd]} > ${patches_dir}/"$upd"-archlinux.patch
-    done
-}
-
-sync_tree(){
-    local branch="master" repo="$1"
-    git checkout $branch
-    local local_head=$(get_local_head "$branch")
-    local remote_head=$(get_remote_head "$branch")
-    local timer=$(get_timer)
-    msg "Checking [%s] ..." "$repo"
-    msg2 "local: %s" "${local_head}"
-    msg2 "remote: %s" "${remote_head}"
-    if [[ "${local_head}" == "${remote_head}" ]]; then
-        info "nothing to do"
-    else
-        info "needs sync"
-        git pull origin $branch
-    fi
-    msg "Done [%s]" "$repo"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-clone_tree(){
-    local timer=$(get_timer) repo="$1" host_tree="$2"
-    msg "Preparing [%s] ..." "$repo"
-    info "clone"
-    git clone $host_tree.git
-    msg "Done [%s]" "$repo"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-sync_tree_arch(){
-    cd ${tree_dir_arch}
-        for repo in ${repo_tree_arch[@]};do
-            if [[ -d ${repo} ]];then
-                cd ${repo}
-                    sync_tree "${repo}"
-                cd ..
-            else
-                clone_tree "${repo}" "${host_tree_arch}/${repo}"
-            fi
-        done
-    cd ..
-}
-
-sync_tree_artix(){
-    cd ${tree_dir_artix}
-        for repo in ${repo_tree_artix[@]};do
-            if [[ -d ${repo} ]];then
-                cd ${repo}
-                    sync_tree "${repo}"
-                cd ..
-            else
-                clone_tree "${repo}" "${host_tree_artix}/${repo}"
-            fi
-        done
-    cd ..
-}
-
-read_import_list(){
-    local repo="$1"
-    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
-    import_list=$(sed "$_com_rm" "${list_dir_import}/$repo.list" | sed "$_space" | sed "$_clean")
-}
-
-is_untracked(){
-    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
-    return 0
-}
-
-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/PKGBUILD
-        ;;
-        'bash')
-            sed -e 's|system.bash_logout)|system.bash_logout\n        artix.bashrc)|' \
-                -e 's|etc/bash.|etc/bash/|g' \
-                -e 's|install -dm755 "$pkgdir"/etc/skel/|install -dm755 "$pkgdir"/etc/{skel,bash/bashrc.d}/|' \
-                -e 's|/etc/skel/.bash_logout|/etc/skel/.bash_logout\n  install -m644 artix.bashrc "$pkgdir"/etc/bash/bashrc.d/artix.bashrc|' \
-                -i $pkg/PKGBUILD
-
-            patch -p1 -i $DATADIR/patches/dot-bashrc.patch
-            patch -p1 -i $DATADIR/patches/system-bashrc.patch
-            patch -p1 -i $DATADIR/patches/system-bashrc_logout.patch
-            patch -p1 -i $DATADIR/patches/artix-bashrc.patch
-            cd $pkg
-                updpkgsums
-            cd ..
-        ;;
-    esac
-}
-
-set_import_path(){
-    local arch_dir arch_repo import_path
-    local repo="$1" pkg="$2"
-    case $repo in
-        system|world)
-            if [[ "$repo" == 'system' ]];then
-                arch_repo=core
-                arch_dir=packages
-            fi
-            if [[ "$repo" == 'world' ]];then
-                arch_repo=extra
-                arch_dir=packages
-            fi
-            import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
-            src=$import_path/$arch_repo-x86_64
-            if [[ -d $import_path/$arch_repo-any ]];then
-                src=$import_path/$arch_repo-any
-            elif [[ -d $import_path/testing-x86_64 ]];then
-                src=$import_path/testing-x86_64
-            elif [[ -d $import_path/testing-any ]];then
-                src=$import_path/testing-any
-            fi
-        ;;
-        galaxy)
-            arch_repo=community
-            arch_dir=$arch_repo
-            import_path=${tree_dir_arch}/$arch_dir/$pkg/repos/$arch_repo
-            src=$import_path-x86_64
-            if [[ -d $import_path-any ]];then
-                src=$import_path-any
-            elif [[ -d $import_path-testing-x86_64 ]];then
-                src=$import_path-testing-x86_64
-            elif [[ -d $import_path-testing-any ]];then
-                src=$import_path-testing-any
-            fi
-        ;;
-        lib32)
-            if [[ "$pkg" == 'llvm' ]];then
-                arch_repo=extra
-                arch_dir=packages
-                import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
-                src=$import_path/extra-x86_64
-                if [[ -d $import_path/testing-x86_64 ]];then
-                    src=$import_path/testing-x86_64
-                fi
-            else
-                arch_repo=multilib
-                arch_dir=community
-                import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
-                src=$import_path/$arch_repo-x86_64
-                if [[ -d $import_path/$arch_repo-testing-x86_64 ]];then
-                    src=$import_path/$arch_repo-testing-x86_64
-                fi
-            fi
-        ;;
-    esac
-}
-
-import_from_arch(){
-    local timer=$(get_timer) branch='testing' push="$1"
-    for repo in ${repo_tree_artix[@]};do
-        read_import_list "$repo"
-        if [[ -n ${import_list[@]} ]];then
-            cd ${tree_dir_artix}/$repo
-            git checkout $branch &> /dev/null
-            $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
-            git pull origin "$branch"
-            msg "Import into [%s]" "$repo"
-            for pkg in ${import_list[@]};do
-                source $pkg/PKGBUILD 2>/dev/null
-                local ver=$(get_full_version $pkg)
-                msg2 "package: %s-%s" "$pkg" "$ver"
-                set_import_path "$repo" "$pkg"
-                rsync "${rsync_args[@]}"  $src/ ${tree_dir_artix}/$repo/$pkg/
-                if $(is_dirty) || $(is_untracked); then
-                    patch_pkg "$pkg"
-                    ${push} && git add "$pkg"
-                    msg2 "Archlinux import: [%s]" "$pkg-$ver"
-                    if ${push};then
-                        git commit -m "Archlinux import: $pkg-$ver"
-                        sleep 10
-                        git push origin "$branch"
-                    fi
-                fi
-                unset pkgver epoch pkgrel ver
-            done
-        fi
-    done
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}

lib/util-pkg.sh

@@ -9,75 +9,131 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-in_array() {
-    local needle=$1; shift
-    local item
-    for item in "$@"; do
-        [[ $item = $needle ]] && return 0 # Found
+get_local_head(){
+    echo $(git log --pretty=%H ...refs/heads/$1^ | head -n 1)
+}
+
+get_remote_head(){
+    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
+}
+
+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
+}
+
+get_compliant_name(){
+    local gitname="$1"
+    case $gitname in
+        *+) gitname=${gitname//+/plus}
+    esac
+    echo $gitname
+}
+
+find_tree(){
+    local tree="$1" pkg="$2"
+    local result=$(find $tree -mindepth 2 -maxdepth 2 -type d -name "$pkg")
+    result=${result%/*}
+    echo ${result##*/}
+}
+
+find_repo(){
+    local pkg="$1" unst="$2" stag="$3" repo=
+    local repos=(core extra testing community community-testing mulitilib multilib-testing)
+
+    $stag && repos+=(staging community-staging mulitilib-staging)
+    $unst && repos+=(gnome-unstable kde-unstable)
+
+    for r in ${repos[@]};do
+        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
     done
-    return 1 # Not Found
+    echo $repo
 }
 
-# $1: sofile
-# $2: soarch
-process_sofile() {
-    # extract the library name: libfoo.so
-    local soname="${1%.so?(+(.+([0-9])))}".so
-    # extract the major version: 1
-    soversion="${1##*\.so\.}"
-    if [[ "$soversion" = "$1" ]] && (($IGNORE_INTERNAL)); then
-        continue
-    fi
-    if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then
-    # libfoo.so=1-64
-        msg "${soname}=${soversion}-$2"
-        soobjects+=("${soname}=${soversion}-$2")
-    fi
+clone_tree(){
+    local timer=$(get_timer) host_tree="$1"
+    git clone $host_tree.git
+    show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
-pkgver_equal() {
-    if [[ $1 = *-* && $2 = *-* ]]; then
-        # if both versions have a pkgrel, then they must be an exact match
-        [[ $1 = "$2" ]]
+pull_tree(){
+    local branch="master"
+    local local_head=$(get_local_head "$branch")
+    local remote_head=$(get_remote_head "$branch")
+    if [[ "${local_head}" == "${remote_head}" ]]; then
+        msg2 "remote changes: no"
     else
-        # otherwise, trim any pkgrel and compare the bare version.
-        [[ ${1%%-*} = "${2%%-*}" ]]
+        msg2 "remote changes: yes"
+        git pull origin "$branch"
     fi
 }
 
-get_full_version() {
-    # set defaults if they weren't specified in buildfile
-    pkgbase=${pkgbase:-${pkgname[0]}}
-    epoch=${epoch:-0}
-    if [[ -z $1 ]]; then
-        if [[ $epoch ]] && (( ! $epoch )); then
-            echo $pkgver-$pkgrel
-        else
-            echo $epoch:$pkgver-$pkgrel
-        fi
-    else
-        for i in pkgver pkgrel epoch; do
-            local indirect="${i}_override"
-            eval $(declare -f package_$1 | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")
-            [[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
-        done
-        if (( ! $epoch_override )); then
-            echo $pkgver_override-$pkgrel_override
-        else
-            echo $epoch_override:$pkgver_override-$pkgrel_override
-        fi
-    fi
+get_pkg_org(){
+    local pkg="$1" org= sub=
+    case ${pkg} in
+        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
 }
 
 find_cached_package() {
-    local searchdirs=("$PWD" "$PKGDEST") results=()
+    local searchdirs=("$PKGDEST" "$PWD") results=()
     local targetname=$1 targetver=$2 targetarch=$3
     local dir pkg pkgbasename name ver rel arch r results
 
     for dir in "${searchdirs[@]}"; do
         [[ -d $dir ]] || continue
 
-        for pkg in "$dir"/*.pkg.tar.xz; do
+        for pkg in "$dir"/*.pkg.tar.?z; do
             [[ -f $pkg ]] || continue
 
             # avoid adding duplicates of the same inode
@@ -87,7 +143,7 @@ find_cached_package() {
 
             # split apart package filename into parts
             pkgbasename=${pkg##*/}
-            pkgbasename=${pkgbasename%.pkg.tar?(.?z)}
+            pkgbasename=${pkgbasename%.pkg.tar.?z}
 
             arch=${pkgbasename##*-}
             pkgbasename=${pkgbasename%-"$arch"}
@@ -110,7 +166,7 @@ find_cached_package() {
             return 1
         ;;
         1)
-            printf '%s\n' "$results"
+            printf '%s\n' "${results[0]}"
             return 0
         ;;
         *)

lib/util-profile.sh

@@ -1,123 +0,0 @@
-#!/bin/bash
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-load_profile(){
-    local prof="$1"
-    local profdir="${DATADIR}/iso-profiles/$prof"
-    [[ "$prof" != 'base' ]] && profdir=${workspace_dir}/iso-profiles/$prof
-
-    root_list="${DATADIR}/iso-profiles/base/Packages-Root"
-    [[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
-
-    root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
-    [[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
-
-    [[ -f "$profdir/Packages-Desktop" ]] && desktop_list="$profdir/Packages-Desktop"
-    [[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay"
-
-    live_list="${DATADIR}/iso-profiles/base/Packages-Live"
-    [[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live"
-
-    live_overlay="${DATADIR}/iso-profiles/base/live-overlay"
-    [[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay"
-
-    [[ -f $profdir/profile.conf ]] || return 1
-
-    [[ -r $profdir/profile.conf ]] && source $profdir/profile.conf
-
-    [[ -z ${displaymanager} ]] && displaymanager="none"
-
-    [[ -z ${autologin} ]] && autologin="true"
-    [[ ${displaymanager} == 'none' ]] && autologin="false"
-
-    [[ -z ${hostname} ]] && hostname="artix"
-
-    [[ -z ${username} ]] && username="artix"
-
-    [[ -z ${password} ]] && password="artix"
-
-    if [[ -z ${addgroups} ]];then
-        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
-    fi
-
-    if [[ -z ${openrc_boot[@]} ]];then
-        openrc_boot=('elogind')
-    fi
-
-    if [[ -z ${openrc_default[@]} ]];then
-        openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-    fi
-
-    [[ ${displaymanager} != "none" ]] && openrc_default+=('xdm')
-
-    enable_live=('artix-live' 'pacman-init')
-
-    [[ -z ${netgroups} ]] && netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
-
-    return 0
-}
-
-write_live_session_conf(){
-    local path=$1${SYSCONFDIR}
-    [[ ! -d $path ]] && mkdir -p "$path"
-    local conf=$path/live.conf
-    msg2 "Writing %s" "${conf##*/}"
-    echo '# live session configuration' > ${conf}
-    echo '' >> ${conf}
-    echo '# autologin' >> ${conf}
-    echo "autologin=${autologin}" >> ${conf}
-    echo '' >> ${conf}
-    echo '# live username' >> ${conf}
-    echo "username=${username}" >> ${conf}
-    echo '' >> ${conf}
-    echo '# live password' >> ${conf}
-    echo "password=${password}" >> ${conf}
-    echo '' >> ${conf}
-    echo '# live group membership' >> ${conf}
-    echo "addgroups='${addgroups}'" >> ${conf}
-}
-
-# $1: file name
-load_pkgs(){
-    local pkglist="$1" arch="$2" init="$3" _kv="$4"
-    info "Loading Packages: [%s] ..." "${pkglist##*/}"
-
-    local _init="s|>$init||g"
-    case "$init" in
-        'openrc') _init_rm1="s|>runit.*||g"; _init_rm2="s|>s6*||g" ;;
-        's6') _init_rm1="s|>runit.*||g"; _init_rm2="s|>openrc.*||g" ;;
-        'runit') _init_rm1="s|>s6.*||g"; _init_rm2="s|>openrc.*||g" ;;
-    esac
-
-    local _arch="s|>x86_64||g" _arch_rm="s|>i686.*||g"
-
-    if [[ "$arch" == 'i686' ]];then
-        _arch="s|>i686||g"
-        _arch_rm="s|>x86_64.*||g"
-    fi
-
-    local _blacklist="s|>blacklist.*||g" \
-        _kernel="s|KERNEL|$_kv|g" \
-        _space="s| ||g" \
-        _clean=':a;N;$!ba;s/\n/ /g' \
-        _com_rm="s|#.*||g"
-
-    packages=($(sed "$_com_rm" "$pkglist" \
-            | sed "$_space" \
-            | sed "$_blacklist" \
-            | sed "$_purge" \
-            | sed "$_init" \
-            | sed "$_init_rm1" \
-            | sed "$_init_rm2" \
-            | sed "$_arch" \
-            | sed "$_arch_rm" \
-            | sed "$_kernel" \
-            | sed "$_clean"))
-}

lib/util-yaml-check.sh

@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-import ${LIBDIR}/util-yaml.sh
-
-write_netgroup_yaml(){
-    local name="$1" yaml="$2"
-    msg2 "Writing %s ..." "${yaml##*/}"
-    echo "---" > "$yaml"
-    echo "- name: '$name'" >> "$yaml"
-    echo "  description: '$name'" >> "$yaml"
-    echo "  selected: false" >> "$yaml"
-    echo "  hidden: false" >> "$yaml"
-    echo "  critical: false" >> "$yaml"
-    echo "  packages:" >> "$yaml"
-    for p in ${packages[@]};do
-        echo "       - $p" >> "$yaml"
-    done
-}
-
-write_pacman_group_yaml(){
-    local group="$1"
-    packages=$(pacman -Sgq "$group")
-    prepare_dir "${cache_dir_netinstall}/pacman"
-    write_netgroup_yaml "$group" "${cache_dir_netinstall}/pacman/$group.yaml"
-}
-
-gen_fn(){
-    echo "${yaml_dir}/$1-${target_arch}-${initsys}.yaml"
-}
-
-prepare_build(){
-    load_profile "${profile}"
-    yaml_dir=${cache_dir_netinstall}/${profile}/${target_arch}
-    prepare_dir "${yaml_dir}"
-}
-
-build(){
-    load_pkgs "${root_list}" "${target_arch}" "${initsys}" "${kernel}"
-    write_netgroup_yaml "${profile}" "$(gen_fn "Packages-Root")"
-    if [[ -f "${desktop_list}" ]]; then
-        load_pkgs "${desktop_list}" "${target_arch}" "${initsys}" "${kernel}"
-        write_netgroup_yaml "${profile}" "$(gen_fn "Packages-Desktop")"
-    fi
-    ${calamares} && configure_calamares "${yaml_dir}"
-}

lib/util-yaml.sh

@@ -1,102 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-get_preset(){
-    local p=${tmp_dir}/${kernel}.preset
-    cp ${DATADIR}/linux.preset $p
-    sed -e "s|@kernel@|$kernel|g" \
-        -e "s|@arch@|${target_arch}|g"\
-        -i $p
-    echo $p
-}
-
-write_bootloader_conf(){
-    local conf="$1/bootloader.conf" efi_boot_loader='grub'
-    msg2 "Writing %s ..." "${conf##*/}"
-    source "$(get_preset)"
-    echo '---' > "$conf"
-    echo "efiBootLoader: \"${efi_boot_loader}\"" >> "$conf"
-    echo "kernel: \"${ALL_kver#*/boot}\"" >> "$conf"
-    echo "img: \"${default_image#*/boot}\"" >> "$conf"
-    echo "fallback: \"${fallback_image#*/boot}\"" >> "$conf"
-    echo 'timeout: "10"' >> "$conf"
-    echo "kernelLine: \", with ${kernel}\"" >> "$conf"
-    echo "fallbackKernelLine: \", with ${kernel} (fallback initramfs)\"" >> "$conf"
-    echo 'grubInstall: "grub-install"' >> "$conf"
-    echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
-    echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
-    echo '#efiBootloaderId: "dirname"' >> "$conf"
-}
-
-write_servicescfg_conf(){
-    local conf="$1/servicescfg.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo '---' >  "$conf"
-    echo '' >> "$conf"
-    echo 'services:' >> "$conf"
-    echo '    enabled:' >> "$conf"
-    for s in ${openrc_boot[@]};do
-        echo "      - name: $s" >> "$conf"
-        echo '        runlevel: boot' >> "$conf"
-    done
-    for s in ${openrc_default[@]};do
-        echo "      - name: $s" >> "$conf"
-        echo '        runlevel: default' >> "$conf"
-    done
-}
-
-write_initcpio_conf(){
-    local conf="$1/initcpio.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "kernel: ${kernel}" >> "$conf"
-}
-
-write_users_conf(){
-    local conf="$1/users.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "defaultGroups:" >> "$conf"
-    local IFS=','
-    for g in ${addgroups[@]};do
-        echo "    - $g" >> "$conf"
-    done
-    unset IFS
-    echo "autologinGroup:  autologin" >> "$conf"
-    echo "doAutologin:     false" >> "$conf"
-    echo "sudoersGroup:    wheel" >> "$conf"
-    echo "setRootPassword: true" >> "$conf"
-    echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
-    echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
-    echo "avatarFilePath:  ~/.face" >> "$conf"
-}
-
-write_netinstall_conf(){
-    local conf="$1/netinstall.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "groupsUrl: ${netgroups}/netgroups-${initsys}.yaml" >> "$conf"
-}
-
-configure_calamares(){
-    local modules_dir="$1"
-    if [[ -d $modules_dir ]];then
-        info "Configuring [Calamares]"
-        write_users_conf "$modules_dir"
-        write_netinstall_conf "$modules_dir"
-        write_initcpio_conf "$modules_dir"
-        case ${initsys} in
-            'openrc') write_servicescfg_conf "$modules_dir" ;;
-        esac
-        write_bootloader_conf "$modules_dir"
-        info "Done configuring [Calamares]"
-    fi
-}

lib/util.sh

@@ -27,7 +27,7 @@ load_vars() {
     [[ -f $1 ]] || return 1
 
     for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER CARCH GPGKEY; do
-        [[ -z ${!var} ]] && eval $(grep -a "^${var}=" "$1")
+        [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$1")"
     done
 
     return 0
@@ -47,87 +47,64 @@ get_osname(){
     echo "${NAME}"
 }
 
-get_osid(){
-    source /usr/lib/os-release
-    echo "${ID}"
-}
-
 init_artools_base(){
 
-    [[ -z ${target_arch} ]] && target_arch=$(uname -m)
+    ARCH=$(uname -m)
 
-    [[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/artools'
+    [[ -z ${CHROOTS_DIR} ]] && CHROOTS_DIR='/var/lib/artools'
 
-    log_dir='/var/log/artools'
+    [[ -z ${WORKSPACE_DIR} ]] && WORKSPACE_DIR=/home/${OWNER}/artools-workspace
 
-    tmp_dir='/tmp'
-
-    [[ -z ${workspace_dir} ]] && workspace_dir=/home/${OWNER}/artools-workspace
-
-    prepare_dir "${workspace_dir}"
+    prepare_dir "${WORKSPACE_DIR}"
 }
 
 init_artools_pkg(){
 
-    [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
+    DOMAIN='artixlinux.org'
 
-    [[ -z ${repo_tree_artix[@]} ]] && repo_tree_artix=('system' 'world' 'galaxy' 'lib32')
+    GIT_DOMAIN="gitea.${DOMAIN}"
 
-    [[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
+    GIT_URL="https://${GIT_DOMAIN}"
 
-    [[ -z ${tree_dir_arch} ]] && tree_dir_arch=${workspace_dir}/archlinux
+    [[ -z ${GIT_TOKEN} ]] && GIT_TOKEN=''
 
-    [[ -z ${repo_tree_arch} ]] && repo_tree_arch=('packages' 'community')
+    [[ -z ${TREE_DIR_ARTIX} ]] && TREE_DIR_ARTIX="${WORKSPACE_DIR}/artixlinux"
 
-    [[ -z ${host_tree_arch} ]] && host_tree_arch='git://projects.archlinux.org/svntogit'
+    [[ -z ${HOST_TREE_ARTIX} ]] && HOST_TREE_ARTIX="gitea@${GIT_DOMAIN}:artixlinux"
 
-    list_dir_import="${SYSCONFDIR}/import.list.d"
+    [[ -z ${TREE_DIR_ARCH} ]] && TREE_DIR_ARCH="${WORKSPACE_DIR}/archlinux"
 
-    [[ -d ${AT_USERCONFDIR}/import.list.d ]] && list_dir_import=${AT_USERCONFDIR}/import.list.d
+    [[ -z ${HOST_TREE_ARCH} ]] && HOST_TREE_ARCH='git://projects.archlinux.org/svntogit'
 
-    chroots_pkg="${chroots_dir}/buildpkg"
+    CHROOTS_PKG="${CHROOTS_DIR}/buildpkg"
 
-    [[ -z ${patches_dir} ]] && patches_dir=${workspace_dir}/archlinux-patches
-
-    [[ -z ${repos_root} ]] && repos_root="${workspace_dir}/repos"
+    [[ -z ${REPOS_ROOT} ]] && REPOS_ROOT="${WORKSPACE_DIR}/repos"
 }
 
 init_artools_iso(){
-    chroots_iso="${chroots_dir}/buildiso"
+    CHROOTS_ISO="${CHROOTS_DIR}/buildiso"
 
-    cache_dir_iso="${workspace_dir}/iso"
+    [[ -z ${ISO_POOL} ]] && ISO_POOL="${WORKSPACE_DIR}/iso"
 
-    prepare_dir "${cache_dir_iso}"
+    prepare_dir "${ISO_POOL}"
 
-    profile='base'
+    PROFILE='base'
 
-    [[ -z ${iso_version} ]] && iso_version=$(date +%Y%m%d)
+    [[ -z ${ISO_VERSION} ]] && ISO_VERSION=$(date +%Y%m%d)
 
-    iso_name=$(get_osid)
+    [[ -z ${INITSYS} ]] && INITSYS="openrc"
 
-    iso_label="ARTIX_$(date +%Y%m)"
+    [[ -z ${GPG_KEY} ]] && GPG_KEY=''
 
-    [[ -z ${initsys} ]] && initsys="openrc"
+    [[ -z ${UPLIMIT} ]] && UPLIMIT=1000
 
-    [[ -z ${kernel} ]] && kernel="linux-lts"
+    FILE_HOST="download.${DOMAIN}"
 
-    [[ -z ${gpgkey} ]] && gpgkey=''
+    [[ -z ${FILE_HOME} ]] && FILE_HOME="/srv/iso"
 
-    [[ -z ${uplimit} ]] && uplimit=100
+    [[ -z ${FILE_PORT} ]] && FILE_PORT=65432
 
-    [[ -z ${tracker_url} ]] && tracker_url='udp://mirror.strits.dk:6969'
-
-    [[ -z ${piece_size} ]] && piece_size=21
-
-    [[ -z ${file_host} ]] && file_host="sourceforge.net"
-
-    [[ -z ${project} ]] && project="artix-linux"
-
-    [[ -z ${account} ]] && account="[SetUser]"
-
-    [[ -z ${host_mirrors[@]} ]] && host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
-
-    torrent_meta="$(get_osname)"
+    [[ -z ${ACCOUNT} ]] && ACCOUNT="naughtyISOuploader"
 }
 
 
@@ -135,9 +112,9 @@ load_config(){
 
     [[ -f $1 ]] || return 1
 
-    artools_conf="$1"
+    ARTOOLS_CONF="$1"
 
-    [[ -r ${artools_conf} ]] && source ${artools_conf}
+    [[ -r ${ARTOOLS_CONF} ]] && source ${ARTOOLS_CONF}
 
     init_artools_base
 
@@ -179,15 +156,15 @@ load_user_info(){
 }
 
 show_version(){
-    msg "artools"
-    msg2 "version: %s" "${version}"
+    msg "ARTOOLS"
+    msg2 "VERSION: %s" "${VERSION}"
 }
 
 show_config(){
     if [[ -f ${AT_USERCONFDIR}/artools.conf ]]; then
         msg2 "config: %s" "~/.config/artools/artools.conf"
     else
-        msg2 "config: %s" "${artools_conf}"
+        msg2 "config: %s" "${ARTOOLS_CONF}"
     fi
 }