Merge pull request #63 from artix-linux/devel

Devel

Makefile

@@ -1,7 +1,41 @@
-Version=0.7
+VERSION=0.8
 
+CHROOT_VERSION=0.7
+
+TOOLS = artools
+ifdef PREFIX
 PREFIX = /usr/local
+endif
 SYSCONFDIR = /etc
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+DATADIR = $(PREFIX)/share
+
+DIRMODE = -dm0755
+FILEMODE = -m0644
+MODE =  -m0755
+
+LN = ln -sf
+RM = rm -f
+RMD = rm -fr --one-file-system
+M4 = m4 -P
+CHMODAW = chmod a-w
+CHMODX = chmod +x
+
+ifdef WITH-PKG
+WITH-PKG = no
+else
+WITH-PKG = yes
+endif
+ifdef WITH-ISO
+WITH-ISO = no
+else
+WITH-ISO = yes
+endif
+
+CPIODIR = $(SYSCONFDIR)/initcpio
+PROFDIR = $(DATADIR)/$(TOOLS)/iso-profiles/base
+OVERLAYDIR = $(PROFDIR)/live-overlay/etc
 
 SYSCONF = \
 	data/artools.conf
@@ -33,7 +67,8 @@ BIN_PKG = \
 	bin/buildpkg \
 	bin/buildtree \
 	bin/deploypkg \
-	bin/commitpkg
+	bin/commitpkg \
+	bin/mkpkgclean
 
 LIBS_PKG = \
 	$(wildcard lib/util-pkg*.sh)
@@ -60,158 +95,146 @@ BIN_ISO = \
 	bin/buildiso \
 	bin/deployiso
 
+BIN_ISO_SYMS = \
+	buildiso-gremlins \
+	buildiso-goblins
+
 LIBS_ISO = \
 	$(wildcard lib/util-iso*.sh)
 
 SHARED_ISO = \
 	data/mkinitcpio.conf
 
-CPIOHOOKS = \
-	$(wildcard initcpio/hooks/*)
+ifeq ($(WITH-PKG),yes)
 
-CPIOINST = \
-	$(wildcard initcpio/install/*)
+all: $(BIN_PKG)
 
-CPIO = \
-	initcpio/script/artix_shutdown
+endif
 
-BASE = \
-	$(wildcard data/base/Packages-*) \
-	data/base/profile.conf
+ifeq ($(WITH-ISO),yes)
 
-LIVE_ETC = \
-	data/base/live-overlay/etc/issue \
-	data/base/live-overlay/etc/fstab
+all: $(BIN_ISO)
 
-LIVE_ETC_DEFAULT = \
-	$(wildcard data/base/live-overlay/etc/default/*)
+endif
 
-LIVE_ETC_PAM = \
-	$(wildcard data/base/live-overlay/etc/pam.d/*)
+all: $(BIN_BASE)
 
-LIVE_ETC_SUDOERS = \
-	$(wildcard data/base/live-overlay/etc/sudoers.d/*)
-
-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)$(PREFIX)/bin
-	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(BIN_PKG) $(DESTDIR)$(BINDIR)
 
-	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
+	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
 
-	for l in ${COMMITPKG_SYMS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
+	for l in $(COMMITPKG_SYMS); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_PKG} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(LIBS_PKG) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(SHARED_PKG) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/patches
-	install -m0644 ${PATCHES} $(DESTDIR)$(PREFIX)/share/artools/patches
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
+	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
+install_cpio:
+	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
 
-install_isobase:
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
-	install -m0644 ${BASE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
+install_base_profile:
+	+make OVERLAYDIR=$(OVERLAYDIR) PROFDIR=$(PROFDIR) DESTDIR=$(DESTDIR) -C data/base install
 
-	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_iso: install_cpio install_base_profile
+	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	install $(MODE) $(BIN_ISO) $(DESTDIR)$(BINDIR)
 
-	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
+	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/pam.d
-	install -m0644 ${LIVE_ETC_PAM} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
+	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FILEMODE) $(LIBS_ISO) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	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 $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FILEMODE) $(SHARED_ISO) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-install_iso:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
 
-	ln -sf buildiso $(DESTDIR)$(PREFIX)/bin/buildiso-gremlins
-
-	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
+	for f in $(notdir $(SYSCONF)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$$f; done
+	for f in $(notdir $(BIN_BASE)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
+	for f in $(notdir $(LIBS_BASE)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
+	for f in $(notdir $(SHARED_BASE)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
+	$(RMD) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	$(RMD) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	$(RMD) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 uninstall_pkg:
-	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	for l in ${COMMITPKG_SYMS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
-	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
+	for f in $(notdir $(BIN_PKG)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
+	$(RM) $(DESTDIR)$(BINDIR)/find-libprovides
+	for l in $(COMMITPKG_SYMS); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
+	for f in $(notdir $(LIBS_PKG)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
+	for f in $(notdir $(PATCHES)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches/$$f; done
+	for f in $(notdir $(SHARED_PKG)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$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_cpio:
+	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio uninstall
 
-uninstall_iso:
-	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/bin/buildiso-gremlins
-	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
+uninstall_base_profile:
+	+make OVERLAYDIR=$(OVERLAYDIR) PROFDIR=$(PROFDIR) DESTDIR=$(DESTDIR) -C data/base uninstall
 
-	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
+uninstall_iso: uninstall_cpio uninstall_base_profile
+	for f in $(notdir $(BIN_ISO)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
+	for l in $(notdir $(BIN_ISO_SYMS)); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
+	for f in $(notdir $(LIBS_ISO)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
+	for f in $(notdir $(SHARED_ISO)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
 
-install: install_base install_pkg install_iso install_isobase
+ifeq ($(WITH-PKG),yes)
 
-uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_isobase
+install: install_pkg
+
+uninstall: uninstall_pkg
+
+endif
+
+ifeq ($(WITH-ISO),yes)
+
+install: install_iso
+
+uninstall: uninstall_iso
+
+endif
+
+install: install_base
+
+uninstall: uninstall_base
 
 dist:
-	git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz
-	gpg --detach-sign --use-agent artools-$(Version).tar.gz
+	git archive --format=tar --prefix=$(TOOLS)-$(VERSION)/ $(VERSION) | gzip -9 > $(TOOLS)-$(VERSION).tar.gz
+	gpg --detach-sign --use-agent $(TOOLS)-$(VERSION).tar.gz
 
 .PHONY: all clean install uninstall dist

README.md

@@ -1,42 +1,72 @@
 artools
 =============
 
-User manual
+#### Make flags
 
-### 1. artools.conf
+
+* PREFIX=/usr/local (default if defined)
+* SYSCONFDIR=/etc
+* WITH-PKG=yes
+* WITH-ISO=yes
+
+
+#### Dependencies
+
+##### Buildtime:
+
+* make
+* git
+* m4
+
+##### Runtime:
+
+- base:
+
+  * openssh
+  * rsync
+  * haveged
+  * os-prober
+  * gnupg
+  * pacman
+
+- pkg:
+
+  * namcap
+  * git
+
+- iso:
+  * dosfstools
+  * libisoburn
+  * squashfs-tools
+  * mkinitcpio
+  * mktorrent
+  * 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/buildiso.in

@@ -29,7 +29,7 @@ prepare_build(){
     local pacman_conf pac_file="pacman-default.conf"
 
     case "${stablility}" in
-        'gremlins') pac_file="pacman-${stablility}.conf" ;;
+        'gremlins'|'goblins') pac_file="pacman-${stablility}.conf" ;;
     esac
 
     pacman_conf="${DATADIR}/$pac_file"

bin/buildtree.in

@@ -19,24 +19,17 @@ DATADIR='@datadir@'
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
 
-clone_tree(){
-    local timer=$(get_timer) tree="$1" host_tree="$2"
-    msg "Preparing [%s] ..." "$tree"
-    info "clone"
-    git clone $host_tree.git
-    msg "Done [%s]" "$tree"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
 pull_tree_arch(){
     cd ${tree_dir_arch}
     for tree in packages community;do
         if [[ -d ${tree} ]];then
             cd ${tree}
-                pull_tree "${tree}"
+                msg "Checking (%s)" "${tree}"
+                pull_tree
             cd ..
         else
-            clone_tree "${tree}" "${host_tree_arch}/${tree}"
+            msg "Cloning (%s) ..." "$tree"
+            clone_tree "${host_tree_arch}/${tree}"
         fi
     done
 }
@@ -47,10 +40,12 @@ pull_tree_artix(){
         if [[ -d ${tree} ]];then
             cd ${tree}
                 git config --bool pull.rebase true
-                pull_tree "${tree}"
+                msg "Checking (%s)" "${tree}"
+                pull_tree
             cd ..
         else
-            clone_tree "${tree}" "${host_tree_artix}/${tree}"
+            msg "Cloning (%s) ..." "$tree"
+            clone_tree "${host_tree_artix}/${tree}"
         fi
     done
 }
@@ -60,25 +55,47 @@ show_version_table(){
     for tree in packages packages-galaxy;do
         local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
         for pkg_path in ${git[@]}; do
-            local artixrepo=$(find_repo "$pkg_path")
+            local artixrepo=$(find_repo "$pkg_path" "${unstable}")
             if [[ -d $pkg_path/repos/$artixrepo ]];then
-                source $pkg_path/trunk/PKGBUILD 2>/dev/null
+                source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
                 local pkg=${pkg_path##*/}
                 local artixver=$(get_full_version $pkg)
                 local src=$(get_import_path "$tree" "$pkg")
