artixpkg: fix ci subcommand completions

Makefile

@@ -80,7 +80,7 @@ conf_base:
 
 conf_pkg:
 	@install -d $(BUILDDIR)/makepkg.conf.d $(BUILDDIR)/artools
-	@cp -ra $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
+	@cp -a $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
 	@cp -a $(TOOLS_CONFIGS_PKG) $(BUILDDIR)/artools
 
 conf_iso:
@@ -111,13 +111,11 @@ install_pkg: binprogs_pkg
 
 	for conf in $(notdir $(TOOLS_CONFIGS_PKG)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
 
-	cp -ra $(BUILDDIR)/makepkg.conf.d -t $(DESTDIR)$(DATADIR)
+	for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
-
 	for a in $(SETARCH_ALIASES); do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/setarch-aliases.d; done
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 
 	install -Dm0644 $(BUILDDIR)/contrib/completion/bash/artixpkg $(DESTDIR)$(PREFIX)/share/bash-completion/completions/artixpkg
-	install -Dm0644 $(BUILDDIR)/contrib/completion/zsh/_artixpkg $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_artixpkg
 
 install_iso: binprogs_iso
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
@@ -135,12 +133,13 @@ uninstall:
 	for f in $(notdir $(LIBRARY)); do rm -f $(DESTDIR)$(DATADIR)/lib/$$f; done
 	rm -rf $(DESTDIR)$(DATADIR)/lib
 	for conf in $(notdir $(TOOLS_CONFIGS)); do rm -f $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
-	rm -rf $(DESTDIR)$(DATADIR)/makepkg.conf.d
+	for conf in $(notdir $(MAKEPKG_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
 	for conf in $(notdir $(PACMAN_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
 	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(DATADIR)/setarch-aliases.d/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	rmdir --ignore-fail-on-non-empty \
 		$(DESTDIR)$(DATADIR)/setarch-aliases.d \
+		$(DESTDIR)$(DATADIR)/makepkg.conf.d \
 		$(DESTDIR)$(DATADIR)/pacman.conf.d \
 		$(DESTDIR)$(DATADIR) \
 		$(DESTDIR)$(SYSCONFDIR)/$(TOOLS)

config/conf/artools-pkg.conf

@@ -36,8 +36,5 @@
 # default archiving org
 # GIT_ORG_ARCHIVE='landfill'
 
-# whether to include custom maintainer line when importing from arch
+# default jenkins agents
-# PATCH_MAINTAINER=false
+# AGENTS=(orion taurus)
-
-# override the default git url for patches repo
-# PATCH_URL=${GIT_SSH}:artix/artix-patches.git

config/makepkg/conf.d/fortran.conf

@@ -1,18 +0,0 @@
-#!/hint/bash
-#
-# /etc/makepkg.conf.d/fortran.conf
-#
-
-#########################################################################
-# FORTRAN LANGUAGE SUPPORT
-#########################################################################
-
-# Flags used for the Fortran compiler, similar in spirit to CFLAGS. Read
-# linkman:gfortran[1] for more details on the available flags.
-#FFLAGS="-O2 -pipe"
-#FCFLAGS="$FFLAGS"
-
-# Additional compiler flags appended to `FFLAGS` and `FCFLAGS` for use in debugging. Usually
-# this would include: ``-g''. Read linkman:gfortran[1] for more details on the wide
-# variety of compiler flags available.
-#DEBUG_FFLAGS="-g"

config/makepkg/conf.d/rust.conf

@@ -1,19 +0,0 @@
-#!/hint/bash
-# shellcheck disable=2034
-
-#
-# /etc/makepkg.conf.d/rust.conf
-#
-
-#########################################################################
-# RUST LANGUAGE SUPPORT
-#########################################################################
-
-# Flags used for the Rust compiler, similar in spirit to CFLAGS. Read
-# linkman:rustc[1] for more details on the available flags.
-RUSTFLAGS="-Cforce-frame-pointers=yes"
-
-# Additional compiler flags appended to `RUSTFLAGS` for use in debugging.
-# Usually this would include: ``-C debuginfo=2''. Read linkman:rustc[1] for
-# more details on the available flags.
-DEBUG_RUSTFLAGS="-C debuginfo=2"

config/makepkg/x86_64.conf

@@ -43,16 +43,17 @@ CHOST="x86_64-pc-linux-gnu"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection"
-        # -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
          -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -81,7 +82,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -93,7 +94,6 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
-#-- autodeps:   Automatically add depends/provides
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 
@@ -113,8 +113,6 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #-- Directory to store source code in for debug packages
 DBGSRCDIR="/usr/src/debug"
-#-- Prefix and directories for library autodeps
-LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
 
 #########################################################################
 # PACKAGE OUTPUT

config/makepkg/x86_64.conf.d/fortran.conf

@@ -1 +0,0 @@
-../conf.d/fortran.conf

config/makepkg/x86_64.conf.d/rust.conf

@@ -1 +0,0 @@
-../conf.d/rust.conf

config/pacman/galaxy-goblins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/galaxy-gremlins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/galaxy-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/iso-goblins-x86_64.conf

@@ -35,8 +35,6 @@ Color
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 10
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/iso-gremlins-x86_64.conf

@@ -35,8 +35,6 @@ Color
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 10
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/iso-x86_64.conf

@@ -35,8 +35,6 @@ Color
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 10
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/lib32-goblins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/lib32-gremlins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/lib32-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/system-goblins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/system-gremlins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/system-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/world-goblins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/world-gremlins-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

config/pacman/world-x86_64.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # 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.

contrib/completion/bash/artixpkg.in

@@ -3,20 +3,13 @@
 LIBDIR=${LIBDIR:-'@libdir@'}
 
 _artixpkg_pkgbase() {
+    source "${LIBDIR}"/pkg/git/config.sh
     source "${LIBDIR}"/pkg/util.sh
     ls -1 "${TREE_DIR_ARTIX}" | tr '\n' ' '
 }
 
-_artixpkg_remotepkgbase() {
-    curl -s "https://checkupdates.artixlinux.org/api/1.0/packages?startswith=$1"
-}
-
-_artixpkg_maintainers() {
-    curl -s "https://checkupdates.artixlinux.org/api/1.0/maintainers"
-}
-
 _artixpkg_completion() {
-    local cur prev comps comps_all repos autorepos teams agents cwords comp_cword_exflag agent_flag_present
+    local cur prev comps comps_all repos autorepos teams agents cwords comp_cword_exflag
     source "${LIBDIR}"/pkg/db/db.sh 2>/dev/null
 
     cur="${COMP_WORDS[COMP_CWORD]}"
@@ -33,7 +26,6 @@ _artixpkg_completion() {
     comps_all=""
     comp_cword_exflag=0
     comp_cword_all=0
-    agent_flag_present=false
     for ((i = 0; i < ${#COMP_WORDS[@]} - 1; i++)); do
         word="${COMP_WORDS[i]}"
         comps_all+=" $word"
@@ -42,10 +34,6 @@ _artixpkg_completion() {
             comps+=" $word"
             ((comp_cword_exflag++))
         fi
-        if [[ $word == -a || $word == --agent ]]; then
-            # -a can also refer to --adopt
-            agent_flag_present=true
-        fi
     done
     comps="${comps:1}"
     comps_all="${comps_all:1}"
@@ -79,6 +67,7 @@ _artixpkg_completion() {
     done
     agents="${agents:1}"
 
+
     case "${comp_cword_exflag}" in
         1)
             COMPREPLY=($(compgen -W "admin git repo version -h --help" -- "${cur}"))
@@ -90,7 +79,7 @@ _artixpkg_completion() {
                     COMPREPLY=($(compgen -W "maintainer query team topic transfer -h --help" -- ${cur}))
                     ;;
                 git)
-                    COMPREPLY=($(compgen -W "clone config create pull push -h --help" -- ${cur}))
+                    COMPREPLY=($(compgen -W "ci clone config create pull push -h --help" -- ${cur}))
                     ;;
                 repo)
                     COMPREPLY=($(compgen -W "add remove move import show -h --help" -- ${cur}))
@@ -102,6 +91,37 @@ _artixpkg_completion() {
             ;;  
         *)
             case "${comps}" in
+                "artixpkg repo add"*)
+                    local repoAddCommon="-p --push -r --rebuild -n --nocheck -h --help"
+                    case "${comp_cword_exflag}" in
+                        3)
+                            COMPREPLY=($(compgen -W "$repoAddCommon $autorepos $repos" -- ${cur}))
+                            ;;
+                        *)
+                            COMPREPLY=($(compgen -W "$repoAddCommon $(_artixpkg_pkgbase)" -- ${cur}))
+                            ;;
+                    esac
+                    ;;
+                "artixpkg repo remove"*)
+                    case "${comp_cword_exflag}" in
+                        3)
+                            COMPREPLY=($(compgen -W "-p --push -h --help $autorepos $repos" -- ${cur}))
+                            ;;
+                        *)
+                            COMPREPLY=($(compgen -W "-p --push -h --help $(_artixpkg_pkgbase)" -- ${cur}))
+                            ;;
+                    esac
+                    ;;
+                "artixpkg repo move"*)
+                    case "${comp_cword_exflag}" in
+                        3|4)
+                            COMPREPLY=($(compgen -W "-p --push -h --help $autorepos $repos" -- ${cur}))
+                            ;;
+                        *)
+                            COMPREPLY=($(compgen -W "-p --push -h --help $(_artixpkg_pkgbase)" -- ${cur}))
+                            ;;
+                    esac
+                    ;;
                 "artixpkg repo import"*)
                     case "${prev}" in
                         "--tag")
@@ -116,68 +136,23 @@ _artixpkg_completion() {
                 "artixpkg repo show")
                     COMPREPLY=($(compgen -W "-b --base -p --pkgs -h --help" -- ${cur}))
                     ;;
-                "artixpkg repo"*)
+                "artixpkg git clone"*)
-                    if [ "$agent_flag_present" = true ] ; then
-                        ((comp_cword_exflag--))
-                    fi
                     case "${prev}" in
                         "-a"|"--agent")
                             COMPREPLY=($(compgen -W "$agents" -- ${cur}))
                             ;;
