artixpkg: fix repo import upstream fetch

Reviewed-on: artix/artools#148
Co-authored-by: Artoo <artoo@artixlinux.org>
Co-committed-by: Artoo <artoo@artixlinux.org>

Makefile

@@ -80,7 +80,7 @@ conf_base:
 
 conf_pkg:
 	@install -d $(BUILDDIR)/makepkg.conf.d $(BUILDDIR)/artools
-	@cp -a $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
+	@cp -ra $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
 	@cp -a $(TOOLS_CONFIGS_PKG) $(BUILDDIR)/artools
 
 conf_iso:
@@ -111,7 +111,8 @@ install_pkg: binprogs_pkg
 
 	for conf in $(notdir $(TOOLS_CONFIGS_PKG)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
 
-	for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
+	cp -ra $(BUILDDIR)/makepkg.conf.d -t $(DESTDIR)$(DATADIR)
+
 	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
 
@@ -134,13 +135,12 @@ 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
-	for conf in $(notdir $(MAKEPKG_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
+	rm -rf $(DESTDIR)$(DATADIR)/makepkg.conf.d
 	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,9 +36,6 @@
 # default archiving org
 # GIT_ORG_ARCHIVE='landfill'
 
-# default jenkins agents
-# AGENTS=(orion taurus)
-
 # whether to include custom maintainer line when importing from arch
 # PATCH_MAINTAINER=false
 

config/makepkg/conf.d/fortran.conf

@@ -0,0 +1,18 @@
+#!/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

@@ -0,0 +1,19 @@
+#!/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.d/fortran.conf

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

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

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

contrib/completion/bash/artixpkg.in

@@ -67,14 +67,6 @@ _artixpkg_completion() {
         fi
     done
     teams="${teams:1}"
-    agents=""
-    for word in "${AGENTS[@]}"; do
-        if [[ $word != -* ]]; then
-            agents+=" $word"
-        fi
-    done
-    agents="${agents:1}"
-
 
     case "${comp_cword_exflag}" in
         1)
@@ -292,4 +284,4 @@ _artixpkg_completion() {
     esac
 }
 
-complete -F _artixpkg_completion artixpkg
+complete -F _artixpkg_completion artixpkg

src/lib/pkg/admin/maintainer.sh

@@ -79,8 +79,8 @@ artixpkg_admin_maintainer() {
 
     pkgbases+=("$@")
 
-    # shellcheck source=src/lib/pkg/packager.sh
-    source "${LIBDIR}"/pkg/packager.sh
+    # shellcheck source=src/lib/pkg/util/packager.sh
+    source "${LIBDIR}"/pkg/util/packager.sh
 
     if [[ -n ${PACKAGER} ]]; then
         if ! packager_name=$(get_packager_name "${PACKAGER}") || \

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: $(yaml_array ${ARTIX_TEAMS[@]})
+                                    Possible values: (${ARTIX_TEAMS[@]})
         -r, --remove NAME           Remove team from repo
-                                    Possible values: $(yaml_array ${ARTIX_TEAMS[@]})
+                                    Possible values: (${ARTIX_TEAMS[@]})
         -h, --help                  Show this help text
 
     EXAMPLES

src/lib/pkg/db/db.sh

@@ -23,6 +23,11 @@ readonly ARTIX_DB_MAP=(
     stable
 )
 
+readonly AGENTS=(
+    orion
+    taurus
+)
+
 readonly ARTIX_TEAMS=(
     "${ARTIX_DB[2]}"
     "${ARTIX_DB[5]}"
@@ -30,27 +35,30 @@ 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'
 
-yaml_array() {
-    local array
+readonly SRCINFO='.artixlinux/srcinfo.yaml'
 
-    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}")
-        printf "%s-%s-%s%s\n" "$pkg" "$version" "$architecture" "$PKGEXT"
+        array="${array:-}${array:+,} $pkg-$version-$architecture$PKGEXT"
     done
+    printf "%s\n" "[${array}]"
 }
 
 print_debug_package_names() {
@@ -59,7 +67,9 @@ 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
 }
 
@@ -71,17 +81,6 @@ 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
@@ -113,17 +112,9 @@ create_repo_db() {
 
     yq -n '"---"' > "${REPO_DB}"
 
-    yq -P '.team = null' -i "${REPO_DB}"
-
-    yq -P 'with(
-        .pkgbase;
-            .name = null |
-            .version = null |
-            .arch = [] |
-            .pkgname = [] )' \
-        -i "${REPO_DB}"
-
-    yq -P 'with(
+    yq -P '
+        .team = null |
+        with(
         .actions;
             .addRepo = null |
             .removeRepo = null |
@@ -131,39 +122,20 @@ create_repo_db() {
             .triggersRebuild = false |
             .triggersRepoAdd = false |
             .triggersRepoRemove = false |
-            .triggersNoCheck = false )' \
-        -i "${REPO_DB}"
-
-    yq -P '.repos = {}' -i "${REPO_DB}"
+            .triggersNoCheck = false ) |
+            .repos = {}
+        ' -i "${REPO_DB}"
 
     for r in "${ARTIX_DB[@]}"; do
         local repo
         repo=".repos.${r}" \
-            yq -P 'with(
-                    eval(strenv(repo));
-                        .version = null |
-                        .packages = [] )' \
-                -i "${REPO_DB}"
-    done
-}
-
-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
+        yq -P '
+            with(
+            eval(strenv(repo));
+                .version = null |
+                .packages = [] |
+                .debug = [] )
+            ' -i "${REPO_DB}"
     done
 }
 
@@ -172,27 +144,6 @@ 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"
@@ -213,36 +164,41 @@ update_yaml_add() {
         local pkgs
         local version
         local pkgfiles
+        local debug_pkgfiles
 
-        mapfile -t pkgfiles < <(print_package_names)
+        pkgs=$(print_package_names)
 
-        pkgs=$(yaml_array "${pkgfiles[@]}")
+        debug_pkgs=$(print_debug_package_names)
 
         version=$(get_full_version)
         repo=".repos.${dest}"
 
-        version="${version}" pkgs="${pkgs}" repo="${repo}" \
-            yq -P 'with(
-                    eval(strenv(repo));
-                        .version = env(version) |
-                        .packages = env(pkgs) )' \
-                -i "${REPO_DB}"
+        version="${version}" repo="${repo}" \
+        pkgs="${pkgs}" debug_pkgs="${debug_pkgs}" \
+        yq -P '
+            with(
+            eval(strenv(repo));
+                .version = env(version) |
+                .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 'with(
-            .actions;
-                .addRepo = env(dest) |
-                .removeRepo = null |
-                .triggersBuild = env(build) |
-                .triggersRebuild = env(rebuild) |
-                .triggersRepoAdd = env(add) |
-                .triggersRepoRemove = false |
-                .triggersNoCheck = env(nocheck) )' \
-            -i "${REPO_DB}"
+    yq -P '
+        with(
+        .actions;
+            .addRepo = env(dest) |
+            .removeRepo = null |
+            .triggersBuild = env(build) |
+            .triggersRebuild = env(rebuild) |
+            .triggersRepoAdd = env(add) |
+            .triggersRepoRemove = false |
+            .triggersNoCheck = env(nocheck) )
+        ' -i "${REPO_DB}"
 }
 
 update_yaml_remove() {
@@ -251,30 +207,30 @@ update_yaml_remove() {
     local repo
     repo=".repos.${dest}"
 
-    repo="${repo}" \
-        yq -P 'with(
-                eval(strenv(repo));
-                    .version = null |
-                    .packages = [] )' \
-            -i "${REPO_DB}"
-
-    dest="${dest}" \
-        yq -P 'with(
-            .actions;
-                .addRepo = null |
-                .removeRepo = env(dest) |
-                .triggersBuild = false |
-                .triggersRebuild = false |
-                .triggersRepoAdd = false |
-                .triggersRepoRemove = true |
-                .triggersNoCheck = false )' \
-            -i "${REPO_DB}"
+    repo="${repo}" dest="${dest}" \
+    yq -P '
+        with(
+        eval(strenv(repo));
+            .version = null |
+            .packages = [] |
+            .debug = [] ) |
+        with(
+        .actions;
+            .addRepo = null |
+            .removeRepo = env(dest) |
+            .triggersBuild = false |
+            .triggersRebuild = false |
+            .triggersRepoAdd = false |
+            .triggersRepoRemove = true |
+            .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
@@ -283,41 +239,34 @@ update_yaml_move() {
     dest_repo=".repos.${dest}"
 
     version=$(version_from_yaml "${src}")
-    pkgs=$(packages_from_yaml "${src}")
 
-    src_repo="${src_repo}" \
-        yq -P 'with(
-                eval(strenv(src_repo));
-                    .version = null |
-                    .packages = [] )' \
-            -i "${REPO_DB}"
+    pkgs=$(src_repo="${src_repo}" yq -Pr -o json 'eval(strenv(src_repo)).packages' "${REPO_DB}")
+    debug_pkgs=$(src_repo="${src_repo}" yq -Pr -o json 'eval(strenv(src_repo)).debug' "${REPO_DB}")
 
-    version="${version}" pkgs="${pkgs}" dest_repo="${dest_repo}" \
-        yq -P 'with(
-                eval(strenv(dest_repo));
-                    .version = env(version) |
-                    .packages = env(pkgs) )' \
-            -i "${REPO_DB}"
-
-    src=${src} dest="${dest}" \
-        yq -P 'with(
-            .actions;
-                .addRepo = env(dest) |
-                .removeRepo = env(src) |
-                .triggersBuild = false |
-                .triggersRebuild = false |
-                .triggersRepoAdd = true |
-                .triggersRepoRemove = true |
-                .triggersNoCheck = false )' \
-            -i "${REPO_DB}"
-}
-
-show_agent() {
-    local agent="${AGENTS[0]}"
-    if grep @${AGENTS[1]} "${REPO_CI}" &>/dev/null; then
-        agent="${AGENTS[1]}"
-    fi
-    msg2 "agent: %s" "$agent"
+    src_repo="${src_repo}" dest_repo="${dest_repo}" \
+    version="${version}" src=${src} dest="${dest}" \
+    pkgs="${pkgs}" debug_pkgs="${debug_pkgs}" \
+    yq -P '
+        with(
+        eval(strenv(src_repo));
+            .version = null |
+            .packages = [] |
+            .debug = [] ) |
+        with(
+        eval(strenv(dest_repo));
+            .version = env(version) |
+            .packages = env(pkgs) |
+            .debug = env(debug_pkgs) ) |
+        with(
+        .actions;
+            .addRepo = env(dest) |
+            .removeRepo = env(src) |
+            .triggersBuild = false |
+            .triggersRebuild = false |
+            .triggersRepoAdd = true |
+            .triggersRepoRemove = true |
+            .triggersNoCheck = false )
+        ' -i "${REPO_DB}"
 }
 
 team_from_yaml() {
@@ -326,11 +275,12 @@ team_from_yaml() {
     printf "$team"
 }
 
-auto_detect() {
+detect_team() {
     local team
+
     for repo in "${ARTIX_TEAMS[@]}"; do
-        local _r res
-        res=$(_r=".$repo" yq -rP '.repos | eval(strenv(_r)) | .version' "${REPO_DB}")
+        local key res
+        res=$(key=".repos.$repo" yq -rP 'eval(strenv(key)) | .version' "${REPO_DB}")
         if [[ "${res}" != "null" ]]; then
             team=${repo}
         fi
@@ -338,41 +288,34 @@ auto_detect() {
     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" or .key == "pkgbase"))' "${REPO_DB}"
-    yq -rP '. | .repos | with_entries(select(.value.version))' "${REPO_DB}"
+    yq -rP 'with_entries(select(.key == "team"))' "${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() {
-    printf "@Library('artix-ci@%s') import org.artixlinux.RepoPackage\n" "${1}" > "${REPO_CI}"
+    local branch="$1"
     {
+        printf "@Library('artix-ci@%s') import org.artixlinux.RepoPackage\n" "${branch}"
         printf '\n'
         printf 'PackagePipeline(new RepoPackage(this))\n'
-    } >> "${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}"
+    } > "${REPO_CI}"
 }

src/lib/pkg/db/upgrade.sh

@@ -0,0 +1,20 @@
+#!/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,7 +18,6 @@ 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
@@ -29,7 +28,6 @@ artixpkg_git_usage() {
         $ ${COMMAND} clone --search mytopic
         $ ${COMMAND} config libfoo
         $ ${COMMAND} create -c libfoo
-        $ ${COMMAND} ci -a ${AGENTS[1]} libfoo
 _EOF_
 }
 
@@ -62,14 +60,6 @@ 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

@@ -1,132 +0,0 @@
-#!/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
-    local CREATED=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"
-
-                CREATED=1
-            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}"
-
-                if (( ! CREATED )); then
-                    git add "${REPO_CI}"
-                    git commit -m "switch agent"
-                fi
-            fi
-
-        )
-    done
-}