-                local archrepo=$(find_repo "$src/$pkg")
+                local archrepo=$(find_repo "$src/$pkg" "${unstable}")
                 if [[ -d $src/$pkg/repos/$archrepo ]];then
-                    source $src/$pkg/trunk/PKGBUILD 2>/dev/null
+                    source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
                     local archver=$(get_full_version $pkg)
                 fi
-                if [ $(vercmp $artixver $archver) -lt 0 ];then
-                    local ar=$(arch_to_artix_repo "$artixrepo")
-                    ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                fi
-                if [ $(vercmp $artixver $archver) -gt 0 ];then
-                    local ar=$(arch_to_artix_repo "$artixrepo")
-                    if [[ -n $archver ]] && [[ -n $archrepo ]];then
-                        ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                if ${artix};then
+                    if [ $(vercmp $artixver $archver) -eq 0 ] || [ $(vercmp $artixver $archver) -gt 0 ];then
+                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        case $ar in
+                            *goblins)
+                                if [[ $archrepo == $artixrepo ]];then
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                else
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                fi
+                            ;;
+                            *gremlins)
+                                if [[ $archrepo == $artixrepo ]];then
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                else
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                fi
+                            ;;
+                        esac
+                    fi
+                else
+                    if [ $(vercmp $artixver $archver) -lt 0 ];then
+                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                    fi
+                    if [ $(vercmp $artixver $archver) -gt 0 ];then
+                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        if [[ -n $archver ]] && [[ -n $archrepo ]];then
+                            ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                        fi
                     fi
                 fi
                 unset pkgver epoch pkgrel artixver archver _package
@@ -87,83 +104,80 @@ show_version_table(){
     done
 }
 
