artixpkg git: fix ci lib source

Reviewed-on: #123

src/lib/pkg/api/gitea.sh

@@ -196,7 +196,6 @@ remove_all_topics() {
         -H "Authorization: token ${GIT_TOKEN}" \
         -d "$json"
     stat_done
-
 }
 
 #}}}

src/lib/pkg/ci.sh

@@ -1,55 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_CI_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_CI_SH=1
-
-set -e
-
-artixpkg_ci_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-    COMMANDS
-        config         Configure ci and build agent
-
-    OPTIONS
-        -h, --help     Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} config libfoo
-_EOF_
-}
-
-artixpkg_ci() {
-    if (( $# < 1 )); then
-        artixpkg_ci_usage
-        exit 0
-    fi
-
-    # option checking
-    while (( $# )); do
-        case $1 in
-        -h|--help)
-            artixpkg_ci_usage
-            exit 0
-        ;;
-        config)
-            _ARTOOLS_COMMAND+=" $1"
-            shift
-            # shellcheck source=src/lib/pkg/ci/config.sh
-            source "${LIBDIR}"/pkg/ci/config.sh
-            artixpkg_ci_config "$@"
-            exit 0
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            die "invalid command: %s" "$1"
-        ;;
-        esac
-    done
-}

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} config --topic mytopic
         $ ${COMMAND} config --maintainer tux
         $ ${COMMAND} create -c libfoo
+        $ ${COMMAND} ci -a taurus
 _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

@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-[[ -z ${ARTOOLS_INCLUDE_CI_CONFIG_SH:-} ]] || return 0
+[[ -z ${ARTOOLS_INCLUDE_GIT_CI_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_CI_CONFIG_SH=1
+ARTOOLS_INCLUDE_GIT_CI_SH=1
 
 # shellcheck source=src/lib/pkg/db/db.sh
 source "${LIBDIR}"/pkg/db/db.sh
@@ -11,7 +11,7 @@ source "${LIBDIR}"/pkg/db/db.sh
 set -e
 
 
-artixpkg_ci_config_usage() {
+artixpkg_git_ci_usage() {
     local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
     cat <<- _EOF_
     Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
@@ -19,22 +19,16 @@ artixpkg_ci_config_usage() {
     OPTIONS
         -a, --agent NAME       Set the CI agent (default: ${AGENTS[0]})
                                Possible values: $(yaml_array ${AGENTS[@]})
-        -s, --switch           Switch agent
-        -j, --jobs N           Run up to N jobs in parallel (default: $(nproc))
         -h, --help             Show this help text
 
     EXAMPLES
         $ ${COMMAND} --agent ${AGENTS[1]} libfoo
-        $ ${COMMAND} --switch --agent ${AGENTS[1]} libfoo
-        $ ${COMMAND} *
 _EOF_
 }
 
 
-artixpkg_ci_config() {
+artixpkg_git_ci() {
     # options
-    local jobs=
-    jobs=$(nproc)
     local paths=()
 
     local AGENT=${AGENTS[0]}
@@ -46,21 +40,13 @@ artixpkg_ci_config() {
     while (( $# )); do
         case $1 in
         -h|--help)
-            artixpkg_ci_config_usage
+            artixpkg_git_ci_usage
             exit 0
         ;;
-        -s|--switch)
-            SWITCH=1
-            shift
-        ;;
         -a|--agent)
             (( $# <= 1 )) && die "missing argument for %s" "$1"
             AGENT="$2"
-            shift 2
+            SWITCH=1
-        ;;
-        -j|--jobs)
-            (( $# <= 1 )) && die "missing argument for %s" "$1"
-            jobs=$2
             shift 2
         ;;
         --)
@@ -82,7 +68,7 @@ artixpkg_ci_config() {
         if [[ -f PKGBUILD ]]; then
             paths=(".")
         else
-            artixpkg_ci_config_usage
+            artixpkg_git_ci_usage
             exit 1
         fi
     fi

src/lib/pkg/git/clone.sh

@@ -7,8 +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/ci/config.sh
+# shellcheck source=src/lib/pkg/git/ci.sh
-source "${LIBDIR}"/pkg/ci/config.sh
+source "${LIBDIR}"/pkg/git/ci.sh
 # shellcheck source=src/lib/pkg/admin/team.sh
 source "${LIBDIR}"/pkg/admin/team.sh
 
@@ -169,7 +169,7 @@ artixpkg_git_clone() {
         fi
 
         artixpkg_git_config "${CONFIG_OPTS[@]}" "${pkgbase}"
-        artixpkg_ci_config "${AGENT_OPTS[@]}" "${pkgbase}"
+        artixpkg_git_ci "${AGENT_OPTS[@]}" "${pkgbase}"
         artixpkg_admin_team "${TEAM_OPTS[@]}" "${pkgbase}"
     done
 }

src/lib/pkg/git/create.sh

@@ -9,8 +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/ci/config.sh
+# shellcheck source=src/lib/pkg/git/ci.sh
-source "${LIBDIR}"/pkg/ci/config.sh
+source "${LIBDIR}"/pkg/git/ci.sh
 # shellcheck source=src/lib/pkg/admin/team.sh
 source "${LIBDIR}"/pkg/admin/team.sh
 
@@ -116,7 +116,7 @@ artixpkg_git_create() {
             artixpkg_git_clone "${AGENT_OPTS[@]}" "${TEAM_OPTS[@]}" "${pkgbase}"
         elif (( CONFIG )); then
             artixpkg_git_config "${pkgbase}"
-            artixpkg_ci_config "${AGENT_OPTS[@]}" "${pkgbase}"
+            artixpkg_git_ci "${AGENT_OPTS[@]}" "${pkgbase}"
             artixpkg_admin_team "${TEAM_OPTS[@]}" "${pkgbase}"
         fi
 

src/pkg/artixpkg.in

@@ -21,7 +21,6 @@ usage() {
 
     COMMANDS
         admin     Manage topics, teams and obsolete repos
-        ci        Manage CI and build agent
         git       Manage Git packaging repositories and their configuration
         repo      Pacman database modification for package updates, moves, etc.
 
@@ -69,14 +68,6 @@ while (( $# )); do
         artixpkg_git "$@"
         exit 0
     ;;
-    ci)
-        _ARTOOLS_COMMAND+=" $1"
-        shift
-        # shellcheck source=src/lib/pkg/ci.sh
-        source "${LIBDIR}"/pkg/ci.sh
-        artixpkg_ci "$@"
-        exit 0
-    ;;
     admin)
         _ARTOOLS_COMMAND+=" $1"
         shift

src/pkg/repopkg.in

@@ -20,6 +20,7 @@ add() {
         msg "Found: %s" "${pkgfile}"
         packages+=("${pkgname}")
         action='add'
+        action_args+=(--include-sigs)
         ln -sfv "${pkgfile}"{,.sig} "${repo_path}"/
     fi
 }
@@ -41,7 +42,7 @@ repo_action() {
     done
     ( cd "${repo_path}" || return
         if [[ -n "${action}" ]]; then
-            repo-"${action}" -R "${dest_repo}.${db_ext}" "${packages[@]}"
+            repo-"${action}" "${action_args[@]}" "${dest_repo}.${db_ext}" "${packages[@]}"
         fi
     )
 }
@@ -57,6 +58,7 @@ rm_pkg=false
 
 cmd=${0##*/}
 dest_repo=${cmd#*-}
+action_args=(-R)
 
 usage() {
     printf "Usage: %s [options]\n" "${cmd}"