src/lib/pkg/git/clone.sh

@@ -7,8 +7,6 @@ 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
 
@@ -23,10 +21,8 @@ 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: $(yaml_array ${ARTIX_TEAMS[@]})
+                                   Possible values: (${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
@@ -37,7 +33,6 @@ artixpkg_git_clone_usage() {
         $ ${COMMAND} --maintainer tux
         $ ${COMMAND} --search mytopic
         $ ${COMMAND} -j 8 --search mytopic
-        $ ${COMMAND} --agent ${AGENTS[1]} libfoo
 _EOF_
 }
 
@@ -55,7 +50,6 @@ artixpkg_git_clone() {
     local MAINTAINER=
     local TOPIC=
     local CONFIG_OPTS=()
-    local AGENT_OPTS=()
     local TEAM_OPTS=()
     local jobs=
     jobs=$(nproc)
@@ -98,11 +92,6 @@ 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
@@ -169,7 +158,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,6 +5,9 @@
 [[ -z ${ARTOOLS_INCLUDE_GIT_CONFIG_SH:-} ]] || return 0
 ARTOOLS_INCLUDE_GIT_CONFIG_SH=1
 
+# shellcheck source=src/lib/pkg/db/db.sh
+source "${LIBDIR}"/pkg/db/db.sh
+
 set -e
 
 
@@ -89,8 +92,8 @@ artixpkg_git_config() {
     # Load makepkg.conf variables to be available for packager identity
     msg "Collecting packager identity from makepkg.conf"
 
-    # shellcheck source=src/lib/pkg/packager.sh
-    source "${LIBDIR}"/pkg/packager.sh
+    # shellcheck source=src/lib/pkg/util/packager.sh
+    source "${LIBDIR}"/pkg/util/packager.sh
 
     if [[ -n ${PACKAGER} ]]; then
         if ! packager_name=$(get_packager_name "${PACKAGER}") || \
@@ -166,6 +169,33 @@ 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,8 +9,6 @@ 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
 
@@ -24,10 +22,8 @@ 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: $(yaml_array ${ARTIX_TEAMS[@]})
+                              Possible values: (${ARTIX_TEAMS[@]})
         -h, --help            Show this help text
 
     EXAMPLES
@@ -42,7 +38,6 @@ artixpkg_git_create() {
     local CLONE=0
     local CONFIG=0
 
-    local AGENT_OPTS=("--agent" "${AGENTS[0]}")
     local TEAM_OPTS=("--team" "${ARTIX_TEAMS[1]}")
 
     # variables
@@ -54,11 +49,6 @@ 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
@@ -113,10 +103,9 @@ artixpkg_git_create() {
         fi
 
         if (( CLONE )); then
-            artixpkg_git_clone "${AGENT_OPTS[@]}" "${TEAM_OPTS[@]}" "${pkgbase}"
+            artixpkg_git_clone "${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/repo.sh

@@ -8,12 +8,15 @@ 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
@@ -21,10 +24,10 @@ has_remote_changes() {
     if [[ "$status" == *behind* ]]; then
         msg2 "changes: yes"
         error "Remote changes detected! Please pull (%s)" "${pkgbase}"
-        return 0
+        return 1
     fi
     msg2 "changes: no"
-    return 1
+    return 0
 }
 
 artixpkg_repo_usage() {

src/lib/pkg/repo/add.sh

@@ -41,6 +41,9 @@ 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
@@ -66,6 +69,7 @@ artixpkg_repo_add() {
     local NOCHECK=0
     local ADD=1
     local AUTO=0
+    local AGENT
 
     while (( $# )); do
         case $1 in
@@ -85,6 +89,11 @@ artixpkg_repo_add() {
                 NOCHECK=1
                 shift
             ;;
+            -a|--agent)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                AGENT="$2"
+                shift 2
+            ;;
             -*)
                 die "invalid argument: %s" "$1"
             ;;
@@ -116,7 +125,7 @@ artixpkg_repo_add() {
             fi
             ( cd "${pkgbase}" || return
 
-                if ! has_remote_changes; then
+                if no_remote_changes; then
 
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
@@ -129,27 +138,33 @@ artixpkg_repo_add() {
 
                     manage-pkgbuild-keys --export
 
-                    update_yaml_base
+                    pkg2yaml -o "${SRCINFO}"
 
-                    local auto
-                    auto=$(auto_detect)
+                    local team
+                    team=$(detect_team)
 
-                    if [[ -z "${auto}" ]]; then
-                        auto=$(team_from_yaml)
+                    if [[ -z "${team}" ]]; then
+                        team=$(team_from_yaml)
                     fi
 
                     if (( AUTO )); then
                         if [[ "${DEST}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            DEST="${auto}"
+                            DEST="${team}"
                         else
-                            DEST="${auto}-${DEST}"
+                            DEST="${team}-${DEST}"
                         fi
                     fi
 
+                    upgrade_db
+
                     update_yaml_add "${REBUILD}" "${ADD}" "${NOCHECK}" "${DEST}"
 
-                    update_yaml_team "${auto}"
+                    update_yaml_team "${team}"
 
+                    if [[ -z ${AGENT} ]]; then
+                        AGENT=${AGENT_MAP["${team}"]}
+                    fi
+                    write_jenkinsfile "${AGENT}"
 
                     local commit_msg
                     commit_msg=$(get_commit_msg 'add' "${DEST}")
@@ -158,10 +173,6 @@ 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

@@ -73,12 +73,14 @@ 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_
 }
 
@@ -92,6 +94,7 @@ artixpkg_repo_import() {
     local pkgbases=()
     local pkgbase
     local TAG
+    local NP=0
     local rsync_args=()
     rsync_args+=(
         -axcihW
@@ -122,6 +125,10 @@ artixpkg_repo_import() {
                 rsync_args+=(--delete-before)
                 shift
             ;;
+            -n|--no-patch)
+                NP=1
+                shift
+            ;;
             -h|--help)
                 artixpkg_repo_import_usage
                 exit 0
@@ -158,7 +165,8 @@ artixpkg_repo_import() {
                 stat_done
 
                 msg2 "Fetching upstream tags"
-                git fetch --tags upstream main
+                local fetch
+                fetch=$(git fetch --tags upstream main  &>/dev/null)
 
                 local latest version
                 latest=$(git describe --tags FETCH_HEAD)
@@ -167,7 +175,7 @@ artixpkg_repo_import() {
                     version="${TAG}"
                 fi
 
-                if ! has_remote_changes; then
+                if no_remote_changes; then
                     msg "Querying ${pkgbase} ..."
                     if ! show_db; then
                         warning "Could not query ${REPO_DB}"
@@ -184,8 +192,10 @@ artixpkg_repo_import() {
                     msg "Importing upstream changeset for ${version}"
                     rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/ #&>/dev/null
 
-                    msg2 "Patching ${pkgbase} ..."
-                    patch_pkgbase "${pkgbase}"
+                    if ! (( NP )); then
+                        msg2 "Patching ${pkgbase} ..."
+                        patch_pkgbase "${pkgbase}"
+                    fi
                 fi
             )
         fi

src/lib/pkg/repo/move.sh

@@ -15,6 +15,9 @@ 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
@@ -39,6 +42,7 @@ artixpkg_repo_move() {
 
     local DEST
     local SRC
+    local AGENT
 
     while (( $# )); do
         case $1 in
@@ -50,6 +54,11 @@ artixpkg_repo_move() {
                 PUSH=1
                 shift
             ;;
+            -a|--agent)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                AGENT="$2"
+                shift 2
+            ;;
             -*)
                 die "invalid argument: %s" "$1"
             ;;
@@ -86,30 +95,30 @@ artixpkg_repo_move() {
             fi
             ( cd "${pkgbase}" || return
 
-                if ! has_remote_changes; then
+                if no_remote_changes; then
 
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
                     fi
 
-                    local auto
-                    auto=$(auto_detect)
+                    local team
+                    team=$(detect_team)
 
-                    if [[ -z "${auto}" ]]; then
-                        auto=$(team_from_yaml)
+                    if [[ -z "${team}" ]]; then
+                        team=$(team_from_yaml)
                     fi
 
                     if (( AUTO )); then
                         if [[ "${SRC}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            SRC="${auto}"
+                            SRC="${team}"
                         else
-                            SRC="${auto}-${SRC}"
+                            SRC="${team}-${SRC}"
                         fi
 
                         if [[ "${DEST}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            DEST="${auto}"
+                            DEST="${team}"
                         else
-                            DEST="${auto}-${DEST}"
+                            DEST="${team}-${DEST}"
                         fi
                     fi
 
@@ -120,19 +129,26 @@ 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'
@@ -141,6 +157,11 @@ artixpkg_repo_move() {
                                     git add "$f"
                                 fi
                             done
+                            for f in $(git ls-files --others); do
+                                if [[ "$f" == "${SRCINFO}" ]]; then
+                                    git add "$f"
+                                fi
+                            done
                             stat_done
 
                             msg 'Commit'
@@ -166,18 +187,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 "${pkgbase}" "${ARTIX_DB[5]}"; then
+                                if ! add_team_to_repo "${gitname}" "${ARTIX_DB[5]}"; then
                                     warning "failed to add team: ${ARTIX_DB[5]}"
                                 fi
-                                if ! remove_team_from_repo "${pkgbase}" "${ARTIX_DB[2]}"; then
+                                if ! remove_team_from_repo "${gitname}" "${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 "${pkgbase}" "${ARTIX_DB[2]}"; then
+                                if ! add_team_to_repo "${gitname}" "${ARTIX_DB[2]}"; then
                                     warning "failed to add team: ${ARTIX_DB[2]}"
                                 fi
-                                if ! remove_team_from_repo "${pkgbase}" "${ARTIX_DB[5]}"; then
+                                if ! remove_team_from_repo "${gitname}" "${ARTIX_DB[5]}"; then
                                     warning "failed to remove team: ${ARTIX_DB[5]}"
                                 fi
                             fi

src/lib/pkg/repo/remove.sh

@@ -15,6 +15,9 @@ 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
@@ -37,6 +40,7 @@ artixpkg_repo_remove() {
     local PUSH=0
     local AUTO=0
     local DEST=''
+    local AGENT
 
     while (( $# )); do
         case $1 in
@@ -48,6 +52,11 @@ artixpkg_repo_remove() {
                 PUSH=1
                 shift
             ;;
+            -a|--agent)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                AGENT="$2"
+                shift 2
+            ;;
             -*)
                 die "invalid argument: %s" "$1"
             ;;
@@ -79,35 +88,40 @@ artixpkg_repo_remove() {
             fi
             ( cd "${pkgbase}" || return
 
-                if ! has_remote_changes; then
+                if no_remote_changes; then
 
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
                     fi
 
-                    local auto
-                    auto=$(auto_detect)
+                    local team
+                    team=$(detect_team)
 
-                    if [[ -z "${auto}" ]]; then
-                        auto=$(team_from_yaml)
+                    if [[ -z "${team}" ]]; then
+                        team=$(team_from_yaml)
                     fi
 
                     if (( AUTO )); then
                         if [[ "${DEST}" == "${ARTIX_DB_MAP[2]}" ]]; then
-                            DEST="${auto}"
+                            DEST="${team}"
                         else
-                            DEST="${auto}-${DEST}"
+                            DEST="${team}-${DEST}"
                         fi
                     fi
 
                     local commit_msg
                     commit_msg=$(get_commit_msg 'remove' "${DEST}")
 
+                    # pkg2yaml -o "${SRCINFO}"
+
+                    upgrade_db
+
                     update_yaml_remove "${DEST}"
 
-                    delete_obsolete_map_keys
-
-                    migrate_agent_branch
+                    if [[ -z ${AGENT} ]]; then
+                        AGENT=${AGENT_MAP["${team}"]}
+                    fi
+                    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 ! has_remote_changes; then
+                if no_remote_changes; then
                     if [[ ! -f PKGBUILD ]]; then
                         die "No PKGBUILD found in (%s)" "${pkgbase}"
                     fi
@@ -83,13 +83,17 @@ artixpkg_repo_show() {
                     fi
 
                     if (( SRC_BASE )); then
-                        msg "Showing srcinfo base ..."
-                        show_srcinfo_base
+                        if [[ -f "${SRCINFO}" ]]; then
+                            msg "Showing srcinfo pkgbase ..."
+                            yq '.pkgbase' "${SRCINFO}"
+                        fi
                     fi
 
                     if (( SRC_PKGS )); then
-                        msg "Showing srcinfo pkgs ..."
-                        show_srcinfo_pkgs
+                        if [[ -f "${SRCINFO}" ]]; then
+                            msg "Showing srcinfo pkgname ..."
+                            yq '.pkgname' "${SRCINFO}"
+                        fi
                     fi
                 fi
 

src/lib/pkg/table.sh

@@ -1,37 +0,0 @@
-#!/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

@@ -64,10 +64,6 @@ load_pkg_config(){
 
     PATCH_URL=${PATCH_URL:-"${GIT_SSH}:artix/artix-patches.git"}
 
-    if [[ -z "${AGENTS[*]}" ]]; then
-        AGENTS=(orion taurus)
-    fi
-
     return 0
 }
 

src/lib/pkg/yaml.sh

@@ -1,30 +0,0 @@
-#!/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/checkpkg.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/diff.sh
-source "${LIBDIR}"/pkg/diff.sh
+# shellcheck source=src/lib/pkg/util/diff.sh
+source "${LIBDIR}"/pkg/util/diff.sh
 
 usage() {
     cat <<- _EOF_

src/pkg/checkrepo.in

@@ -10,13 +10,45 @@ 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/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/diff.sh
-source "${LIBDIR}"/pkg/diff.sh
+# shellcheck source=src/lib/pkg/util/diff.sh
+source "${LIBDIR}"/pkg/util/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/deploy.sh
-source "${LIBDIR}"/pkg/deploy.sh
+# shellcheck source=src/lib/pkg/util/deploy.sh
+source "${LIBDIR}"/pkg/util/deploy.sh
 
 # shellcheck source=config/makepkg/x86_64.conf
 load_makepkg_config

src/pkg/pkg2yaml.in

@@ -6,136 +6,198 @@ 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
 
-srcyaml_write_attr(){
-    local ident1="$1" ident2="$2" ident3="$3"
-    local attrname=$4 attrvalues=("${@:5}")
+yaml_array_str() {
+    local array
 
-    # normalize whitespace, strip leading and trailing
-    attrvalues=("${attrvalues[@]//+([[:space:]])/ }")
-    attrvalues=("${attrvalues[@]#[[:space:]]}")
-    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
+    for entry in "$@"; do
+        array="${array:-}${array:+,} '${entry}'"
+    done
+    printf "%s\n" "[${array}]"
 }
 
-pkgbuild_extract_to_yaml() {
-    local pkgname=$1 attrname=$2 isarray=$3 outvalue=
+pkgbuild_extract_to_srcyaml() {
+    # $1: pkgname
+    # $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
-        [[ -z $pkgname ]] && srcyaml_write_attr 2 4 2 "$attrname" "${outvalue[@]}"
-        [[ -n $pkgname ]] && srcyaml_write_attr 4 6 2 "$attrname" "${outvalue[@]}"
+        local ov an
+
+        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_section_details() {
+srcyaml_write_node_details() {
     local attr package_arch a
-    local multivalued_arch_attrs=(source provides conflicts depends replaces
-                                  optdepends makedepends checkdepends
-                                  "${known_hash_algos[@]/%/sums}")
+    local multivalued_arch_attrs=(
+        source
+        provides
+        conflicts
+        depends
+        replaces
+        optdepends
+        makedepends
+        checkdepends
+        "${known_hash_algos[@]/%/sums}"
+    )
 
     for attr in "${singlevalued[@]}"; do
-        pkgbuild_extract_to_yaml "$1" "$attr" 0
+        pkgbuild_extract_to_srcyaml "$1" "$2" "$attr" 0
     done
 
     for attr in "${multivalued[@]}"; do
-        pkgbuild_extract_to_yaml "$1" "$attr" 1
+        pkgbuild_extract_to_srcyaml "$1" "$2" "$attr" 1
     done
 
-    get_pkgbuild_attribute "$1" 'arch' 1 'package_arch'
+    get_pkgbuild_attribute "$pn" '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_yaml "$1" "${attr}_$a" 1
+            pkgbuild_extract_to_srcyaml "$1" "$2" "${attr}_$a" 1
         done
     done
 }
 
-yaml_write_global() {
-    local singlevalued=(pkgdesc pkgver pkgrel epoch 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_global() {
+    local singlevalued=(
+        pkgdesc
+        pkgver
+        pkgrel
+        epoch
+        url
+        install
+        changelog
+    )
+    local multivalued=(
+        arch
+        groups
+        license
+        checkdepends
+        makedepends
+        depends
+        optdepends
+        provides
+        conflicts
+        replaces
+        noextract
+        options
+        backup
+        source
+        validpgpkeys
+        "${known_hash_algos[@]/%/sums}"
+    )
 
-    Yaml+=$(write_yaml_map 0 "pkgbase")
-    Yaml+=$(write_yaml_map 2 "name" "${pkgbase:-${pkgname}}")
-
-    srcyaml_write_section_details ""
+    srcyaml_write_node_details '' ''
 }
 
-yaml_write_package() {
-    local singlevalued=(pkgdesc url install changelog)
-    local multivalued=(arch groups license checkdepends depends optdepends
-                       provides conflicts replaces options backup)
+srcyaml_write_package() {
+    local singlevalued=(
+        pkgdesc
+        url
+        install
+        changelog
+    )
+    local multivalued=(
+        arch
+        groups
+        license
+        checkdepends
+        depends
+        optdepends
+        provides
+        conflicts
+        replaces
+        options
+        backup
+    )
 
-    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
+    srcyaml_write_node_details "$1" "$2"
 }
 
 write_srcyaml() {
-    Yaml=$(write_yaml_header)
-    yaml_write_global
-    yaml_write_package
+    yq -n '"---"' > "${YAML}"
 
-#     local version
-#     version=$(get_full_version)
-#     Yaml+=$(write_yaml_map 2 "version" "${version}")
+    local ver
+    ver=$(get_full_version) \
+    yq -P '.version = env(ver)' -i "${YAML}"
 
-    printf '%s\n' "${Yaml}"
+    # https://github.com/mikefarah/yq/issues/1836
+    # 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='h'
+opts='o: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/deploy.sh
-source "${LIBDIR}"/pkg/deploy.sh
+# shellcheck source=src/lib/pkg/util/deploy.sh
+source "${LIBDIR}"/pkg/util/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/deploy.sh
-source "${LIBDIR}"/pkg/deploy.sh
+# shellcheck source=src/lib/pkg/util/deploy.sh
+source "${LIBDIR}"/pkg/util/deploy.sh
 
 # shellcheck source=config/makepkg/x86_64.conf
 load_makepkg_config