-                        *)
-                            case "${comps}" in
-                                "artixpkg repo add"*)
-                                    local repoAddCommon="-p --push -r --rebuild -n --nocheck -a --agent -h --help"
-                                    case "${comp_cword_exflag}" in
-                                        3)
-                                            COMPREPLY=($(compgen -W "$repoAddCommon $autorepos $repos" -- ${cur}))
-                                            ;;
-                                        *)
-                                            COMPREPLY=($(compgen -W "$repoAddCommon $(_artixpkg_pkgbase)" -- ${cur}))
-                                            ;;
-                                    esac
-                                    ;;
-                                "artixpkg repo remove"*)
-                                    case "${comp_cword_exflag}" in
-                                        3)
-                                            COMPREPLY=($(compgen -W "-p --push -a --agent -h --help $autorepos $repos" -- ${cur}))
-                                            ;;
-                                        *)
-                                            COMPREPLY=($(compgen -W "-p --push -a --agent -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                                            ;;
-                                    esac
-                                    ;;
-                                "artixpkg repo move"*)
-                                    case "${comp_cword_exflag}" in
-                                        3|4)
-                                            COMPREPLY=($(compgen -W "-p --push -a --agent -h --help $autorepos $repos" -- ${cur}))
-                                            ;;
-                                        *)
-                                            COMPREPLY=($(compgen -W "-p --push -a --agent -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                                            ;;
-                                    esac
-                                    ;;
-                            esac
-                            ;;
-                    esac
-                    ;;
-                "artixpkg git clone"*)
-                    case "${prev}" in
                         "--protocol")
                             COMPREPLY=($(compgen -W "https" -- ${cur}))
                             ;;
                         "-t"|"--team")
                             COMPREPLY=($(compgen -W "$teams" -- ${cur}))
                             ;;
-                        "-m"|"--maintainer")
+                        "-m"|"--maintainer"|"-s"|"--search"|"-t"|"--team"|"-j"|"--jobs")
-                            COMPREPLY=($(compgen -W "$(_artixpkg_maintainers)" -- ${cur}))
-                            ;;
-                        "-s"|"--search"|"-j"|"--jobs")
                             # these flags expect a parameter
                             COMPREPLY=()
                             ;;
                         *)
-                            COMPREPLY=($(compgen -W "-m --maintainer --protocol -s --search -t --team -j --jobs --all -h --help $(_artixpkg_remotepkgbase ${cur})" -- ${cur}))
+                            COMPREPLY=($(compgen -W "-m --maintainer --protocol -s --search -t --team -a --agent -j --jobs --all -h --help" -- ${cur}))
                             ;;
                     esac
                     ;;
@@ -197,20 +172,20 @@ _artixpkg_completion() {
                     ;;
                 "artixpkg git create"*)
                     case "${prev}" in
+                        "-a"|"--agent")
+                            COMPREPLY=($(compgen -W "$agents" -- ${cur}))
+                            ;;
                         "-t"|"--team")
                             COMPREPLY=($(compgen -W "$teams" -- ${cur}))
                             ;;
                         *)
-                            COMPREPLY=($(compgen -W "-c --clone -t --team -h --help" -- ${cur}))
+                            COMPREPLY=($(compgen -W "-c --clone -a --agent -t --team -h --help" -- ${cur}))
                             ;;
                     esac
                     ;;
                 "artixpkg git pull"*)
                     case "${prev}" in
-                        "-m"|"--maintainer")
+                        "-t"|"--topic"|"-m"|"--maintainer"|"-j"|"--jobs")
-                            COMPREPLY=($(compgen -W "$(_artixpkg_maintainers)" -- ${cur}))
-                            ;;
-                        "-t"|"--topic"|"-j"|"--jobs")
                             # these flags expect a parameter
                             COMPREPLY=()
                             ;;
@@ -228,22 +203,29 @@ _artixpkg_completion() {
                     ;;
                 "artixpkg git push"*)
                     case "${prev}" in
-                        "-m"|"--maintainer")
+                        "-m"|"--maintainer"|"-t"|"--topic"|"-j"|"--jobs")
-                            COMPREPLY=($(compgen -W "$(_artixpkg_maintainers)" -- ${cur}))
-                            ;;
-                        "-t"|"--topic")
                             # this flag expects a parameter
                             COMPREPLY=()
                             ;;
                         *)
-                            COMPREPLY=($(compgen -W "-m --maintainer -t --topic -h --help $(_artixpkg_pkgbase)" -- ${cur}))
+                            COMPREPLY=($(compgen -W "-m --maintainer -t --topic -j --jobs -h --help $(_artixpkg_pkgbase)" -- ${cur}))
+                            ;;
+                    esac
+                    ;;
+                "artixpkg git ci"*)
+                    case "${prev}" in
+                        "-a"|"--agent")
+                            COMPREPLY=($(compgen -W "$agents" -- ${cur}))
+                            ;;
+                        *)
+                            COMPREPLY=($(compgen -W "-a --agent -h --help $(_artixpkg_pkgbase)" -- ${cur}))
                             ;;
                     esac
                     ;;
                 "artixpkg admin maintainer"*)
                     case "${comp_cword_all}" in
                         3)
-                            COMPREPLY=($(compgen -W "-a --adopt -o --orphan -h --help" -- ${cur}))
+                            COMPREPLY=($(compgen -W "-a --adopt --o --orphan -h --help" -- ${cur}))
                             ;;
                         *)
                             COMPREPLY=($(compgen -W "-h --help $(_artixpkg_pkgbase)" -- ${cur}))
@@ -252,10 +234,7 @@ _artixpkg_completion() {
                     ;;
                 "artixpkg admin query"*)
                     case "${prev}" in
-                        "-m"|"--maintainer")
+                        "-m"|"--maintainer"|"-t"|"--topic")
-                            COMPREPLY=($(compgen -W "$(_artixpkg_maintainers)" -- ${cur}))
-                            ;;
-                        "-t"|"--topic")
                             # this flag expects a parameter
                             COMPREPLY=()
                             ;;
@@ -281,7 +260,7 @@ _artixpkg_completion() {
                             COMPREPLY=()
                             ;;
                         *)
-                            COMPREPLY=($(compgen -W "-a --add -r --remove -d --delete -j --jobs -h --help $(_artixpkg_pkgbase)" -- ${cur}))
+                            COMPREPLY=($(compgen -W "-a --add -r --remove -d --del -j --jobs -h --help $(_artixpkg_pkgbase)" -- ${cur}))
                             ;;
                     esac
                     ;;
@@ -293,4 +272,4 @@ _artixpkg_completion() {
     esac
 }
 
-complete -F _artixpkg_completion artixpkg
+complete -F _artixpkg_completion artixpkg

contrib/completion/zsh/_artixpkg.in

@@ -1,205 +0,0 @@
-#compdef artixpkg
-
-local -a addcmd admincmd cicmd clonecmd configcmd createcmd gitcmd importcmd \
-         initialcmd maintainercmd movecmd querycmd pullcmd pushcmd removecmd \
-         repocmd showcmd teamcmd topiccmd transfercmd versioncmd
-_regex_words maintainer '' \
-                        '-a' \
-                        '--adopt' \
-                        '-h' \
-                        '--help' \
-                        '-o' \
-                        '--orphan'
-maintainercmd=("$reply[@]")
-
-_regex_words query '' \
-                   '-h' \
-                   '--help' \
-                   '-m' \
-                   '-t'
-querycmd=("$reply[@]")
-
-_regex_words team '' \
-                  '-a' \
-                  '--add' \
-                  '-c' \
-                  '--check' \
-                  '-h' \
-                  '--help' \
-                  '-r' \
-                  '--remove'
-teamcmd=("$reply[@]")
-
-_regex_words topic '' \
-                   '-a' \
-                   '--add' \
-                   '-d' \
-                   '--delete' \
-                   '-h' \
-                   '--help' \
-                   '-j' \
-                   '--jobs' \
-                   '-r' \
-                   '--remove'
-topiccmd=("$reply[@]")
-
-_regex_words transfer '' \
-                      '-h' \
-                      '--help'
-transfercmd=("$reply[@]")
-
-
-_regex_words admin '' \
-                   '-h:Help text' \
-                   '--help:Help text' \
-                   'maintainer:Manage repo maintainer:$maintainercmd' \
-                   'query:Query maintainers and topics:$querycmd' \
-                   'team:Manage repo team:$teamcmd' \
-                   'topic:Manage topics:$topiccmd' \
-                   'transfer:Transfer obsolete repositories to landfill:$transfercmd'
-admincmd=("$reply[@]")
-
-_regex_words ci '' \
-                '-a' \
-                '--agent' \
-                '-h' \
-                '--help'
-cicmd=("$reply[@]")
-
-_regex_words clone '' \
-                   '-a' \
-                   '--agent' \
-                   '--all' \
-                   '-h' \
-                   '--help' \
-                   '-j' \
-                   '--jobs' \
-                   '-m' \
-                   '--maintainer' \
-                   '--protocol' \
-                   '-s' \
-                   '--search' \
-                   '-t' \
-                   '--team'
-clonecmd=("$reply[@]")
-
-_regex_words config '' \
-                    '-h' \
-                    '--help' \
-                    '-j' \
-                    '--jobs' \
-                    '--protocol'
-configcmd=("$reply[@]")
-
-_regex_words create '' \
-                    '-a' \
-                    '--agent' \
-                    '-c' \
-                    '--create' \
-                    '-h' \
-                    '--help' \
-                    '-t' \
-                    '--team'
-createcmd=("$reply[@]")
-
-_regex_words pull '' \
-                  '--all' \
-                  '-h' \
-                  '--help' \
-                  '-j' \
-                  '--jobs' \
-                  '-m' \
-                  '--maintainer' \
-                  '-t' \
-                  '--topic'
-pullcmd=("$reply[@]")
-
-_regex_words push '' \
-                  '-h' \
-                  '--help' \
-                  '-j' \
-                  '--jobs' \
-                  '-m' \
-                  '--maintainer' \
-                  '-t' \
-                  '--topic'
-pushcmd=("$reply[@]")
-
-_regex_words git '' \
-                 'ci:Configure CI agent:$cicmd' \
-                 'clone:Clone a package:$clonecmd' \
-                 'config:Configure a clone:$configcmd' \
-                 'create:Create a new gitea package repository:$createcmd' \
-                 '-h:Help text' \
-                 '--help:Help text' \
-                 'pull:Pull a package repository:$pullcmd' \
-                 'push:Push a package repository:$pushcmd'
-gitcmd=("$reply[@]")
-
-_regex_words add '' \
-                 '-h' \
-                 '--help' \
-                 '-n' \
-                 '--nocheck' \
-                 '-p' \
-                 '--push' \
-                 '-r' \
-                 '--rebuild'
-addcmd=("$reply[@]")
-
-_regex_words import '' \
-                    '--del' \
-                    '-h' \
-                    '--help' \
-                    '--tag'
-importcmd=("$reply[@]")
-
-_regex_words move '' \
-                  '-h' \
-                  '--help' \
-                  '-p' \
-                  '--push'
-movecmd=("$reply[@]")
-
-_regex_words remove '' \
-                    '-h' \
-                    '--help' \
-                    '-p' \
-                    '--push'
-removecmd=("$reply[@]")
-
-_regex_words show '' \
-                  '-b' \
-                  '--base' \
-                  '-h' \
-                  '--help' \
-                  '-p' \
-                  '--pkgs'
-showcmd=("$reply[@]")
-
-_regex_words repo '' \
-                  'add:Add pkgbase to repo:$addcmd' \
-                  '-h:Help text' \
-                  '--help:Help text' \
-                  'import:Import latest tag from arch upstream:$importcmd' \
-                  'move:Move pkgbase between repos:$movecmd' \
-                  'remove:Remove pkgbase from repo:$removecmd' \
-                  'show:Show pkgbase repo db:$showcmd'
-repocmd=("$reply[@]")
-
-_regex_words version '' \
-                     '-h' \
-                     '--help'
-versioncmd=("$reply[@]")
-
-_regex_words initial '' \
-                     'admin:Manage topics:$admincmd' \
-                     'git:Manage git:$gitcmd' \
-                     '-h:Help text' \
-                     '--help:Help text' \
-                     'repo:Pacman database modification:$repocmd' \
-                     'version:Show artixpkg version:$versioncmd'
-initialcmd=("$reply[@]")
-
-_regex_arguments _artixpkg /$'[^\0]##\0'/ "${initialcmd[@]}"
-_artixpkg "$@"