-show_artix_table(){
-     msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
-    for tree in packages packages-galaxy;do
-        local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
-        for pkg_path in ${git[@]}; do
-            local artixrepo=$(find_repo "$pkg_path")
-            if [[ -d $pkg_path/repos/$artixrepo ]];then
-                source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
-                local pkg=${pkg_path##*/}
-                local artixver=$(get_full_version $pkg)
-                local src=$(get_import_path "$tree" "$pkg")
-                local archrepo=$(find_repo "$src/$pkg")
-                if [[ -d $src/$pkg/repos/$archrepo ]];then
-                    source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
-                    local archver=$(get_full_version $pkg)
-                fi
-                if [ $(vercmp $artixver $archver) -eq 0 ] || [ $(vercmp $artixver $archver) -gt 0 ];then
-
-                    local ar=$(arch_to_artix_repo "$artixrepo")
-                    case $ar in
-                        *goblins)
-                            if [[ $archrepo == $artixrepo ]];then
-                                msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                            else
-                                msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                            fi
-                        ;;
-                        *gremlins)
-                            if [[ $archrepo == $artixrepo ]];then
-                                msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                            else
-                                msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                            fi
-                        ;;
-#                         system|world|galaxy|lib32) msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver" ;;
-                    esac
-                fi
-                unset pkgver epoch pkgrel artixver archver _package
-            fi
-        done
-    done
+show_deps(){
+    local src="$1" repo="$2"
+    source $src/PKGBUILD 2>/dev/null
+    [[ $arch == 'any' ]] && CARCH=any
+    local archver=$(get_full_version $pkg)
+    msg "git tree: %s" "$git_tree_arch"
+    msg2 "repo: %s" "$repo"
+    msg2 "Package Name: %s" "$pkg"
+    msg2 "Arch Version: %s" "$archver"
+    msg2 "arch: %s" "$CARCH"
+    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
+    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
 }
 
 from_arch(){
-    local pkg="$1" archtree="$2" artixtree="$3" src= dest=
-    src=${tree_dir_arch}/$archtree/$pkg/trunk
-    dest=${tree_dir_artix}/$artixtree/$pkg/trunk
+    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"
 
-    source $src/PKGBUILD 2>/dev/null
-    cd ${tree_dir_arch}/$archtree
-    msg "Package: %s" "$pkg"
-    local archver=$(get_full_version $pkg)
-    msg2 "Arch Version: %s" "$archver"
+    local pkg_path=${tree_dir_arch}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$pkg_path" "${unstable}")
+
+    src=$pkg_path/repos/$repo
+    $trunk && src=$pkg_path/trunk
+
+    local git_tree_artix=$(find_tree "${tree_dir_artix}" "$pkg")
+    dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
+
+    cd ${tree_dir_arch}/$git_tree_arch
+
+    show_deps "$src" "$repo"
 
     if [[ -d $dest ]];then
+        cd ${tree_dir_artix}/$git_tree_artix
+
         source $dest/PKGBUILD 2>/dev/null
-        cd ${tree_dir_artix}/$artixtree
         local artixver=$(get_full_version $pkg)
+
         msg2 "Artix Version: %s" "$artixver"
-        if [ $(vercmp $artixver $archver) -lt 0 ];then
-            info "Importing from archlinux (%s)" "$archtree"
-            rsync "${rsync_args[@]}" $src/ $dest/
-            patch_pkg "$pkg" "$tree"
-        else
-            warning "Versions match! Nothing to do!"
-        fi
+        info "Update from archlinux (%s)" "$git_tree_arch"
+        rsync "${rsync_args[@]}" $src/ $dest/
+        patch_pkg "$pkg" "$tree"
     else
-        cd ${tree_dir_artix}/$artixtree
-        info "Importing from archlinux (%s)" "$archtree"
+        [[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
+        [[ $git_tree_arch == 'community' ]] && git_tree_artix='packages-galaxy'
+
+        cd ${tree_dir_artix}/$git_tree_artix
+
+        dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
         mkdir $pkg
+
+        info "Import from archlinux (%s)" "$git_tree_arch"
         rsync "${rsync_args[@]}" $src/ $dest/
         patch_pkg "$pkg" "$tree"
     fi
 }
 
+view_build(){
+    local pkg="$1" src=
+    local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+
+    local pkg_path=${tree_dir_arch}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$pkg_path" "${unstable}")
+
+    src=$pkg_path/repos/$repo
+
+    show_deps "$src" "$repo"
+}
+
 sync_repos(){
-    pull_tree_arch
+    ${sync_arch} && pull_tree_arch
     pull_tree_artix
 }
 
@@ -176,12 +190,14 @@ display_settings(){
 
     msg "ARGS:"
     msg2 "sync: %s" "${sync}"
+    msg2 "sync_arch: %s" "${sync_arch}"
     msg2 "compare: %s" "${compare}"
     msg2 "upgrades: %s" "${upgrades}"
     msg2 "downgrades: %s" "${downgrades}"
     msg2 "artix: %s" "${artix}"
-    msg2 "import_packages: %s" "${import_packages}"
-    msg2 "import_community: %s" "${import_community}"
+    msg2 "import: %s" "${import}"
+    msg2 "view: %s" "${view}"
+    msg2 "trunk: %s" "${trunk}"
 
     msg "PATHS:"
     msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
@@ -196,29 +212,32 @@ load_vars /etc/makepkg.conf
 
 pretend=false
 sync=false
+sync_arch=true
 compare=false
-upgrades=true
+unstable=false
+upgrades=false
 downgrades=false
 artix=false
-import_packages=false
-import_community=false
+import=false
+view=false
+trunk=false
 package=''
 
-git_artix='packages'
-git_arch='packages'
-
 rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
 
 usage() {
     echo "Usage: ${0##*/} [options]"
     echo '    -p <pkg>      Package name'
     echo "    -s            Clone or pull repos"
+    echo "    -z            Don't clone or pull arch repos"
     echo '    -c            Compare packages'
+    echo '    -x            Include unstable kde and gnome'
     echo '    -u            Show upgrade packages'
     echo '    -d            Show downgrade packages'
-    echo '    -a            Show artix specific packages'
-    echo '    -i            Import from arch packages'
-    echo '    -j            Import from arch community'
+    echo '    -a            Show testing and staging packages'
+    echo '    -i            Import a package from arch repos'
+    echo '    -t            Import from arch trunk'
+    echo '    -v            View package depends'
     echo '    -q            Query settings'
     echo '    -h            This help'
     echo ''
@@ -228,18 +247,21 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:csudaijqh'
+opts='p:csudaiztxvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) package="$OPTARG" ;;
         s) sync=true ;;
+        z) sync_arch=false ;;
         c) compare=true ;;
-        u) upgrades=false ;;
+        u) upgrades=true ;;
         d) downgrades=true ;;
         a) artix=true ;;
-        i) import_packages=true ;;
-        j) import_community=true; git_artix='packages-galaxy'; git_arch='community' ;;
+        i) import=true ;;
+        t) trunk=true ;;
+        v) view=true ;;
+        x) unstable=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -255,10 +277,8 @@ ${pretend} && display_settings && exit 1
 
 ${sync} && sync_repos
 
+${view} && view_build "${package}"
+
 ${compare} && show_version_table
 
-${artix} && show_artix_table
-
-${import_packages} && from_arch "${package}" "${git_arch}" "${git_artix}"
-
-${import_community} && from_arch "${package}" "${git_arch}" "${git_artix}"
+${import} && from_arch "${package}"

bin/chroot-run.in

@@ -11,6 +11,8 @@
 
 version=@version@
 
+chroot_version=@chroot_version@
+
 LIBDIR='@libdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
@@ -114,8 +116,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

@@ -23,60 +23,78 @@ 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
-        local ver=$(get_full_version ${package})
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${package}")
+
         if ${remove};then
             local action='remove'
-            local pkg=${package}-$ver
             if [[ "${source_repo}" == 'trunk' ]];then
-                pkg=${package}
-                info "[%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
+                local pkg=${package}
                 git rm -r trunk
             else
-                info "[%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
-                git rm -r repos/${source_repo}-$CARCH
+                local pkg="${package}-$ver"
+                git rm -r repos/"${source_repo}-$CARCH"
             fi
+            msg "Action: [%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
             git commit -m "[${source_repo}] '$pkg' ${action}"
-            ${push} && push_tree "${git_tree}"
         else
             local action='modify'
-            info "[%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
+            msg "Action: [%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
             git add .
             git commit -m "[${source_repo}] '${package}-$ver' ${action}"
-            ${push} && push_tree "${git_tree}"
+        fi
+
+        if ${push};then
+            msg "Checking (%s)" "${git_tree}"
+            git pull origin master
+            git push origin master
         fi
     else
         error "Package '%s' does not exist!" "${package}"
     fi
 }
 
-release_pkg(){
+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
-        if [[ ${source_repo} != 'trunk' ]];then
-            cd repos
-            dest=${target_repo}-$CARCH
-            action='move'
-            [[ -d $dest ]] && git rm -r $dest
-            git mv ${source_repo}-$CARCH $dest
-            cd ..
-        else
-            dest=${target_repo}-$CARCH
-            action='add'
-            [[ ! -d repos ]] && mkdir repos
-            cd repos
+        local ver=$(get_full_version "${package}")
+
+        if [[ ${source_repo} == 'trunk' ]];then
+            local action='add'
+            local dest="${target_repo}-$CARCH"
+
             [[ -d repos/$dest ]] && git rm -r repos/$dest
-            cd ..
-            cp -r trunk repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp trunk/* repos/$dest/
+        else
+            local action='move'
+            local src="${source_repo}-$CARCH" dest="${target_repo}-$CARCH"
+
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp repos/$src/* repos/$dest/
+            git rm -r repos/$src
         fi
-        local ver=$(get_full_version ${package})
-        info "[%s] -> [%s] '%s' %s" "${source_repo}" "${target_repo}" "${package}-$ver" "${action}"
+
+        msg "Action: [%s] -> [%s] '%s' %s" "${source_repo}" "${target_repo}" "${package}-$ver" "${action}"
         git add .
         git commit -m "[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
-        ${push} && push_tree "${git_tree}"
+
+        if ${push};then
+            msg "Checking (%s)" "${git_tree}"
+            git pull origin master
+            git push origin master
+        fi
     else
         error "Package '%s' does not exist!" "${package}"
     fi
@@ -115,7 +133,7 @@ usage() {
     echo "Usage: ${0##*/} [options]"
     echo "    -s <name>          Source repository [default:${source_repo}]"
     echo '    -p <pkg>           Package name'
-    echo '    -r                 Delete from repo'
+    echo '    -r                 Delete from repo (commitpkg only)'
     echo '    -u                 Push'
     echo '    -q                 Query settings and pretend'
     echo '    -h                 This help'
@@ -148,7 +166,7 @@ if $(is_valid_repo "${source_repo}");then
     if [[ "${cmd}" == 'commitpkg' ]];then
         commit_pkg
     else
-        release_pkg
+        symlink_commit_pkg
     fi
 else
     error "source repository '%s' is not valid!" "${source_repo}"

bin/deploypkg.in

@@ -18,41 +18,36 @@ SYSCONFDIR='@sysconfdir@'
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
 
-del_from_repo(){
-    local ver
-    local repo="$1"
-    local repo_path=${repos_root}/$repo/os/${target_arch}
+update_repo(){
+    local repo="$1" pkgfile ver ext=db.tar.xz
+    local repo_path=${repos_root}/$repo/os/${target_arch} packages=()
     source PKGBUILD
     for name in ${pkgname[@]};do
         [[ $arch == any ]] && CARCH=any
-        ver=$(get_full_version $name)
+        ver=$(get_full_version "$name")
         if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
-            info "pkgfile: %s" "${pkgfile##*/}"
-            repo-remove -R $repo_path/$repo.db.tar.xz $name
-            [[ -e $repo_path/${pkgfile##*/} ]] && rm -v $repo_path/${pkgfile##*/}
-            [[ -e $repo_path/${pkgfile##*/}.sig ]] && rm -v $repo_path/${pkgfile##*/}.sig
-        fi
-    done
-}
-
-add_to_repo(){
-    local ver pkgfile=
-    local repo="$1"
-    local repo_path=${repos_root}/$repo/os/${target_arch}
-    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
-            info "pkgfile: %s" "${pkgfile##*/}"
-            if ${sign_pkg};then
-                [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
-                signfile ${pkgfile}
+            local pkg=${pkgfile##*/}
+            info "Found: %s" "$pkg"
+            if ${add_pkg};then
+                local action='add'
+                packages+=("$pkg")
+#                 checkpkg $pkg
+                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
-            ln -sf ${pkgfile}{,.sig} $repo_path/
-            repo-add -R $repo_path/$repo.db.tar.xz $pkgfile
         fi
     done
+    cd $repo_path
+    repo-$action -R $repo.$ext ${packages[@]}
+    return 0
 }
 
 display_settings(){
@@ -83,9 +78,9 @@ sign_pkg=false
 usage() {
     echo "Usage: ${0##*/} [options]"
     echo "    -d                 Destination repository [default:${repository}]"
-    echo '    -a                 Add package to repository'
-    echo '    -r                 Remove package from repository'
-    echo '    -s                 Sign package'
+    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 ''
@@ -100,8 +95,8 @@ opts='d:arsqh'
 while getopts "${opts}" arg; do
     case "${arg}" in
         d) repository="$OPTARG" ;;
-        a) add_pkg=true ;;
-        r) del_pkg=true ;;
+        a) add_pkg=true; del_pkg=false ;;
+        r) del_pkg=true; add_pkg=false ;;
         s) sign_pkg=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
@@ -115,8 +110,4 @@ prepare_dir "${repos_root}"
 
 ${pretend} && display_settings && exit 1
 
-${del_pkg} && del_from_repo "${repository}"
-
-${add_pkg} && add_to_repo "${repository}"
-
-exit 0
+update_repo "${repository}"

bin/mkchroot.in

@@ -11,6 +11,8 @@
 
 version=@version@
 
+chroot_version=@chroot_version@
+
 LIBDIR='@libdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
@@ -104,7 +106,7 @@ 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'
 
-echo "$version" > "$working_dir/.artools"
+echo "$chroot_version" > "$working_dir/.artools"
 
 default_locale "set" "$working_dir"
 

bin/mkchrootpkg.in

@@ -202,11 +202,15 @@ _chrootbuild() {
     # No coredumps
     ulimit -c 0
 
+    # Work around chroot-run not giving a ctty
     exec </dev/console
 
     . /etc/profile
 
     export LANG=en_US.UTF-8
+
+    # workaround meson locale errors
+    # supposedly fixed with coming python-3.7
     locale-gen &> /dev/null
 
     sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
@@ -231,9 +235,11 @@ download_sources() {
     local builddir
     builddir="$(mktemp -d)"
     chmod 1777 "$builddir"
+#     chown "$makepkg_user:$makepkg_user" "$builddir"
 
     # Ensure sources are downloaded
-    sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
+    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."
 
@@ -325,7 +331,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")

bin/mkpkgclean.in

@@ -0,0 +1,93 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+version=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+
+prepare_clean(){
+    if [[ -n ${repository} ]];then
+        storage_dir=${repos_root}/${repository}/os/${target_arch}
+        paccache_args+=(-c "${storage_dir}" -k 1)
+    else
+        if [[ -n ${PKGDEST} ]];then
+            storage_dir=${PKGDEST}
+            paccache_args+=(-c "${storage_dir}" -k 4)
+        else
+            die "PKGDEST not set in makepkg.conf!"
+        fi
+    fi
+}
+
+display_settings(){
+    show_version
+    show_config
+
+    msg "OPTIONS:"
+    msg2 "repository: %s" "${repository}"
+
+    msg "PATH:"
+    msg2 "storage_dir: %s" "${storage_dir}"
+
+    msg "ARGS:"
+    msg2 "paccache_args: %s" "${paccache_args[*]}"
+
+    paccache "${paccache_args[@]}"
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+clean=false
+pretend=false
+repository=''
+storage_dir=''
+paccache_args=(-v)
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -d <dir>           Directory [default:${repository}]"
+    echo '    -c                 Clean up'
+    echo '    -q                 Query settings and pretend cleaning'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='d:cqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        d) repository="$OPTARG" ;;
+        c) clean=true ; paccache_args+=(-r) ;;
+        q) pretend=true; paccache_args+=(-d) ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+prepare_clean
+
+${pretend} && display_settings && exit 1
+
+${clean} && paccache "${paccache_args[@]}"

data/Jenkinsfile.galaxy

@@ -1,274 +0,0 @@
-def ADD_REPO = ''
-def RM_REPO = ''
-def IS_ADD = 'false'
-def IS_REMOVE = 'false'
-def IS_BUILD = 'false'
-def PKG_TRUNK = ''
-def PKG_PATH = ''
-
-pipeline {
-    agent any
-    options {
-        skipDefaultCheckout()
-        timestamps()
-    }
-    stages {
-        stage('Checkout') {
-            steps {
-                script {
-                    checkout scm
-
-                    def currentCommit = sh(returnStdout: true, script: 'git rev-parse @').trim()
-                    echo "currentCommit: ${currentCommit}"
-
-                    def changedFilesStatus = sh(returnStdout: true, script: "git show --pretty=format: --name-status ${currentCommit}").tokenize('\n')
-                    def changedPkgStatus = []
-                    def pkgPath = []
-                    int entryCount = 0
-                    for ( int i = 0; i < changedFilesStatus.size(); i++ ) {
-                        def entry = changedFilesStatus[i].split()
-                        def fileStatus = entry[0]
-                        entryCount = entry.size()
-                        for ( int j = 1; j < entry.size(); j++ ) {
-                            if ( entry[j].contains('/PKGBUILD') && entry[j].contains('/repos') ){
-                                changedPkgStatus << "${fileStatus} " + entry[j].minus('/PKGBUILD')
-                                pkgPath << entry[j].minus('/PKGBUILD')
-                            }
-                        }
-                    }
-
-                    int pkgCount = changedPkgStatus.size()
-                    int pkgPathCount = pkgPath.size()
-                    echo "pkgCount: ${pkgCount}"
-                    echo "entryCount: ${entryCount}"
-                    echo "pkgPathCount: ${pkgPathCount}"
-                    echo "changedPkgStatus: ${changedPkgStatus}"
-
-                    if ( pkgCount > 0 ) {
-
-                        if ( entryCount == 2 && pkgCount == 2 ) {
-                            def pkgEntry1 = changedPkgStatus[0].split()
-                            def pkgEntry2 = changedPkgStatus[1].split()
-                            def srcPath = []
-                            def pkgStatus = []
-                            srcPath << pkgEntry1[1]
-                            srcPath << pkgEntry2[1]
-                            pkgStatus << pkgEntry1[0]
-                            pkgStatus << pkgEntry2[0]
-                            def buildInfo1 = srcPath[0].tokenize('/')
-                            def buildInfo2 = srcPath[1].tokenize('/')
-
-                            if ( pkgStatus[0] == "M" ) {
-                                IS_ADD = 'true'
-                                if ( srcPath[0].contains('community-testing') ) {
-                                    ADD_REPO = 'galaxy-gremlins'
-                                } else if ( srcPath[0].contains('community-x86_64') || srcPath[0].contains('community-any') ) {
-                                    ADD_REPO = 'galaxy'
-                                }
-                                if ( srcPath[0].contains('multilib-testing') ) {
-                                    ADD_REPO = 'lib32-gremlins'
-                                } else if ( srcPath[0].contains('multilib-x86_64') ) {
-                                    ADD_REPO = 'lib32'
-                                }
-                            } else if ( pkgStatus[1] == "M" ) {
-                                IS_ADD = 'true'
-                                if ( srcPath[1].contains('community-testing') ) {
-                                    ADD_REPO = 'galaxy-gremlins'
-                                } else if ( srcPath[1].contains('community-x86_64') || srcPath[1].contains('community-any') ) {
-                                    ADD_REPO = 'galaxy'
-                                }
-                                if ( srcPath[1].contains('multilib-testing') ) {
-                                    ADD_REPO = 'lib32-gremlins'
-                                } else if ( srcPath[1].contains('multilib-x86_64') ) {
-                                    ADD_REPO = 'lib32'
-                                }
-                            }
-
-                            if ( pkgStatus[0] == "D" ) {
-                                IS_REMOVE = 'true'
-                                if ( srcPath[0].contains('community-testing') ) {
-                                    RM_REPO = 'galaxy-gremlins'
-                                } else if ( srcPath[0].contains('community-x86_64') || srcPath[0].contains('community-any') ) {
-                                    RM_REPO = 'galaxy'
-                                }
-                                if ( srcPath[0].contains('multilib-testing') ) {
-                                    RM_REPO = 'lib32-gremlins'
-                                } else if ( srcPath[0].contains('multilib-x86_64') ) {
-                                    RM_REPO = 'lib32'
-                                }
-                            } else if ( pkgStatus[1] == "D" ) {
-                                IS_REMOVE = 'true'
-                                if ( srcPath[1].contains('community-testing') ) {
-                                    RM_REPO = 'galaxy-gremlins'
-                                } else if ( srcPath[1].contains('community-x86_64') || srcPath[1].contains('community-any') ) {
-                                    RM_REPO = 'galaxy'
-                                }
-                                if ( srcPath[1].contains('multilib-testing') ) {
-                                    RM_REPO = 'lib32-gremlins'
-                                } else if ( srcPath[1].contains('multilib-x86_64') ) {
-                                    RM_REPO = 'lib32'
-                                }
-                            }
-
-
-
-                            PKG_TRUNK = buildInfo1[0] + '/trunk'
-                        }
-
-                        if ( entryCount == 3 && pkgCount == 2 ) {
-                            def pkgEntry = changedPkgStatus[0].split()
-                            def pkgStatus = pkgEntry[0]
-                            def buildInfo1 = pkgPath[0].tokenize('/')
-                            def buildInfo2 = pkgPath[1].tokenize('/')
-
-                            if ( pkgStatus.contains('R') ) {
-                                IS_ADD = 'true'
-                                IS_REMOVE = 'true'
-
-                                if ( pkgPath[0].contains('community-staging') && pkgPath[1].contains('community-testing') ) {
-                                    ADD_REPO = 'galaxy-gremlins'
-                                    RM_REPO = 'galaxy-goblins'
-                                } else if ( pkgPath[0].contains('community-testing') && pkgPath[1].contains('community-staging') ) {
-                                    ADD_REPO = 'galaxy-goblins'
-                                    RM_REPO = 'galaxy-gremlins'
-                                }
-
-                                if ( pkgPath[0].contains('community-testing') && pkgPath[1].contains('community-x86_64') || pkgPath[0].contains('community-any') ) {
-                                    ADD_REPO = 'galaxy-gremlins'
-                                    RM_REPO = 'galaxy'
-                                } else if ( pkgPath[0].contains('community-x86_64') || pkgPath[0].contains('community-any') && pkgPath[1].contains('community-testing') ) {
-                                    ADD_REPO = 'galaxy'
-                                    RM_REPO = 'galaxy-gremlins'
-                                }
-
-                                if ( pkgPath[0].contains('multilib-staging') && pkgPath[1].contains('multilib-testing') ) {
-                                    ADD_REPO = 'lib32-gremlins'
-                                    RM_REPO = 'lib32-goblins'
-                                } else if ( pkgPath[0].contains('multilib-testing') && pkgPath[1].contains('multilib-staging') ) {
-                                    ADD_REPO = 'lib32-goblins'
-                                    RM_REPO = 'lib32-gremlins'
-                                }
-
-                                if ( pkgPath[0].contains('multilib-testing') && pkgPath[1].contains('multilib-x86_64') ) {
-                                    ADD_REPO = 'lib32'
-                                    RM_REPO = 'lib32-gremlins'
-                                } else if ( pkgPath[0].contains('multilib-x86_64') && pkgPath[1].contains('multilib-testing') ) {
-                                    ADD_REPO = 'lib32-gremlins'
-                                    RM_REPO = 'lib32'
-                                }
-                            }
-                            PKG_TRUNK = buildInfo1[0] + '/trunk'
-                        }
-
-                        if ( pkgCount == 1 ) {
-                            def pkgEntry = changedPkgStatus[0].split()
-                            def pkgStatus = pkgEntry[0]
-                            def srcPath = pkgEntry[1]
-                            def buildInfo = srcPath.tokenize('/')
-
-                            if ( srcPath.contains('community-staging') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'galaxy-goblins'
-                                RM_REPO = ADD_REPO
-                            } else if ( srcPath.contains('community-testing') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'galaxy-gremlins'
-                                RM_REPO = ADD_REPO
-                            } else if ( srcPath.contains('community-x86_64') || srcPath.contains('community-any') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'galaxy'
-                                RM_REPO = ADD_REPO
-                            }
-                            if ( srcPath.contains('multilib-staging') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'lib32-goblins'
-                                RM_REPO = ADD_REPO
-                            } else if ( srcPath.contains('multilib-testing') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'lib32-gremlins'
-                                RM_REPO = ADD_REPO
-                            } else if ( srcPath.contains('multilib-x86_64') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'lib32'
-                                RM_REPO = ADD_REPO
-                            }
-                            PKG_PATH = srcPath
-                            PKG_TRUNK = buildInfo[0] + '/trunk'
-                        }
-
-                    }
-                }
-            }
-        }
-        stage('Build') {
-            environment {
-                BUILDBOT_GPGP = credentials('BUILDBOT_GPGP')
-            }
-            when {
-                expression { return  IS_BUILD == 'true' }
-            }
-            steps {
-                dir("${PKG_PATH}") {
-                    sh "buildpkg -r ${ADD_REPO}"
-                }
-            }
-            post {
-                success {
-                    dir("${PKG_PATH}") {
-                        sh "deploypkg -a -d ${ADD_REPO} -s"
-                    }
-                }
-            }
-        }
-        stage('Add') {
-            when {
-                expression { return  IS_ADD == 'true' }
-            }
-            steps {
-                dir("${PKG_TRUNK}") {
-                    sh "deploypkg -a -d ${ADD_REPO}"
-                }
-            }
-        }
-        stage('Remove') {
-            when {
-                expression { return  IS_REMOVE == 'true' }
-            }
-            steps {
-                dir("${PKG_TRUNK}") {
-                    sh "deploypkg -r -d ${RM_REPO}"
-                }
-            }
-        }
-    }
-}

data/Jenkinsfile.packages

@@ -1,241 +0,0 @@
-def ADD_REPO = ''
-def RM_REPO = ''
-def IS_ADD = 'false'
-def IS_REMOVE = 'false'
-def IS_BUILD = 'false'
-def PKG_TRUNK = ''
-def PKG_PATH = ''
-
-pipeline {
-    agent any
-    options {
-        skipDefaultCheckout()
-        timestamps()
-    }
-    stages {
-        stage('Checkout') {
-            steps {
-                script {
-                    checkout scm
-
-                    def currentCommit = sh(returnStdout: true, script: 'git rev-parse @').trim()
-                    echo "currentCommit: ${currentCommit}"
-
-                    def changedFilesStatus = sh(returnStdout: true, script: "git show --pretty=format: --name-status ${currentCommit}").tokenize('\n')
-                    def changedPkgStatus = []
-                    def pkgPath = []
-                    int entryCount = 0
-                    for ( int i = 0; i < changedFilesStatus.size(); i++ ) {
-                        def entry = changedFilesStatus[i].split()
-                        def fileStatus = entry[0]
-                        entryCount = entry.size()
-                        for ( int j = 1; j < entry.size(); j++ ) {
-                            if ( entry[j].contains('/PKGBUILD') && entry[j].contains('/repos') ){
-                                changedPkgStatus << "${fileStatus} " + entry[j].minus('/PKGBUILD')
-                                pkgPath << entry[j].minus('/PKGBUILD')
-                            }
-                        }
-                    }
-
-                    int pkgCount = changedPkgStatus.size()
-                    int pkgPathCount = pkgPath.size()
-                    echo "pkgCount: ${pkgCount}"
-                    echo "entryCount: ${entryCount}"
-                    echo "pkgPathCount: ${pkgPathCount}"
-                    echo "changedPkgStatus: ${changedPkgStatus}"
-
-                    if ( pkgCount > 0 ) {
-
-                        if ( entryCount == 2 && pkgCount == 2 ) {
-                            def pkgEntry1 = changedPkgStatus[0].split()
-                            def pkgEntry2 = changedPkgStatus[1].split()
-                            def srcPath = []
-                            def pkgStatus = []
-                            srcPath << pkgEntry1[1]
-                            srcPath << pkgEntry2[1]
-                            pkgStatus << pkgEntry1[0]
-                            pkgStatus << pkgEntry2[0]
-                            def buildInfo1 = srcPath[0].tokenize('/')
-                            def buildInfo2 = srcPath[1].tokenize('/')
-
-                            if ( pkgStatus[0] == 'M' ) {
-                                IS_ADD = 'true'
-                                if ( srcPath[0].contains('testing') ) {
-                                    ADD_REPO = 'gremlins'
-                                } else if ( srcPath[0].contains('core') ) {
-                                    ADD_REPO = 'system'
-                                } else if ( srcPath[0].contains('extra') ) {
-                                    ADD_REPO = 'world'
-                                }
-                            } else if ( pkgStatus[1] == 'M' ) {
-                                IS_ADD = 'true'
-                                if ( srcPath[1].contains('testing') ) {
-                                    ADD_REPO = 'gremlins'
-                                } else if ( srcPath[1].contains('core') ) {
-                                    ADD_REPO = ''
-                                } else if ( srcPath[1].contains('extra') ) {
-                                    ADD_REPO = 'world'
-                                }
-                            }
-
-                            if ( pkgStatus[0] == 'D' ) {
-                                IS_REMOVE = 'true'
-                                if ( srcPath[0].contains('testing') ) {
-                                    RM_REPO = 'gremlins'
-                                } else if ( srcPath[0].contains('core') ) {
-                                    RM_REPO = 'system'
-                                } else if ( srcPath[0].contains('extra') ) {
-                                    RM_REPO = 'world'
-                                }
-                            } else if ( pkgStatus[1] == 'D' ) {
-                                IS_REMOVE = 'true'
-                                if ( srcPath[1].contains('testing') ) {
-                                    RM_REPO = 'gremlins'
-                                } else if ( srcPath[1].contains('core') ) {
-                                    RM_REPO = 'system'
-                                } else if ( srcPath[1].contains('extra') ) {
-                                    RM_REPO = 'world'
-                                }
-                            }
-
-                            PKG_TRUNK = buildInfo1[0] + '/trunk'
-                        }
-
-                        if ( entryCount == 3 && pkgCount == 2 ) {
-                            def pkgEntry = changedPkgStatus[0].split()
-                            def pkgStatus = pkgEntry[0]
-                            def buildInfo1 = pkgPath[0].tokenize('/')
-                            def buildInfo2 = pkgPath[1].tokenize('/')
-
-                            if ( pkgStatus.contains('R') ) {
-                                IS_ADD = 'true'
-                                IS_REMOVE = 'true'
-
-                                if ( pkgPath[0].contains('staging') && pkgPath[1].contains('testing') ) {
-                                    ADD_REPO = 'gremlins'
-                                    RM_REPO = 'goblins'
-                                } else if ( pkgPath[0].contains('testing') && pkgPath[1].contains('staging') ) {
-                                    ADD_REPO = 'goblins'
-                                    RM_REPO = 'gremlins'
-                                }
-
-                                if ( pkgPath[0].contains('core') && pkgPath[1].contains('testing')) {
-                                    ADD_REPO = 'gremlins'
-                                    RM_REPO = 'system'
-                                } else if ( pkgPath[0].contains('testing') && pkgPath[1].contains('core')) {
-                                    ADD_REPO = 'system'
-                                    RM_REPO = 'gremlins'
-                                }
-
-                                if ( pkgPath[0].contains('extra') && pkgPath[1].contains('testing')) {
-                                    ADD_REPO = 'gremlins'
-                                    RM_REPO = 'world'
-                                } else if ( pkgPath[0].contains('testing') && pkgPath[1].contains('extra')) {
-                                    ADD_REPO = 'world'
-                                    RM_REPO = 'gremlins'
-                                }
-
-                                if ( pkgPath[0].contains('core') && pkgPath[1].contains('extra')) {
-                                    ADD_REPO = 'world'
-                                    RM_REPO = 'system'
-                                } else if ( pkgPath[0].contains('extra') && pkgPath[1].contains('core')) {
-                                    ADD_REPO = 'system'
-                                    RM_REPO = 'world'
-                                }
-                            }
-                            PKG_TRUNK = buildInfo1[0] + '/trunk'
-                        }
-
-                        if ( pkgCount == 1 ) {
-                            def pkgEntry = changedPkgStatus[0].split()
-                            def pkgStatus = pkgEntry[0]
-                            def srcPath = pkgEntry[1]
-                            def buildInfo = srcPath.tokenize('/')
-
-                            if ( srcPath.contains('staging') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'goblins'
-                                RM_REPO = ADD_REPO
-                            } else if ( srcPath.contains('testing') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'gremlins'
-                                RM_REPO = ADD_REPO
-                            } else if ( srcPath.contains('core') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'system'
-                                RM_REPO = ADD_REPO
-                            } else if ( srcPath.contains('extra') ) {
-                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
-                                    IS_BUILD = 'true'
-                                }
-                                if ( pkgStatus == 'D' ) {
-                                    IS_REMOVE = 'true'
-                                }
-                                ADD_REPO = 'world'
-                                RM_REPO = ADD_REPO
-                            }
-                            PKG_PATH = srcPath
-                            PKG_TRUNK = buildInfo[0] + '/trunk'
-                        }
-
-                    }
-                }
-            }
-        }
-        stage('Build') {
-            environment {
-                BUILDBOT_GPGP = credentials('BUILDBOT_GPGP')
-            }
-            when {
-                expression { return  IS_BUILD == 'true' }
-            }
-            steps {
-                dir("${PKG_PATH}") {
-                    sh "buildpkg -r ${ADD_REPO}"
-                }
-            }
-            post {
-                success {
-                    dir("${PKG_PATH}") {
-                        sh "deploypkg -a -d ${ADD_REPO} -s"
-                    }
-                }
-            }
-        }
-        stage('Add') {
-            when {
-                expression { return  IS_ADD == 'true' }
-            }
-            steps {
-                dir("${PKG_TRUNK}") {
-                    sh "deploypkg -a -d ${ADD_REPO}"
-                }
-            }
-        }
-        stage('Remove') {
-            when {
-                expression { return  IS_REMOVE == 'true' }
-            }
-            steps {
-                dir("${PKG_TRUNK}") {
-                    sh "deploypkg -r -d ${RM_REPO}"
-                }
-            }
-        }
-    }
-}

data/artools.conf

@@ -33,7 +33,7 @@
 # initsys="openrc"
 
 # unset defaults to given value
-# kernel="linux-lts"
+# kernel="linux"
 
 # custom additional kernel args
 # kernel_args=""

data/base/Makefile

@@ -0,0 +1,52 @@
+DIRMODE = -dm0755
+FILEMODE = -m0644
+RMD = rm -fr --one-file-system
+RM = rm -f
+
+BASE = \
+	$(wildcard Packages-*) \
+	profile.conf
+
+LIVE_ETC = \
+	live-overlay/etc/fstab \
+	live-overlay/etc/issue
+
+LIVE_ETC_DEFAULT = \
+	$(wildcard live-overlay/etc/default/*)
+
+LIVE_ETC_PAM = \
+	$(wildcard live-overlay/etc/pam.d/*)
+
+LIVE_ETC_SUDOERS = \
+	$(wildcard live-overlay/etc/sudoers.d/*)
+
+install_isobase:
+	install $(DIRMODE) $(DESTDIR)$(PROFDIR)
+	install $(FILEMODE) $(BASE) $(DESTDIR)$(PROFDIR)
+
+	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)
+	install $(FILEMODE) $(LIVE_ETC) $(DESTDIR)$(OVERLAYDIR)
+
+	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)/default
+	install $(FILEMODE) $(LIVE_ETC_DEFAULT) $(DESTDIR)$(OVERLAYDIR)/default
+
+	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)/pam.d
+	install $(FILEMODE) $(LIVE_ETC_PAM) $(DESTDIR)$(OVERLAYDIR)/pam.d
+
+	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
+	install $(FILEMODE) $(LIVE_ETC_SUDOERS) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
+
+uninstall_isobase:
+	for f in $(notdir $(BASE)); do $(RM) $(DESTDIR)$(PROFDIR)/$$f; done
+	for f in $(notdir $(LIVE_ETC)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/$$f; done
+	for f in $(notdir $(LIVE_ETC_DEFAULT)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/default/$$f; done
+	for f in $(notdir $(LIVE_ETC_PAM)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/pam.d/$$f; done
+	for f in $(notdir $(LIVE_ETC_SUDOERS)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/sudoers.d/$$f; done
+	$(RMD) $(DESTDIR)$(PROFDIR)
+
+
+install: install_isobase
+
+uninstall: uninstall_isobase
+
+.PHONY: install uninstall

data/base/Packages-Live

@@ -3,6 +3,4 @@ nbd
 >openrc artix-live-openrc
 squashfs-tools
 artix-live-portable-efi
-virtualbox-guest-modules-artix
-virtualbox-guest-utils
 linux-lts-headers

data/base/live-overlay/etc/fstab

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

data/missing

@@ -1,25 +0,0 @@
-extra/speexdsp
-extra/spandsp
-extra/soundtouch
-extra/sbc
-extra/neon
-extra/mjpegtools
-extra/libmp4v2
-extra/js
-extra/gst-plugins-bad
-extra/faac
-extra/enchant
-extra/chromaprint
-extra/python-appdirs
-extra/python-beaker
-extra/python-mako
-extra/python-markupsafe
-extra/python-packaging
-extra/python-pyparsing
-extra/ttf-liberation
-extra/appstream-glib
-extra/libxkbui
-extra/libxkbfile
-extra/libunicodenames
-extra/mpg123
-extra/opencl-headers

data/qt5.list

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

initcpio/Makefile

@@ -0,0 +1,31 @@
+DIRMODE = -dm0755
+MODE =  -m0755
+RM = rm -f
+
+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)
+
+uninstall_initcpio:
+	for f in $(notdir $(CPIOHOOKS)); do $(RM) $(DESTDIR)$(CPIODIR)/hooks/$$f; done
+	for f in $(notdir $(CPIOINST)); do $(RM) $(DESTDIR)$(CPIODIR)/install/$$f; done
+	for f in $(notdir $(SCRIPT)); do $(RM) $(DESTDIR)$(CPIODIR)/$$f; done
+
+install: install_initcpio
+
+uninstall: uninstall_initcpio
+
+.PHONY: install uninstall

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-pkg.sh

@@ -68,6 +68,11 @@ patch_pkg(){
                 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
 }
 
@@ -78,25 +83,26 @@ find_tree(){
     echo ${result##*/}
 }
 
-pull_tree(){
-    local branch="master" tree="$1"
-    local local_head=$(get_local_head "$branch")
-    local remote_head=$(get_remote_head "$branch")
-    local timer=$(get_timer)
-    msg "Checking [%s] ..." "$tree"
-    if [[ "${local_head}" == "${remote_head}" ]]; then
-        msg2 "nothing to do"
-    else
-        msg2 "needs pull"
-        git pull origin $branch
-    fi
-    msg "Done [%s]" "$tree"
+clone_tree(){
+    local timer=$(get_timer) host_tree="$1"
+    git clone $host_tree.git
     show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
+pull_tree(){
+    local branch="master"
+    local local_head=$(get_local_head "$branch")
+    local remote_head=$(get_remote_head "$branch")
+    if [[ "${local_head}" == "${remote_head}" ]]; then
+        msg2 "remote changes: no"
+    else
+        msg2 "remote changes: yes"
+        git pull origin "$branch"
+    fi
+}
+
 push_tree(){
-    local branch="master" tree="$1"
-    pull_tree "$tree"
+    local branch="master"
     git push origin "$branch"
 }
 
@@ -118,62 +124,75 @@ is_valid_repo(){
 }
 
 find_repo(){
-    local pkg="$1" repo=
+    local pkg="$1" incl="$2" repo=
 
-    if [[ -d $pkg/repos/core-x86_64 ]];then
+    if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
         repo=core-x86_64
-    elif [[ -d $pkg/repos/core-any ]];then
+    elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
         repo=core-any
     fi
 
-    if [[ -d $pkg/repos/extra-x86_64 ]];then
+    if [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
         repo=extra-x86_64
-    elif [[ -d $pkg/repos/extra-any ]];then
+    elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
         repo=extra-any
     fi
 
-    if [[ -d $pkg/repos/testing-x86_64 ]];then
+    if [[ -f $pkg/repos/testing-x86_64/PKGBUILD ]];then
         repo=testing-x86_64
-    elif [[ -d $pkg/repos/testing-any ]];then
+    elif [[ -f $pkg/repos/testing-any/PKGBUILD ]];then
         repo=testing-any
     fi
 
-    if [[ -d $pkg/repos/staging-x86_64 ]];then
+    if [[ -f $pkg/repos/staging-x86_64/PKGBUILD ]];then
         repo=staging-x86_64
-    elif [[ -d $pkg/repos/staging-any ]];then
+    elif [[ -f $pkg/repos/staging-any/PKGBUILD ]];then
         repo=staging-any
     fi
 
-    if [[ -d $pkg/repos/community-x86_64 ]];then
+    if [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
         repo=community-x86_64
-    elif [[ -d $pkg/repos/community-any ]];then
+    elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
         repo=community-any
     fi
 
-    if [[ -d $pkg/repos/community-testing-x86_64 ]];then
+    if [[ -f $pkg/repos/community-testing-x86_64/PKGBUILD ]];then
         repo=community-testing-x86_64
-    elif [[ -d $pkg/repos/community-testing-any ]];then
+    elif [[ -f $pkg/repos/community-testing-any/PKGBUILD ]];then
         repo=community-testing-any
     fi
 
-    if [[ -d $pkg/repos/community-staging-x86_64 ]];then
+    if [[ -f $pkg/repos/community-staging-x86_64/PKGBUILD ]];then
         repo=community-staging-x86_64
-    elif [[ -d $pkg/repos/community-staging-any ]];then
+    elif [[ -f $pkg/repos/community-staging-any/PKGBUILD ]];then
         repo=community-staging-any
     fi
 
-    if [[ -d $pkg/repos/multilib-x86_64 ]];then
+    if [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
         repo=multilib-x86_64
     fi
 
-    if [[ -d $pkg/repos/multilib-testing-x86_64 ]];then
+    if [[ -f $pkg/repos/multilib-testing-x86_64/PKGBUILD ]];then
         repo=multilib-testing-x86_64
     fi
 
-    if [[ -d $pkg/repos/multilib-staging-x86_64 ]];then
+    if [[ -f $pkg/repos/multilib-staging-x86_64/PKGBUILD ]];then
         repo=multilib-staging-x86_64
     fi
 
+    if $incl;then
+        if [[ -f $pkg/repos/gnome-unstable-x86_64/PKGBUILD ]];then
+            repo=gnome-unstable-x86_64
+        elif [[ -f $pkg/repos/gnome-unstable-any/PKGBUILD ]];then
+            repo=gnome-unstable-any
+        fi
+
+        if [[ -f $pkg/repos/kde-unstable-x86_64/PKGBUILD ]];then
+            repo=kde-unstable-x86_64
+        elif [[ -f $pkg/repos/kde-unstable-any/PKGBUILD ]];then
+            repo=kde-unstable-any
+        fi
+    fi
     echo $repo
 }
 
@@ -190,6 +209,7 @@ arch_to_artix_repo(){
         multilib-staging-x86_64) repo=lib32-goblins ;;
         community-testing-*) repo=galaxy-gremlins ;;
         community-staging-*) repo=galaxy-goblins ;;
+        kde-unstable-*|gnome-unstable-*) repo=goblins ;;
     esac
     echo $repo
 }

lib/util.sh

@@ -95,7 +95,7 @@ init_artools_iso(){
 
     [[ -z ${initsys} ]] && initsys="openrc"
 
-    [[ -z ${kernel} ]] && kernel="linux-lts"
+    [[ -z ${kernel} ]] && kernel="linux"
 
     [[ -z ${kernel_args} ]] && kernel_args=""