src/lib/pkg/admin/maintainer.sh

@@ -5,6 +5,8 @@
 [[ -z ${ARTOOLS_INCLUDE_ADMIN_MAINTAINER_SH:-} ]] || return 0
 ARTOOLS_INCLUDE_ADMIN_MAINTAINER_SH=1
 
+# shellcheck source=src/lib/pkg/packager.sh
+source "${LIBDIR}"/pkg/packager.sh
 
 set -e
 
@@ -79,9 +81,7 @@ artixpkg_admin_maintainer() {
 
     pkgbases+=("$@")
 
-    # shellcheck source=src/lib/pkg/util/packager.sh
+    load_makepkg_config
-    source "${LIBDIR}"/pkg/util/packager.sh
-
     if [[ -n ${PACKAGER} ]]; then
         if ! packager_name=$(get_packager_name "${PACKAGER}") || \
             ! packager_email=$(get_packager_email "${PACKAGER}"); then
@@ -90,11 +90,9 @@ artixpkg_admin_maintainer() {
         if ! is_packager_name_valid "${packager_name}"; then
             die "invalid PACKAGER '${PACKAGER}' in makepkg.conf"
         fi
-        if is_packager_email_official "${packager_email}"; then
-            maintainer="maintainer-${packager_name}"
-        fi
     fi
 
+    maintainer="maintainer-${packager_name}"
 
     if [[ -n ${GIT_TOKEN} ]]; then
 

src/lib/pkg/admin/team.sh

@@ -17,9 +17,9 @@ artixpkg_admin_team_usage() {
         -c, --check                 Check if team is assigned
         -l, --list                  List repo teams
         -a, --add NAME              Add team to repo
-                                    Possible values: (${ARTIX_TEAMS[@]})
+                                    Possible values: $(yaml_array ${ARTIX_TEAMS[@]})
         -r, --remove NAME           Remove team from repo
-                                    Possible values: (${ARTIX_TEAMS[@]})
+                                    Possible values: $(yaml_array ${ARTIX_TEAMS[@]})
         -h, --help                  Show this help text
 
     EXAMPLES

src/lib/pkg/db/db.sh

@@ -23,11 +23,6 @@ readonly ARTIX_DB_MAP=(
     stable
 )
 
-readonly AGENTS=(
-    orion
-    taurus
-)
-
 readonly ARTIX_TEAMS=(
     "${ARTIX_DB[2]}"
     "${ARTIX_DB[5]}"
@@ -35,30 +30,27 @@ readonly ARTIX_TEAMS=(
     "${ARTIX_DB[11]}"
 )
 
-declare -A AGENT_MAP=(
-    ["${ARTIX_TEAMS[0]}"]=${AGENTS[0]}
-    ["${ARTIX_TEAMS[1]}"]=${AGENTS[0]}
-    ["${ARTIX_TEAMS[2]}"]=${AGENTS[1]}
-    ["${ARTIX_TEAMS[3]}"]=${AGENTS[1]}
-)
-
 readonly REPO_DB='.artixlinux/pkgbase.yaml'
 
 readonly REPO_CI='.artixlinux/Jenkinsfile'
 
-readonly SRCINFO='.artixlinux/srcinfo.yaml'
+yaml_array() {
+    local array
 
+    for entry in "$@"; do
+        array="${array:-}${array:+,} ${entry}"
+    done
+    printf "%s\n" "[${array}]"
+}
 
 print_package_names() {
     local version
-    local array
     local architecture pkg
     version=$(get_full_version)
     for pkg in "${pkgname[@]}"; do
         architecture=$(get_pkg_arch "${pkg}")
-        array="${array:-}${array:+,} $pkg-$version-$architecture$PKGEXT"
+        printf "%s-%s-%s%s\n" "$pkg" "$version" "$architecture" "$PKGEXT"
     done
-    printf "%s\n" "[${array}]"
 }
 
 print_debug_package_names() {
@@ -67,9 +59,7 @@ print_debug_package_names() {
     version=$(get_full_version)
     if check_option "debug" "y" && check_option "strip" "y"; then
         architecture=$(get_pkg_arch)
-        printf "[%s-%s-%s-%s%s]\n" "$pkgbase" "debug" "$version" "$architecture" "$PKGEXT"
+        printf "%s-%s-%s-%s%s\n" "$pkgbase" "debug" "$version" "$architecture" "$PKGEXT"
-    else
-        printf "%s\n" "[]"
     fi
 }
 
@@ -81,6 +71,17 @@ version_from_yaml() {
     printf "%s\n" "${version}"
 }
 
+packages_from_yaml() {
+    local dest="$1"
+    local repo pkgs packages
+    repo=".repos.${dest}"
+    mapfile -t packages < <(repo="${repo}" yq -r 'eval(strenv(repo)).packages[]' "${REPO_DB}")
+    for p in "${packages[@]}"; do
+        pkgs="${pkgs:-}${pkgs:+,} ${p}"
+    done
+    printf "%s\n" "[${pkgs}]"
+}
+
 to_bool() {
     local int="$1"
     case "${int}" in
@@ -112,9 +113,17 @@ create_repo_db() {
 
     yq -n '"---"' > "${REPO_DB}"
 
-    yq -P '
+    yq -P '.team = null' -i "${REPO_DB}"
-        .team = null |
+
-        with(
+    yq -P 'with(
+        .pkgbase;
+            .name = null |
+            .version = null |
+            .arch = [] |
+            .pkgname = [] )' \
+        -i "${REPO_DB}"
+
+    yq -P 'with(
         .actions;
             .addRepo = null |
             .removeRepo = null |
@@ -122,20 +131,39 @@ create_repo_db() {
             .triggersRebuild = false |
             .triggersRepoAdd = false |
             .triggersRepoRemove = false |
-            .triggersNoCheck = false ) |
+            .triggersNoCheck = false )' \
-            .repos = {}
+        -i "${REPO_DB}"
-        ' -i "${REPO_DB}"
+
+    yq -P '.repos = {}' -i "${REPO_DB}"
 
     for r in "${ARTIX_DB[@]}"; do
         local repo
         repo=".repos.${r}" \
-        yq -P '
+            yq -P 'with(
-            with(
+                    eval(strenv(repo));
-            eval(strenv(repo));
+                        .version = null |
-                .version = null |
+                        .packages = [] )' \
-                .packages = [] |
+                -i "${REPO_DB}"
-                .debug = [] )
+    done
-            ' -i "${REPO_DB}"
+}
+
+has_repos_map_key() {
+    local _r="$1"
+    local r
+    if ! $(r="$_r" yq -r '.repos | has(strenv(r))' "${REPO_DB}"); then
+        return 1
+    fi
+    return 0
+}
+
+delete_obsolete_map_keys() {
+    local _r
+    for r in asteroids{-goblins,-gremlins,}; do
+        if $(_r="$r" yq -r '.repos | has(strenv(_r))' "${REPO_DB}"); then
+            local repo
+            repo=".repos.${r}" \
+                yq 'del(eval(strenv(repo)))' -i "${REPO_DB}"
+        fi
     done
 }
 
@@ -144,6 +172,27 @@ update_yaml_team() {
     team="$team" yq -P '.team = env(team)' -i "${REPO_DB}"
 }
 
+update_yaml_base() {
+    local version
+    local name
+    local pkgnames
+    local arches
+
+    pkgbase="${pkgbase:-${pkgname}}"
+    version="$(get_full_version)"
+    pkgnames=$(yaml_array "${pkgname[@]}")
+    arches=$(yaml_array "${arch[@]}")
+
+    name="${pkgbase}" version="${version}" pkgnames="${pkgnames}" arches="${arches}" \
+        yq -P 'with(
+            .pkgbase;
+                .name = env(name) |
+                .version = env(version) |
+                .arch = env(arches) |
+                .pkgname = env(pkgnames) )' \
+            -i "${REPO_DB}"
+}
+
 update_yaml_add() {
     local rebuild="$1"
     local add="$2"
@@ -164,41 +213,36 @@ update_yaml_add() {
         local pkgs
         local version
         local pkgfiles
-        local debug_pkgfiles
 
-        pkgs=$(print_package_names)
+        mapfile -t pkgfiles < <(print_package_names)
 
-        debug_pkgs=$(print_debug_package_names)
+        pkgs=$(yaml_array "${pkgfiles[@]}")
 
         version=$(get_full_version)
         repo=".repos.${dest}"
 
-        version="${version}" repo="${repo}" \
+        version="${version}" pkgs="${pkgs}" repo="${repo}" \
-        pkgs="${pkgs}" debug_pkgs="${debug_pkgs}" \
+            yq -P 'with(
-        yq -P '
+                    eval(strenv(repo));
-            with(
+                        .version = env(version) |
-            eval(strenv(repo));
+                        .packages = env(pkgs) )' \
-                .version = env(version) |
+                -i "${REPO_DB}"
-                .packages = env(pkgs) |
-                .debug = env(debug_pkgs) )
-            ' -i "${REPO_DB}"
     fi
 
     nocheck=$(to_bool "${nocheck}")
 
     nocheck="${nocheck}" add="${add}" \
     rebuild="${rebuild}" build="${build}" dest="${dest}" \
-    yq -P '
+        yq -P 'with(
-        with(
+            .actions;
-        .actions;
+                .addRepo = env(dest) |
-            .addRepo = env(dest) |
+                .removeRepo = null |
-            .removeRepo = null |
+                .triggersBuild = env(build) |
-            .triggersBuild = env(build) |
+                .triggersRebuild = env(rebuild) |
-            .triggersRebuild = env(rebuild) |
+                .triggersRepoAdd = env(add) |
-            .triggersRepoAdd = env(add) |
+                .triggersRepoRemove = false |
-            .triggersRepoRemove = false |
+                .triggersNoCheck = env(nocheck) )' \
-            .triggersNoCheck = env(nocheck) )
+            -i "${REPO_DB}"
-        ' -i "${REPO_DB}"
 }
 
 update_yaml_remove() {
@@ -207,30 +251,30 @@ update_yaml_remove() {
     local repo
     repo=".repos.${dest}"
 
-    repo="${repo}" dest="${dest}" \
+    repo="${repo}" \
-    yq -P '
+        yq -P 'with(
-        with(
+                eval(strenv(repo));
-        eval(strenv(repo));
+                    .version = null |
-            .version = null |
+                    .packages = [] )' \
-            .packages = [] |
+            -i "${REPO_DB}"
-            .debug = [] ) |
+
-        with(
+    dest="${dest}" \
-        .actions;
+        yq -P 'with(
-            .addRepo = null |
+            .actions;
-            .removeRepo = env(dest) |
+                .addRepo = null |
-            .triggersBuild = false |
+                .removeRepo = env(dest) |
-            .triggersRebuild = false |
+                .triggersBuild = false |
-            .triggersRepoAdd = false |
+                .triggersRebuild = false |
-            .triggersRepoRemove = true |
+                .triggersRepoAdd = false |
-            .triggersNoCheck = false )
+                .triggersRepoRemove = true |
-        ' -i "${REPO_DB}"
+                .triggersNoCheck = false )' \
+            -i "${REPO_DB}"
 }
 
 update_yaml_move() {
     local src="$1"
     local dest="$2"
     local pkgs
-    local debug_pkgs
     local version
     local src_repo
     local dest_repo
@@ -239,34 +283,41 @@ update_yaml_move() {
     dest_repo=".repos.${dest}"
 
     version=$(version_from_yaml "${src}")
+    pkgs=$(packages_from_yaml "${src}")
 
-    pkgs=$(src_repo="${src_repo}" yq -Pr -o json 'eval(strenv(src_repo)).packages' "${REPO_DB}")
+    src_repo="${src_repo}" \
-    debug_pkgs=$(src_repo="${src_repo}" yq -Pr -o json 'eval(strenv(src_repo)).debug' "${REPO_DB}")
+        yq -P 'with(
+                eval(strenv(src_repo));
+                    .version = null |
+                    .packages = [] )' \
+            -i "${REPO_DB}"
 
-    src_repo="${src_repo}" dest_repo="${dest_repo}" \
+    version="${version}" pkgs="${pkgs}" dest_repo="${dest_repo}" \
-    version="${version}" src=${src} dest="${dest}" \
+        yq -P 'with(
-    pkgs="${pkgs}" debug_pkgs="${debug_pkgs}" \
+                eval(strenv(dest_repo));
-    yq -P '
+                    .version = env(version) |
-        with(
+                    .packages = env(pkgs) )' \
-        eval(strenv(src_repo));
+            -i "${REPO_DB}"
-            .version = null |
+
-            .packages = [] |
+    src=${src} dest="${dest}" \
-            .debug = [] ) |
+        yq -P 'with(
-        with(
+            .actions;
-        eval(strenv(dest_repo));
+                .addRepo = env(dest) |
-            .version = env(version) |
+                .removeRepo = env(src) |
-            .packages = env(pkgs) |
+                .triggersBuild = false |
-            .debug = env(debug_pkgs) ) |
+                .triggersRebuild = false |
-        with(
+                .triggersRepoAdd = true |
-        .actions;
+                .triggersRepoRemove = true |
-            .addRepo = env(dest) |
+                .triggersNoCheck = false )' \
-            .removeRepo = env(src) |
+            -i "${REPO_DB}"
-            .triggersBuild = false |
+}
-            .triggersRebuild = false |
+
-            .triggersRepoAdd = true |
+show_agent() {
-            .triggersRepoRemove = true |
+    local agent="${AGENTS[0]}"
-            .triggersNoCheck = false )
+    if grep @${AGENTS[1]} "${REPO_CI}" &>/dev/null; then
-        ' -i "${REPO_DB}"
+        agent="${AGENTS[1]}"
+    fi
+    msg2 "agent: %s" "$agent"
 }
 
 team_from_yaml() {
@@ -275,12 +326,11 @@ team_from_yaml() {
     printf "$team"
 }
 
-detect_team() {
+auto_detect() {
     local team
-
     for repo in "${ARTIX_TEAMS[@]}"; do
-        local key res
+        local _r res
-        res=$(key=".repos.$repo" yq -rP 'eval(strenv(key)) | .version' "${REPO_DB}")
+        res=$(_r=".$repo" yq -rP '.repos | eval(strenv(_r)) | .version' "${REPO_DB}")
         if [[ "${res}" != "null" ]]; then
             team=${repo}
         fi
@@ -288,34 +338,41 @@ detect_team() {
     printf "%s\n" "$team"
 }
 
-show_agent() {
-    local agent
-    local ci
-    local branch
-    agent="${AGENTS[0]}"
-    ci=$(head -n 1 "${REPO_CI}" | cut -d "'" -f2)
-    branch=${ci#*@}
-    if [[ -n "$branch" ]]; then
-        agent="$branch"
-    fi
-    msg2 "agent: %s" "$agent"
-}
-
 show_db() {
     show_agent
     if ! yq -r "${REPO_DB}" 1>/dev/null 2>/dev/null; then
         die "${REPO_DB} invalid!"
     fi
-    yq -rP 'with_entries(select(.key == "team"))' "${REPO_DB}"
+    yq -rP 'with_entries(select(.key == "team" or .key == "pkgbase"))' "${REPO_DB}"
-    yq -rP '.repos | with_entries(select(.value.version))' "${REPO_DB}"
+    yq -rP '. | .repos | with_entries(select(.value.version))' "${REPO_DB}"
     return 0
 }
 
+show_srcinfo_base() {
+    pkg2yaml . | yq '.pkgbase'
+}
+
+show_srcinfo_pkgs() {
+    pkg2yaml . | yq '.pkgnames'
+}
+
 write_jenkinsfile() {
-    local branch="$1"
+    printf "@Library('artix-ci@%s') import org.artixlinux.RepoPackage\n" "${1}" > "${REPO_CI}"
     {
-        printf "@Library('artix-ci@%s') import org.artixlinux.RepoPackage\n" "${branch}"
         printf '\n'
         printf 'PackagePipeline(new RepoPackage(this))\n'
-    } > "${REPO_CI}"
+    } >> "${REPO_CI}"
+}
+
+migrate_agent_branch() {
+    local branch=${AGENTS[0]}
+    for a in "${AGENTS[@]}"; do
+        if grep @"$a" "${REPO_CI}" &>/dev/null; then
+            branch="$a"
+        fi
+    done
+    if grep @galaxy "${REPO_CI}" &>/dev/null; then
+        branch=${AGENTS[1]}
+    fi
+    write_jenkinsfile "${branch}"
 }

src/lib/pkg/db/upgrade.sh

@@ -1,20 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-upgrade_db() {
-    local d
-    for db in "${ARTIX_DB[@]}"; do
-        local res
-        res=$(d=".repos.$db" yq 'eval(strenv(d)) | has("debug")' "${REPO_DB}")
-        if ! "${res}"; then
-            d=".repos.$db" \
-            yq 'eval(strenv(d)).debug = []' -i "${REPO_DB}"
-        fi
-    done
-
-    if $(yq '. | has("pkgbase") ' "${REPO_DB}"); then
-        yq 'del(.pkgbase)' -i "${REPO_DB}"
-    fi
-}

src/lib/pkg/git.sh

@@ -18,6 +18,7 @@ artixpkg_git_usage() {
         create         Create a new Gitea package repository
         pull           Pull a package repository
         push           Push a package repository
+        ci             Configure CI agent
 
     OPTIONS
         -h, --help     Show this help text
@@ -28,6 +29,7 @@ artixpkg_git_usage() {
         $ ${COMMAND} clone --search mytopic
         $ ${COMMAND} config libfoo
         $ ${COMMAND} create -c libfoo
+        $ ${COMMAND} ci -a ${AGENTS[1]} libfoo
 _EOF_
 }
 
@@ -60,6 +62,14 @@ artixpkg_git() {
             artixpkg_git_config "$@"
             exit 0
         ;;
+        ci)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=src/lib/pkg/git/ci.sh
+            source "${LIBDIR}"/pkg/git/ci.sh
+            artixpkg_git_ci "$@"
+            exit 0
+        ;;
         create)
             _ARTOOLS_COMMAND+=" $1"
             shift

src/lib/pkg/git/ci.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_GIT_CI_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_GIT_CI_SH=1
+
+# shellcheck source=src/lib/pkg/db/db.sh
+source "${LIBDIR}"/pkg/db/db.sh
+
+set -e
+
+
+artixpkg_git_ci_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -a, --agent NAME       Set the CI agent (default: ${AGENTS[0]})
+                               Possible values: $(yaml_array ${AGENTS[@]})
+        -h, --help             Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} --agent ${AGENTS[1]} libfoo
+_EOF_
+}
+
+
+artixpkg_git_ci() {
+    # options
+    local paths=()
+
+    local AGENT=${AGENTS[0]}
+    local SWITCH=0
+
+    # variables
+    local path realpath pkgbase
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_git_ci_usage
+            exit 0
+        ;;
+        -a|--agent)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            AGENT="$2"
+            SWITCH=1
+            shift 2
+        ;;
+        --)
+            shift
+            break
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            paths=("$@")
+            break
+        ;;
+        esac
+    done
+
+    # check if invoked without any path from within a packaging repo
+    if (( ${#paths[@]} == 0 )); then
+        if [[ -f PKGBUILD ]]; then
+            paths=(".")
+        else
+            artixpkg_git_ci_usage
+            exit 1
+        fi
+    fi
+
+    for path in "${paths[@]}"; do
+        if ! realpath=$(realpath -e "${path}"); then
+            error "No such directory: ${path}"
+            continue
+        fi
+
+        pkgbase=$(basename "${realpath}")
+        pkgbase=${pkgbase%.git}
+
+        if [[ ! -d "${path}/.git" ]]; then
+            error "Not a Git repository: ${path}"
+            continue
+        fi
+        ( cd "${path}" || return
+
+            if [[ ! -f ${REPO_CI} ]]; then
+
+                [[ -d .artixlinux ]] || mkdir .artixlinux
+
+                msg "Adding ci support ..."
+                write_jenkinsfile "${AGENT}"
+
+                git add "${REPO_CI}"
+                git commit -m "add ci support"
+            fi
+
+            if [[ ! -f ${REPO_DB} ]]; then
+
+                msg "Creating repo db ..."
+                create_repo_db
+
+                if [[ -f PKGBUILD ]]; then
+                    # shellcheck source=contrib/makepkg/PKGBUILD.proto
+                    source PKGBUILD
+                    update_yaml_base
+                fi
+                git add "${REPO_DB}"
+                git commit -m "create repo db"
+            fi
+
+            if (( SWITCH )); then
+                msg "Switching to agent (${AGENT}) ..."
+                write_jenkinsfile "${AGENT}"
+
+                git add "${REPO_CI}"
+                git commit -m "switch agent"
+            fi
+
+        )
+    done
+}

src/lib/pkg/git/clone.sh

@@ -7,6 +7,8 @@ ARTOOLS_INCLUDE_GIT_CLONE_SH=1
 
 # shellcheck source=src/lib/pkg/git/config.sh
 source "${LIBDIR}"/pkg/git/config.sh
+# shellcheck source=src/lib/pkg/git/ci.sh
+source "${LIBDIR}"/pkg/git/ci.sh
 # shellcheck source=src/lib/pkg/admin/team.sh
 source "${LIBDIR}"/pkg/admin/team.sh
 
@@ -21,8 +23,10 @@ artixpkg_git_clone_usage() {
     OPTIONS
         -m, --maintainer NAME      Clone all packages of the named maintainer
         -s, --search TOPIC         Clone all packages of the named topic
+        -a, --agent NAME           Set the CI agent (default: ${AGENTS[0]})
+                                   Possible values: $(yaml_array ${AGENTS[@]})
         -t, --team NAME            Assign team name (default: ${ARTIX_TEAMS[1]})
-                                   Possible values: (${ARTIX_TEAMS[@]})
+                                   Possible values: $(yaml_array ${ARTIX_TEAMS[@]})
         -j, --jobs N               Run up to N jobs in parallel (default: $(nproc))
         --protocol https           Clone the repository over https
         --all                      Clone all existing packages, useful for cache warming
@@ -33,6 +37,7 @@ artixpkg_git_clone_usage() {
         $ ${COMMAND} --maintainer tux
         $ ${COMMAND} --search mytopic
         $ ${COMMAND} -j 8 --search mytopic
+        $ ${COMMAND} --agent ${AGENTS[1]} libfoo
 _EOF_
 }
 
@@ -50,6 +55,7 @@ artixpkg_git_clone() {
     local MAINTAINER=
     local TOPIC=
     local CONFIG_OPTS=()
+    local AGENT_OPTS=()
     local TEAM_OPTS=()
     local jobs=
     jobs=$(nproc)
@@ -92,6 +98,11 @@ artixpkg_git_clone() {
                 TEAM_OPTS=("--add" "$2")
                 shift 2
             ;;
+            -a|--agent)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                AGENT_OPTS=("$1" "$2")
+                shift 2
+            ;;
             --all)
                 CLONE_ALL=1
                 shift
@@ -158,7 +169,7 @@ artixpkg_git_clone() {
         fi
 
         artixpkg_git_config "${CONFIG_OPTS[@]}" "${pkgbase}"
+        artixpkg_git_ci "${AGENT_OPTS[@]}" "${pkgbase}"
         artixpkg_admin_team "${TEAM_OPTS[@]}" "${pkgbase}"
-
     done
 }

src/lib/pkg/git/config.sh

@@ -5,8 +5,8 @@
 [[ -z ${ARTOOLS_INCLUDE_GIT_CONFIG_SH:-} ]] || return 0
 ARTOOLS_INCLUDE_GIT_CONFIG_SH=1
 
-# shellcheck source=src/lib/pkg/db/db.sh
+# shellcheck source=src/lib/pkg/packager.sh
-source "${LIBDIR}"/pkg/db/db.sh
+source "${LIBDIR}"/pkg/packager.sh
 
 set -e
 
@@ -91,10 +91,8 @@ artixpkg_git_config() {
 
     # Load makepkg.conf variables to be available for packager identity
     msg "Collecting packager identity from makepkg.conf"
-
+    # shellcheck source=config/makepkg/x86_64.conf
-    # shellcheck source=src/lib/pkg/util/packager.sh
+    load_makepkg_config
-    source "${LIBDIR}"/pkg/util/packager.sh
-
     if [[ -n ${PACKAGER} ]]; then
         if ! packager_name=$(get_packager_name "${PACKAGER}") || \
             ! packager_email=$(get_packager_email "${PACKAGER}"); then
@@ -169,33 +167,6 @@ artixpkg_git_config() {
                 git config user.signingKey "${GPGKEY}"
             fi
 
-            if [[ ! -f ${REPO_CI} ]]; then
-
-                [[ -d .artixlinux ]] || mkdir .artixlinux
-
-                msg "Adding ci support ..."
-                local agent
-                agent="${AGENT_MAP["${TEAM_OPTS[1]}"]}"
-                write_jenkinsfile "$agent"
-
-                git add "${REPO_CI}"
-                git commit -m "add ci support"
-
-            fi
-
-            if [[ ! -f ${REPO_DB} ]]; then
-
-                msg "Creating repo db ..."
-                create_repo_db
-
-                if [[ -f PKGBUILD ]]; then
-                    pkg2yaml -o "${SRCINFO}"
-                fi
-                git add "${REPO_DB}"
-                git commit -m "create repo db"
-
-            fi
-
         )
     done
 }

src/lib/pkg/git/create.sh

@@ -9,6 +9,8 @@ ARTOOLS_INCLUDE_GIT_CREATE_SH=1
 source "${LIBDIR}"/pkg/git/clone.sh
 # shellcheck source=src/lib/pkg/git/config.sh
 source "${LIBDIR}"/pkg/git/config.sh
+# shellcheck source=src/lib/pkg/git/ci.sh
+source "${LIBDIR}"/pkg/git/ci.sh
 # shellcheck source=src/lib/pkg/admin/team.sh
 source "${LIBDIR}"/pkg/admin/team.sh
 
@@ -22,8 +24,10 @@ artixpkg_git_create_usage() {
 
     OPTIONS
         -c, --clone           Clone the Git repository after creation
+        -a, --agent NAME      Set the CI agent (default: ${AGENTS[0]})
+                              Possible values: $(yaml_array ${AGENTS[@]})
         -t, --team NAME       Assign team name (default: ${ARTIX_TEAMS[1]})
-                              Possible values: (${ARTIX_TEAMS[@]})
+                              Possible values: $(yaml_array ${ARTIX_TEAMS[@]})
         -h, --help            Show this help text
 
     EXAMPLES
@@ -38,6 +42,7 @@ artixpkg_git_create() {
     local CLONE=0
     local CONFIG=0
 
+    local AGENT_OPTS=("--agent" "${AGENTS[0]}")
     local TEAM_OPTS=("--team" "${ARTIX_TEAMS[1]}")
 
     # variables
@@ -49,6 +54,11 @@ artixpkg_git_create() {
             artixpkg_git_create_usage
             exit 0
         ;;
+        -a|--agent)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            AGENT_OPTS=("$1" "$2")
+            shift 2
+        ;;
         -c|--clone)
             CLONE=1
             shift
@@ -103,9 +113,10 @@ artixpkg_git_create() {
         fi
 
         if (( CLONE )); then
-            artixpkg_git_clone "${TEAM_OPTS[@]}" "${pkgbase}"
+            artixpkg_git_clone "${AGENT_OPTS[@]}" "${TEAM_OPTS[@]}" "${pkgbase}"
         elif (( CONFIG )); then
             artixpkg_git_config "${pkgbase}"
+            artixpkg_git_ci "${AGENT_OPTS[@]}" "${pkgbase}"
             artixpkg_admin_team "${TEAM_OPTS[@]}" "${pkgbase}"
         fi
 

src/lib/pkg/git/push.sh

@@ -16,12 +16,14 @@ artixpkg_git_push_usage() {
     OPTIONS
         -m, --maintainer NAME      Push all packages of the named maintainer
         -t, --topic NAME           Push all packages of the named topic
+        -j, --jobs N               Run up to N jobs in parallel (default: $(nproc))
         -h, --help                 Show this help text
 
     EXAMPLES
         $ ${COMMAND} libfoo linux libbar
         $ ${COMMAND} --maintainer tux
         $ ${COMMAND} --topic mytopic
+        $ ${COMMAND} -j 8 --topic mytopic
 _EOF_
 }
 
@@ -36,6 +38,11 @@ artixpkg_git_push() {
     # options
     local MAINTAINER=
     local TOPIC=
+    local CONFIGURE_OPTIONS=()
+    local jobs=
+    jobs=$(nproc)
+
+    local command=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
 
     while (( $# )); do
         case $1 in
@@ -53,6 +60,11 @@ artixpkg_git_push() {
                 TOPIC="$2"
                 shift 2
             ;;
+            -j|--jobs)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                jobs=$2
+                shift 2
+            ;;
             --)
                 shift
                 break
@@ -78,6 +90,19 @@ artixpkg_git_push() {
         mapfile -t pkgbases < <(search_topic "${TOPIC}" | yq -P -r '.data | .[].name' | sort)
     fi
 
+    # parallelization
+    if [[ ${jobs} != 1 ]] && (( ${#pkgbases[@]} > 1 )); then
+        # force colors in parallel if parent process is colorized
+        if [[ -n ${BOLD} ]]; then
+            export ARTOOLS_COLOR=always
+        fi
+        if ! parallel --bar --jobs "${jobs}" "${command}" ::: "${pkgbases[@]}"; then
+            die 'Failed to push some packages, please check the output'
+            exit 1
+        fi
+        exit 0
+    fi
+
     for pkgbase in "${pkgbases[@]}"; do
         if [[ -d ${pkgbase} ]]; then
             ( cd "${pkgbase}" || return

src/lib/pkg/packager.sh

@@ -49,6 +49,3 @@ is_packager_email_official() {
     fi
     return 1
 }
-
-# shellcheck source=config/makepkg/x86_64.conf
-load_makepkg_config

src/lib/pkg/repo.sh

@@ -8,15 +8,10 @@ ARTOOLS_INCLUDE_REPO_SH=1
 # shellcheck source=src/lib/pkg/db/db.sh
 source "${LIBDIR}"/pkg/db/db.sh
 
-# shellcheck source=src/lib/pkg/db/upgrade.sh
-source "${LIBDIR}"/pkg/db/upgrade.sh
-
 set -e
 
 
-load_makepkg_config
+has_remote_changes() {
-
-no_remote_changes() {
     local status
     msg "Checking for remote changes ..."
     git fetch origin &>/dev/null
@@ -24,10 +19,10 @@ no_remote_changes() {
     if [[ "$status" == *behind* ]]; then
         msg2 "changes: yes"
         error "Remote changes detected! Please pull (%s)" "${pkgbase}"
-        return 1
+        return 0
     fi
     msg2 "changes: no"
-    return 0
+    return 1
 }
 
 artixpkg_repo_usage() {

src/lib/pkg/repo/add.sh

@@ -41,9 +41,6 @@ artixpkg_repo_add_usage() {
         -p, --push              Push pkgbase
         -r, --rebuild           Triggers a rebuild
         -n, --nocheck           Disable the check function
-        -a, --agent NAME        Set the CI agent
-                                [default: auto]
-                                possible values: ${AGENTS[@]}
         -h, --help              Show this help text
 
     EXAMPLES
@@ -69,7 +66,6 @@ artixpkg_repo_add() {
     local NOCHECK=0
     local ADD=1
     local AUTO=0
-    local AGENT
 
     while (( $# )); do
         case $1 in
@@ -89,11 +85,6 @@ artixpkg_repo_add() {
                 NOCHECK=1
                 shift
             ;;
-            -a|--agent)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                AGENT="$2"
-                shift 2
-            ;;
             -*)
                 die "invalid argument: %s" "$1"
             ;;
@@ -125,7 +116,7 @@ artixpkg_repo_add() {
             fi
             ( cd "${pkgbase}" || return
 
-                if no_remote_changes; then
+                if ! has_remote_changes; then
 
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
@@ -138,33 +129,27 @@ artixpkg_repo_add() {
 
                     manage-pkgbuild-keys --export
 
-                    pkg2yaml -o "${SRCINFO}"
+                    update_yaml_base
 
-                    local team
+                    local auto
-                    team=$(detect_team)
+                    auto=$(auto_detect)
 
-                    if [[ -z "${team}" ]]; then
+                    if [[ -z "${auto}" ]]; then
-                        team=$(team_from_yaml)
+                        auto=$(team_from_yaml)
                     fi
 
                     if (( AUTO )); then
                         if [[ "${DEST}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            DEST="${team}"
+                            DEST="${auto}"
                         else
-                            DEST="${team}-${DEST}"
+                            DEST="${auto}-${DEST}"
                         fi
                     fi
 
-                    upgrade_db
-
                     update_yaml_add "${REBUILD}" "${ADD}" "${NOCHECK}" "${DEST}"
 
-                    update_yaml_team "${team}"
+                    update_yaml_team "${auto}"
 
-                    if [[ -z ${AGENT} ]]; then
-                        AGENT=${AGENT_MAP["${team}"]}
-                    fi
-                    write_jenkinsfile "${AGENT}"
 
                     local commit_msg
                     commit_msg=$(get_commit_msg 'add' "${DEST}")
@@ -173,6 +158,10 @@ artixpkg_repo_add() {
                         rm .SRCINFO
                     fi
 
+                    delete_obsolete_map_keys
+
+                    migrate_agent_branch
+
                     if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
 
                         stat_busy 'Staging files'

src/lib/pkg/repo/import.sh

@@ -9,21 +9,15 @@ set -e
 
 PATCHDIR=${PATCHDIR:-"${WORKSPACE_DIR}/artix-patches"}
 
-declare -A arch_map=(
-    ["archlinux-mirrorlist"]="pacman-mirrorlist"
-    ["artix-rebuild-order"]="arch-rebuild-order"
-    ["virtualbox-host-modules-artix"]="virtualbox-host-modules-arch"
-)
-
 update_patches(){
     if [[ ! -d "${PATCHDIR}" ]]; then
         # ${GIT_ORG}
-        if ! git clone "${PATCH_URL}" "${PATCHDIR}"; then
+        if ! git clone --depth=1 "${GIT_SSH}:artix/artix-patches.git" "${PATCHDIR}"; then
-            error "failed to clone %s" "${PATCHDIR}"
+            >&2 echo 'failed to clone %s' "${PATCHDIR}"
         fi
     else
         if ! git -C "${PATCHDIR}" pull; then
-           error "Failed to pull artix-patches"
+            >&2 echo "Failed to pull artix-patches"
         fi
     fi
 }
@@ -31,26 +25,16 @@ update_patches(){
 patch_pkgbase(){
     local name="$1"
     local patches="${PATCHDIR}/patches/${name}"
-    sed -e 's|arch-meson|artix-meson|' -i PKGBUILD
+    sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
-
+        -e 's|(Arch Linux)|(Artix Linux)|' \
-    if "${PATCH_MAINTAINER}" && [ -n "${PACKAGER}" ]; then
+        -e 's|arch-meson|artix-meson|' \
-        sed -e 's|# Maintainer:|# Contributor:|' -i PKGBUILD
+        -e 's|# Maintainer:|# Contributor:|' \
+        -i PKGBUILD
+    if [ -n "${PACKAGER}" ]; then
         printf '%s\n%s\n' "# Maintainer: ${PACKAGER}" "$(cat "PKGBUILD")" >"PKGBUILD"
     fi
 
     if [ -d "${patches}" ]; then
-        if [ -f "${patches}/env.txt" ]; then
-            while read -r line; do
-                IFS="=" read -r key value <<< "$line"
-                if [[ -z "${key}" ]] || [[ -z "${value}" ]]; then
-                    die "Invalid key value pair in env.txt"
-                fi
-                if declare -p "${key}" &> /dev/null; then
-                    die "Environment variable %s already exists." "${key}"
-                fi
-                export "${key}=${value}"
-            done < "${patches}/env.txt"
-        fi
         for file in "${patches}"/*; do
             if [ -x "${file}" ]; then
                 echo "$> ${name}/$(basename "${file}")"
@@ -73,14 +57,12 @@ artixpkg_repo_import_usage() {
     OPTIONS
         --tag TAG          Switch the current workspace to a specified version tag
         --del              Delete files before rsync import
-        -n --no-patch      No patch import
         -h, --help         Show this help text
 
     EXAMPLES
         $ ${COMMAND} libfoo
         $ ${COMMAND} --tag TAG libfoo
         $ ${COMMAND} --tag TAG --del libfoo
-        $ ${COMMAND} --no-patch libfoo
 _EOF_
 }
 
@@ -94,7 +76,6 @@ artixpkg_repo_import() {
     local pkgbases=()
     local pkgbase
     local TAG
-    local NP=0
     local rsync_args=()
     rsync_args+=(
         -axcihW
@@ -125,10 +106,6 @@ artixpkg_repo_import() {
                 rsync_args+=(--delete-before)
                 shift
             ;;
-            -n|--no-patch)
-                NP=1
-                shift
-            ;;
             -h|--help)
                 artixpkg_repo_import_usage
                 exit 0
@@ -156,17 +133,14 @@ artixpkg_repo_import() {
             fi
             ( cd "${pkgbase}" || return
 
-                upstream="${arch_map["$pkgbase"]:-$pkgbase}"
-
                 stat_busy "Checking for upstream url"
                 if ! git config --local --get remote.upstream.url &>/dev/null; then
-                    git remote add upstream "${GIT_UPSTREAM_URL}/${upstream}".git
+                    git remote add upstream "${GIT_UPSTREAM_URL}/${pkgbase}".git
                 fi
                 stat_done
 
                 msg2 "Fetching upstream tags"
-                local fetch
+                git fetch --tags upstream main
-                fetch=$(git fetch --tags upstream main  &>/dev/null)
 
                 local latest version
                 latest=$(git describe --tags FETCH_HEAD)
@@ -175,7 +149,7 @@ artixpkg_repo_import() {
                     version="${TAG}"
                 fi
 
-                if no_remote_changes; then
+                if ! has_remote_changes; then
                     msg "Querying ${pkgbase} ..."
                     if ! show_db; then
                         warning "Could not query ${REPO_DB}"
@@ -192,10 +166,8 @@ artixpkg_repo_import() {
                     msg "Importing upstream changeset for ${version}"
                     rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/ #&>/dev/null
 
-                    if ! (( NP )); then
+                    msg2 "Patching ${pkgbase} ..."
-                        msg2 "Patching ${pkgbase} ..."
+                    patch_pkgbase "${pkgbase}"
-                        patch_pkgbase "${pkgbase}"
-                    fi
                 fi
             )
         fi

src/lib/pkg/repo/move.sh

@@ -15,9 +15,6 @@ artixpkg_repo_move_usage() {
 
     OPTIONS
         -p, --push              Push pkgbase
-        -a, --agent NAME        Set the CI agent
-                                [default: auto]
-                                possible values: ${AGENTS[@]}
         -h, --help              Show this help text
 
     EXAMPLES
@@ -42,7 +39,6 @@ artixpkg_repo_move() {
 
     local DEST
     local SRC
-    local AGENT
 
     while (( $# )); do
         case $1 in
@@ -54,11 +50,6 @@ artixpkg_repo_move() {
                 PUSH=1
                 shift
             ;;
-            -a|--agent)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                AGENT="$2"
-                shift 2
-            ;;
             -*)
                 die "invalid argument: %s" "$1"
             ;;
@@ -95,30 +86,30 @@ artixpkg_repo_move() {
             fi
             ( cd "${pkgbase}" || return
 
-                if no_remote_changes; then
+                if ! has_remote_changes; then
 
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
                     fi
 
-                    local team
+                    local auto
-                    team=$(detect_team)
+                    auto=$(auto_detect)
 
-                    if [[ -z "${team}" ]]; then
+                    if [[ -z "${auto}" ]]; then
-                        team=$(team_from_yaml)
+                        auto=$(team_from_yaml)
                     fi
 
                     if (( AUTO )); then
                         if [[ "${SRC}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            SRC="${team}"
+                            SRC="${auto}"
                         else
-                            SRC="${team}-${SRC}"
+                            SRC="${auto}-${SRC}"
                         fi
 
                         if [[ "${DEST}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            DEST="${team}"
+                            DEST="${auto}"
                         else
-                            DEST="${team}-${DEST}"
+                            DEST="${auto}-${DEST}"
                         fi
                     fi
 
@@ -129,26 +120,19 @@ artixpkg_repo_move() {
 
                     if [[ "$src_version" != "null" ]]; then
 
-                        if ! [[ -f "${SRCINFO}" ]]; then
-                            pkg2yaml -o "${SRCINFO}"
-                        fi
-
-                        upgrade_db
-
                         update_yaml_move "${SRC}" "${DEST}"
 
-                        team=$(detect_team)
-                        update_yaml_team "${team}"
-
-                        if [[ -z ${AGENT} ]]; then
-                            AGENT=${AGENT_MAP["${team}"]}
-                        fi
-                        write_jenkinsfile "${AGENT}"
 
                         if [[ -f .SRCINFO ]]; then
                             rm .SRCINFO
                         fi
 
+                        delete_obsolete_map_keys
+
+                        migrate_agent_branch
+
+                        update_yaml_team "$(auto_detect)"
+
                         if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
 
                             stat_busy 'Staging files'
@@ -156,14 +140,6 @@ artixpkg_repo_move() {
                                 if [[ "$f" == "${REPO_DB}" ]]; then
                                     git add "$f"
                                 fi
-                                if [[ "$f" == "${REPO_CI}" ]]; then
-                                    git add "$f"
-                                fi
-                            done
-                            for f in $(git ls-files --others); do
-                                if [[ "$f" == "${SRCINFO}" ]]; then
-                                    git add "$f"
-                                fi
                             done
                             stat_done
 
@@ -190,18 +166,18 @@ artixpkg_repo_move() {
                             # team change on cross repo move system <-> world
                             if [[ "${SRC}" == ${ARTIX_DB[2]}* ]] \
                             && [[ "${DEST}" == ${ARTIX_DB[5]}* ]]; then
-                                if ! add_team_to_repo "${gitname}" "${ARTIX_DB[5]}"; then
+                                if ! add_team_to_repo "${pkgbase}" "${ARTIX_DB[5]}"; then
                                     warning "failed to add team: ${ARTIX_DB[5]}"
                                 fi
-                                if ! remove_team_from_repo "${gitname}" "${ARTIX_DB[2]}"; then
+                                if ! remove_team_from_repo "${pkgbase}" "${ARTIX_DB[2]}"; then
                                     warning "failed to remove team: ${ARTIX_DB[2]}"
                                 fi
                             elif [[ "${SRC}" == ${ARTIX_DB[5]}* ]] \
                             && [[ "${DEST}" == ${ARTIX_DB[2]}* ]]; then
-                                if ! add_team_to_repo "${gitname}" "${ARTIX_DB[2]}"; then
+                                if ! add_team_to_repo "${pkgbase}" "${ARTIX_DB[2]}"; then
                                     warning "failed to add team: ${ARTIX_DB[2]}"
                                 fi
-                                if ! remove_team_from_repo "${gitname}" "${ARTIX_DB[5]}"; then
+                                if ! remove_team_from_repo "${pkgbase}" "${ARTIX_DB[5]}"; then
                                     warning "failed to remove team: ${ARTIX_DB[5]}"
                                 fi
                             fi

src/lib/pkg/repo/remove.sh

@@ -15,9 +15,6 @@ artixpkg_repo_remove_usage() {
 
     OPTIONS
         -p, --push              Push pkgbase
-        -a, --agent NAME        Set the CI agent
-                                [default: auto]
-                                possible values: ${AGENTS[@]}
         -h, --help              Show this help text
 
     EXAMPLES
@@ -40,7 +37,6 @@ artixpkg_repo_remove() {
     local PUSH=0
     local AUTO=0
     local DEST=''
-    local AGENT
 
     while (( $# )); do
         case $1 in
@@ -52,11 +48,6 @@ artixpkg_repo_remove() {
                 PUSH=1
                 shift
             ;;
-            -a|--agent)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                AGENT="$2"
-                shift 2
-            ;;
             -*)
                 die "invalid argument: %s" "$1"
             ;;
@@ -88,40 +79,35 @@ artixpkg_repo_remove() {
             fi
             ( cd "${pkgbase}" || return
 
-                if no_remote_changes; then
+                if ! has_remote_changes; then
 
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
                     fi
 
-                    local team
+                    local auto
-                    team=$(detect_team)
+                    auto=$(auto_detect)
 
-                    if [[ -z "${team}" ]]; then
+                    if [[ -z "${auto}" ]]; then
-                        team=$(team_from_yaml)
+                        auto=$(team_from_yaml)
                     fi
 
                     if (( AUTO )); then
                         if [[ "${DEST}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            DEST="${team}"
+                            DEST="${auto}"
                         else
-                            DEST="${team}-${DEST}"
+                            DEST="${auto}-${DEST}"
                         fi
                     fi
 
                     local commit_msg
                     commit_msg=$(get_commit_msg 'remove' "${DEST}")
 
-                    # pkg2yaml -o "${SRCINFO}"
-
-                    upgrade_db
-
                     update_yaml_remove "${DEST}"
 
-                    if [[ -z ${AGENT} ]]; then
+                    delete_obsolete_map_keys
-                        AGENT=${AGENT_MAP["${team}"]}
+
-                    fi
+                    migrate_agent_branch
-                    write_jenkinsfile "${AGENT}"
 
                     if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
 

src/lib/pkg/repo/show.sh

@@ -72,7 +72,7 @@ artixpkg_repo_show() {
             fi
             ( cd "${pkgbase}" || return
 
-                if no_remote_changes; then
+                if ! has_remote_changes; then
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
                     fi
@@ -83,17 +83,13 @@ artixpkg_repo_show() {
                     fi
 
                     if (( SRC_BASE )); then
-                        if [[ -f "${SRCINFO}" ]]; then
+                        msg "Showing srcinfo base ..."
-                            msg "Showing srcinfo pkgbase ..."
+                        show_srcinfo_base
-                            yq '.pkgbase' "${SRCINFO}"
-                        fi
                     fi
 
                     if (( SRC_PKGS )); then
-                        if [[ -f "${SRCINFO}" ]]; then
+                        msg "Showing srcinfo pkgs ..."
-                            msg "Showing srcinfo pkgname ..."
+                        show_srcinfo_pkgs
-                            yq '.pkgname' "${SRCINFO}"
-                        fi
                     fi
                 fi
 

src/lib/pkg/table.sh

@@ -0,0 +1,37 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ table
+
+msg_table_header(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@"
+}
+
+msg_row_yellow(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@"
+}
+
+msg_row_green(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@"
+}
+
+msg_row(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@"
+}
+
+msg_row_red(){
+    local mesg=$1; shift
+    # shellcheck disable=2059
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@"
+}
+
+#}}}

src/lib/pkg/util.sh

@@ -60,9 +60,9 @@ load_pkg_config(){
 
     DBEXT=${DBEXT:-'gz'}
 
-    PATCH_MAINTAINER=${PATCH_MAINTAINER:-false}
+    if [[ -z "${AGENTS[*]}" ]]; then
-
+        AGENTS=(orion taurus)
-    PATCH_URL=${PATCH_URL:-"${GIT_SSH}:artix/artix-patches.git"}
+    fi
 
     return 0
 }

src/lib/pkg/yaml.sh

@@ -0,0 +1,30 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ yaml
+
+write_yaml_header(){
+    printf '%s\n' '---'
+}
+
+write_empty_line(){
+    printf '\n'
+}
+
+write_yaml_map(){
+    local ident="$1" key="$2" val="$3"
+    printf "\n%${ident}s%s: %s\n" '' "$key" "$val"
+}
+
+write_yaml_seq(){
+    local ident="$1" val="$2"
+    printf "\n%${ident}s- %s\n" '' "$val"
+}
+
+write_yaml_seq_map(){
+    local ident="$1" key="$2" val="$3"
+    printf "\n%${ident}s- %s: %s\n" '' "$key" "$val"
+}
+
+#}}}

src/pkg/artixpkg.in

@@ -41,6 +41,8 @@ export _ARTOOLS_COMMAND='artixpkg'
 # shellcheck source=src/lib/pkg/util.sh
 source "${LIBDIR}"/pkg/util.sh
 
+load_makepkg_config
+
 cd "${TREE_DIR_ARTIX}"
 
 # command checking

src/pkg/checkpkg.in

@@ -6,8 +6,10 @@ LIBDIR=${LIBDIR:-'@libdir@'}
 
 # shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
-# shellcheck source=src/lib/pkg/util/diff.sh
+# shellcheck source=src/lib/pkg/diff.sh
-source "${LIBDIR}"/pkg/util/diff.sh
+source "${LIBDIR}"/pkg/diff.sh
+
+load_makepkg_config
 
 usage() {
     cat <<- _EOF_

src/pkg/checkrepo.in

@@ -10,45 +10,13 @@ SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 source "${LIBDIR}"/pkg/util.sh
 # shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/table.sh
+source "${LIBDIR}"/pkg/table.sh
 # shellcheck source=src/lib/pkg/db/db.sh
 source "${LIBDIR}"/pkg/db/db.sh
 
 shopt -s extglob
 
-#{{{ table
-
-msg_table_header(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@"
-}
-
-msg_row_yellow(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg_row_green(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg_row(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg_row_red(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@"
-}
-
-#}}}
-
 extract_db() {
     local u="$1" cdir="$2"
     rm -rf "$cdir"

src/pkg/chroot-run.in

@@ -181,9 +181,7 @@ else
     set_arch="${CARCH}"
 fi
 
-chroot_args=(/usr/bin/env PATH=/usr/local/sbin:/usr/local/bin:/usr/bin)
+${CARCH:+setarch "${set_arch}"} chroot "${working_dir}" "$@"
-
-${CARCH:+setarch "${set_arch}"} chroot "${working_dir}" "${chroot_args[@]}" "$@"
 
 ret=$?
 

src/pkg/diffpkg.in

@@ -6,8 +6,8 @@ LIBDIR=${LIBDIR:-'@libdir@'}
 
 # shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
-# shellcheck source=src/lib/pkg/util/diff.sh
+# shellcheck source=src/lib/pkg/diff.sh
-source "${LIBDIR}"/pkg/util/diff.sh
+source "${LIBDIR}"/pkg/diff.sh
 
 usage() {
     cat <<- _EOF_

src/pkg/packagersign.in

@@ -8,8 +8,8 @@ LIBDIR=${LIBDIR:-'@libdir@'}
 source "${LIBDIR}"/base/message.sh
 # shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
-# shellcheck source=src/lib/pkg/util/deploy.sh
+# shellcheck source=src/lib/pkg/deploy.sh
-source "${LIBDIR}"/pkg/util/deploy.sh
+source "${LIBDIR}"/pkg/deploy.sh
 
 # shellcheck source=config/makepkg/x86_64.conf
 load_makepkg_config

src/pkg/pkg2yaml.in

@@ -6,198 +6,136 @@ LIBDIR=${LIBDIR:-'@libdir@'}
 
 # shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/yaml.sh
+source "${LIBDIR}"/pkg/yaml.sh
 
 # shellcheck disable=1091
 source "${MAKEPKG_LIBRARY}"/util/pkgbuild.sh
 # shellcheck disable=1091
 source "${MAKEPKG_LIBRARY}"/util/schema.sh
 
-# {{{ functions
+#{{{ functions
 
-yaml_array_str() {
+srcyaml_write_attr(){
-    local array
+    local ident1="$1" ident2="$2" ident3="$3"
+    local attrname=$4 attrvalues=("${@:5}")
 
-    for entry in "$@"; do
+    # normalize whitespace, strip leading and trailing
-        array="${array:-}${array:+,} '${entry}'"
+    attrvalues=("${attrvalues[@]//+([[:space:]])/ }")
-    done
+    attrvalues=("${attrvalues[@]#[[:space:]]}")
-    printf "%s\n" "[${array}]"
+    attrvalues=("${attrvalues[@]%[[:space:]]}")
+
+    case $attrname in
+        pkgver|pkgrel|epoch|url|install|changelog)
+            for v in "${attrvalues[@]}"; do
+                Yaml+=$(write_yaml_map "$ident3" "$attrname" "$v")
+            done
+        ;;
+        pkgdesc)
+            Yaml+=$(write_yaml_map "$ident1" "$attrname" "${attrvalues[@]}")
+        ;;
+        *)
+            Yaml+=$(write_yaml_map "$ident1" "$attrname")
+            for v in "${attrvalues[@]}"; do
+                Yaml+=$(write_yaml_seq "$ident2" "$v")
+            done
+        ;;
+    esac
 }
 
-pkgbuild_extract_to_srcyaml() {
+pkgbuild_extract_to_yaml() {
-    # $1: pkgname
+    local pkgname=$1 attrname=$2 isarray=$3 outvalue=
-    # $2: index
-    # $3: attr name
-    # $4: multivalued
-
-    local pkgname="$1" i="$2" attrname="$3" isarray="$4"  outvalue=
 
     if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then
-        local ov an
+        [[ -z $pkgname ]] && srcyaml_write_attr 2 4 2 "$attrname" "${outvalue[@]}"
-
+        [[ -n $pkgname ]] && srcyaml_write_attr 4 6 2 "$attrname" "${outvalue[@]}"
-        if [[ -n $pkgname ]]; then
-            an=".pkgname[$i].$attrname"
-        else
-            an=".pkgbase.$attrname"
-        fi
-
-        if (( isarray )); then
-            ov=$(yaml_array_str "${outvalue[@]}")
-        else
-            ov="${outvalue[*]}"
-            if [[ -z "$ov" ]]; then
-                ov="null"
-            fi
-        fi
-
-        an="$an" ov="$ov" \
-        yq -P 'eval(strenv(an)) = env(ov)' -i "${YAML}"
     fi
 }
 
-srcyaml_write_node_details() {
+srcyaml_write_section_details() {
     local attr package_arch a
-    local multivalued_arch_attrs=(
+    local multivalued_arch_attrs=(source provides conflicts depends replaces
-        source
+                                  optdepends makedepends checkdepends
-        provides
+                                  "${known_hash_algos[@]/%/sums}")
-        conflicts
-        depends
-        replaces
-        optdepends
-        makedepends
-        checkdepends
-        "${known_hash_algos[@]/%/sums}"
-    )
 
     for attr in "${singlevalued[@]}"; do
-        pkgbuild_extract_to_srcyaml "$1" "$2" "$attr" 0
+        pkgbuild_extract_to_yaml "$1" "$attr" 0
     done
 
     for attr in "${multivalued[@]}"; do
-        pkgbuild_extract_to_srcyaml "$1" "$2" "$attr" 1
+        pkgbuild_extract_to_yaml "$1" "$attr" 1
     done
 
-    get_pkgbuild_attribute "$pn" 'arch' 1 'package_arch'
+    get_pkgbuild_attribute "$1" 'arch' 1 'package_arch'
     for a in "${package_arch[@]}"; do
         # 'any' is special. there's no support for, e.g. depends_any.
         [[ $a = any ]] && continue
 
         for attr in "${multivalued_arch_attrs[@]}"; do
-            pkgbuild_extract_to_srcyaml "$1" "$2" "${attr}_$a" 1
+            pkgbuild_extract_to_yaml "$1" "${attr}_$a" 1
         done
     done
 }
 
-srcyaml_write_global() {
+yaml_write_global() {
-    local singlevalued=(
+    local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog)
-        pkgdesc
+    local multivalued=(arch groups license checkdepends makedepends
-        pkgver
+                        depends optdepends provides conflicts replaces
-        pkgrel
+                        noextract options backup
-        epoch
+                        source validpgpkeys "${known_hash_algos[@]/%/sums}")
-        url
-        install
-        changelog
-    )
-    local multivalued=(
-        arch
-        groups
-        license
-        checkdepends
-        makedepends
-        depends
-        optdepends
-        provides
-        conflicts
-        replaces
-        noextract
-        options
-        backup
-        source
-        validpgpkeys
-        "${known_hash_algos[@]/%/sums}"
-    )
 
-    srcyaml_write_node_details '' ''
+    Yaml+=$(write_yaml_map 0 "pkgbase")
+    Yaml+=$(write_yaml_map 2 "name" "${pkgbase:-${pkgname}}")
+
+    srcyaml_write_section_details ""
 }
 
-srcyaml_write_package() {
+yaml_write_package() {
-    local singlevalued=(
+    local singlevalued=(pkgdesc url install changelog)
-        pkgdesc
+    local multivalued=(arch groups license checkdepends depends optdepends
-        url
+                       provides conflicts replaces options backup)
-        install
-        changelog
-    )
-    local multivalued=(
-        arch
-        groups
-        license
-        checkdepends
-        depends
-        optdepends
-        provides
-        conflicts
-        replaces
-        options
-        backup
-    )
 
-    srcyaml_write_node_details "$1" "$2"
+    Yaml+=$(write_yaml_map 0 "pkgnames")
+    for pkg in "${pkgname[@]}"; do
+        Yaml+=$(write_yaml_seq_map 2 "pkgname" "$pkg")
+        srcyaml_write_section_details "$pkg"
+    done
 }
 
 write_srcyaml() {
-    yq -n '"---"' > "${YAML}"
+    Yaml=$(write_yaml_header)
+    yaml_write_global
+    yaml_write_package
 
-    local ver
+#     local version
-    ver=$(get_full_version) \
+#     version=$(get_full_version)
-    yq -P '.version = env(ver)' -i "${YAML}"
+#     Yaml+=$(write_yaml_map 2 "version" "${version}")
 
-    # https://github.com/mikefarah/yq/issues/1836
+    printf '%s\n' "${Yaml}"
-    # yq '. head_comment="generated with artixpkg @buildtoolver@"' -i "${YAML}"
-
-    local name=${pkgbase:-$pkgname}
-    name="$name" \
-    yq -P '.pkgbase.name = env(name)' -i "${YAML}"
-    srcyaml_write_global
-
-    local pn
-    local key
-    for ((i = 0 ; i < "${#pkgname[@]}" ; i++)); do
-        pn="${pkgname[$i]}" key=".pkgname[$i]" \
-        yq -P 'eval(strenv(key)).name = env(pn)' -i "${YAML}"
-        srcyaml_write_package "${pkgname[$i]}" "$i"
-    done
-
-    yq '. foot_comment="generated with artixpkg @buildtoolver@"' -i "${YAML}"
 }
 
-# }}}
+#}}}
 
 usage() {
     printf 'Usage: %s [options]\n' "${0##*/}"
-    printf "    -o <out>      Out file (default: ${YAML})\n"
     printf '    -h            This help\n'
     printf '\n'
     exit "$1"
 }
 
-YAML=/tmp/srcinfo.yaml
-
 # shellcheck source=config/makepkg/x86_64.conf
 load_makepkg_config
 
-opts='o:h'
+opts='h'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        o) YAML="$OPTARG" ;;
         h|?) usage 0 ;;
     esac
 done
 
 shift $(( OPTIND - 1 ))
-
+srcpath=$(readlink -f "$1")
-# srcpath=$(readlink -f "$1")
-
-[[ -z "$srcpath" ]] && srcpath="."
 
 [[ -f "$srcpath"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$srcpath"
 

src/pkg/repopkg.in

@@ -10,8 +10,8 @@ SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 source "${LIBDIR}"/pkg/util.sh
 # shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
-# shellcheck source=src/lib/pkg/util/deploy.sh
+# shellcheck source=src/lib/pkg/deploy.sh
-source "${LIBDIR}"/pkg/util/deploy.sh
+source "${LIBDIR}"/pkg/deploy.sh
 
 #{{{ deploy
 

src/pkg/signpkg.in

@@ -6,8 +6,8 @@ LIBDIR=${LIBDIR:-'@libdir@'}
 
 # shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
-# shellcheck source=src/lib/pkg/util/deploy.sh
+# shellcheck source=src/lib/pkg/deploy.sh
-source "${LIBDIR}"/pkg/util/deploy.sh
+source "${LIBDIR}"/pkg/deploy.sh
 
 # shellcheck source=config/makepkg/x86_64.conf
 load_makepkg_config