install missing pacakge

.bandit.toml

@@ -1,5 +0,0 @@
-[tool.bandit]
-skips = [
-    "B404",
-    "B603",
-]

.bandit.yml

@@ -0,0 +1,3 @@
+skips:
+  - B404
+  - B603

.github/workflows/docker.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Set image date
         id: args
-        run: echo "date=$(date -d yesterday +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
+        run: echo "::set-output name=date::$(date -d yesterday +'%Y-%m-%d')"
 
       - name: Login to docker hub
         uses: docker/login-action@v3

.github/workflows/regress.yml

@@ -18,8 +18,8 @@ jobs:
         image: arcan1s/ahriman:edge
         env:
           AHRIMAN_PORT: 8080
-          AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman-web.sock
-        options: --privileged --user root --entrypoint entrypoint-web
+          AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
+        options: --privileged --entrypoint entrypoint-web
         ports:
           - 8080
         volumes:
@@ -31,8 +31,8 @@ jobs:
         AHRIMAN_DEBUG: y
         AHRIMAN_OUTPUT: console
         AHRIMAN_PORT: 8080
-        AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman-web.sock
-      options: --privileged --user root
+        AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
+      options: --privileged
       volumes:
         - repo:/var/lib/ahriman
 
@@ -40,9 +40,7 @@ jobs:
       - run: pacman -Sy
 
       - name: Init repository
-        run: |
-          chown ahriman:ahriman /var/lib/ahriman
-          sudo -E -u ahriman -- entrypoint help
+        run: entrypoint help
 
       - name: Print configuration
         run: |

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Extract version
         id: version
-        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
 
       - name: Create changelog
         id: changelog
@@ -38,7 +38,7 @@ jobs:
       - name: Create archive
         run: tox -e archive
         env:
-          VERSION: ${{ steps.version.outputs.version }}
+          VERSION: ${{ steps.version.outputs.VERSION }}
 
       - name: Publish release
         uses: softprops/action-gh-release@v2

.github/workflows/setup.sh

@@ -12,7 +12,7 @@ pacman -Syyu --noconfirm
 # main dependencies
 pacman -S --noconfirm devtools git npm pyalpm python-bcrypt python-filelock python-inflection python-pyelftools python-requests python-systemd sudo
 # make dependencies
-pacman -S --noconfirm --asdeps base-devel python-build python-hatchling python-installer python-tox python-wheel
+pacman -S --noconfirm --asdeps base-devel python-build python-flit python-installer python-tox python-wheel
 # optional dependencies
 if [[ -z $MINIMAL_INSTALL ]]; then
     # web server
@@ -26,10 +26,10 @@ cp "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 # create fresh tarball
 tox -e archive
 # run makepkg
-PKGVER=$(PYTHONPATH=ahriman-core/src python -c "from ahriman import __version__; print(__version__)")
-mv "dist/ahriman-$PKGVER.tar.gz" archlinux
-chmod +777 archlinux  # because fuck you that's why
-cd archlinux
+PKGVER=$(python -c "from src.ahriman import __version__; print(__version__)")
+mv "dist/ahriman-$PKGVER.tar.gz" package/archlinux
+chmod +777 package/archlinux  # because fuck you that's why
+cd package/archlinux
 sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm
 sudo -u nobody -- makepkg --packagelist | grep "ahriman-core-$PKGVER" | pacman -U --noconfirm --nodeps -
 if [[ -z $MINIMAL_INSTALL ]]; then
@@ -44,7 +44,7 @@ pacman -Qdtq | pacman -Rscn --noconfirm -
 
 # initial setup command as root
 [[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
-sudo -u ahriman -- ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
+ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
 # enable services
 systemctl enable ahriman@x86_64-github.timer
 if [[ -z $MINIMAL_INSTALL ]]; then

.github/workflows/setup.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup the minimal service in arch linux container
-        run: .github/scripts/setup.sh minimal
+        run: .github/workflows/setup.sh minimal
 
   run-setup:
 
@@ -43,4 +43,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup the service in arch linux container
-        run: .github/scripts/setup.sh
+        run: .github/workflows/setup.sh

.gitignore

@@ -103,8 +103,5 @@ docs/html/
 # Frontend
 node_modules/
 package-lock.json
-ahriman-web/package/share/ahriman/templates/static/index.js
-ahriman-web/package/share/ahriman/templates/static/index.css
-
-# local configs
-/*.ini
+package/share/ahriman/templates/static/index.js
+package/share/ahriman/templates/static/index.css

.pytest.ini

@@ -0,0 +1,5 @@
+[pytest]
+addopts = --cov=ahriman --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=100 --spec
+asyncio_default_fixture_loop_scope = function
+asyncio_mode = auto
+spec_test_format = {result} {docstring_summary}

.pytest.toml

@@ -1,8 +0,0 @@
-[pytest]
-addopts = [
-    "--spec",
-]
-asyncio_default_fixture_loop_scope = "function"
-asyncio_mode = "auto"
-"resource-path.directory-name-test-resources" = "../../tests/testresources"
-spec_test_format = "{result} {docstring_summary}"

.readthedocs.yml

@@ -3,16 +3,13 @@ version: 2
 build:
   os: ubuntu-lts-latest
   tools:
-    python: "3.14"
+    python: "3.12"
   apt_packages:
     - graphviz
 
 python:
   install:
     - requirements: docs/requirements.txt
-    - path: ahriman-core
-    - path: ahriman-triggers
-    - path: ahriman-web
 
 formats:
   - pdf

CONTRIBUTING.md

@@ -247,19 +247,13 @@ tox -e docs
 
 Must be usually done if there are changes in modules structure.
 
-### Before making a new release
-
-1. Make sure that all pipelines are green.
-2. Make sure that documentation is up-to-date.
-3. Run [regress job](https://github.com/arcan1s/ahriman/actions/workflows/regress.yml). The successful link must be attached to release.
-
 ### Create release
 
 ```shell
 tox -m release -- major.minor.patch
 ```
 
-The command above will generate documentation, tags, etc., and will push them to GitHub. Other things will be handled by GitHub workflows automatically. As soon as related github action completes, there will be a new release created. Edit it to add additional information if needed.
+The command above will generate documentation, tags, etc., and will push them to GitHub. Other things will be handled by GitHub workflows automatically.
 
 ### Hotfixes policy
 

README.md

@@ -31,7 +31,7 @@ For installation details kindly refer to the [documentation](https://ahriman.rea
 
 Every available option is described in the [documentation](https://ahriman.readthedocs.io/en/stable/configuration.html).
 
-The application provides reasonable defaults which allow to use it out-of-box; however additional steps (like configuring build toolchain) are recommended and can be easily achieved by following install instructions.
+The application provides reasonable defaults which allow to use it out-of-box; however additional steps (like configuring build toolchain and sudoers) are recommended and can be easily achieved by following install instructions.
 
 ## [FAQ](https://ahriman.readthedocs.io/en/stable/faq/index.html)
 

ahriman-core/package/bin/ahriman-archbuild

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-usage() {
-    local cmd="${0##*/}"
-    echo "Usage: $cmd [options] -- [archbuild args]"
-    echo "    -r <repository>    Repository name"
-    echo "    -a <architecture>  Repository architecture"
-    echo "    -c <directory>     Read devtools pacman configurations from this directory"
-}
-
-repository=
-architecture=
-pacman_config_dir=
-
-while getopts ":r:a:c:" arg; do
-    case "$arg" in
-        r) repository="$OPTARG" ;;
-        a) architecture="$OPTARG" ;;
-        c) pacman_config_dir="$OPTARG" ;;
-        *) usage >&2; exit 1 ;;
-    esac
-done
-
-if [[ -z $repository || -z $architecture ]]; then
-    usage >&2
-    exit 1
-fi
-
-if [[ -n $pacman_config_dir && ! -d $pacman_config_dir ]]; then
-    echo "devtools configuration directory does not exist: $pacman_config_dir" >&2
-    exit 1
-fi
-
-source "/usr/share/devtools/lib/archroot.sh"
-check_root "SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,NPROC,MAKEFLAGS,PACKAGER,GNUPGHOME" "${BASH_SOURCE[0]}" "$@"
-
-# because devtools doesn't allow to read configuration from custom path
-# here is a workaround, which uses unshare to bind-mount directory with configuration files
-# for specific process
-if [[ -n $pacman_config_dir && -z ${AHRIMAN_ARCHBUILD_MOUNTED:-} ]]; then
-    pacman_config_dir="$(readlink -e -- "$pacman_config_dir")"
-    export AHRIMAN_ARCHBUILD_MOUNTED=1
-
-    exec unshare --mount --propagation private \
-        bash -c 'mount --bind -- "$0" /usr/share/devtools/pacman.conf.d && exec "$@"' \
-        "$pacman_config_dir" "${BASH_SOURCE[0]}" "$@"
-fi
-
-exec bash -c 'source "/usr/bin/archbuild" "$@"' \
-    "${repository}-${architecture}-build" "${@:$OPTIND}"

ahriman-core/pyproject.toml

@@ -1,65 +0,0 @@
-[build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
-
-[project]
-name = "ahriman-core"
-dependencies = [
-    "bcrypt",
-    "filelock",
-    "inflection",
-    "pyelftools",
-    "requests",
-]
-description = "ArcH linux ReposItory MANager, core package"
-dynamic = [
-    "version",
-]
-requires-python = ">=3.14"
-
-[project.optional-dependencies]
-journald = [
-    "systemd-python",
-]
-# FIXME technically this dependency is required, but in some cases we do not have access to
-# the libalpm which is required in order to install the package. Thus in case if we do not
-# really need to run the application we can move it to "optional" dependencies
-pacman = [
-    "pyalpm",
-]
-reports = [
-    "Jinja2",
-]
-s3 = [
-    "boto3",
-]
-shell = [
-    "IPython",
-]
-stats = [
-    "matplotlib",
-]
-unixsocket = [
-    "requests-unixsocket2",  # required by unix socket support
-]
-validator = [
-    "cerberus",
-]
-
-[project.scripts]
-ahriman = "ahriman.application.ahriman:run"
-
-[tool.hatch.build.targets.wheel]
-packages = [
-    "src/ahriman",
-]
-
-[tool.hatch.build.targets.wheel.shared-data]
-"package/bin" = "bin"
-"package/lib" = "lib"
-"package/share" = "share"
-
-[tool.hatch.version]
-path = "src/ahriman/__init__.py"

ahriman-core/src/ahriman/__init__.py

@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2021-2026 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-__version__ = "2.22.1"

ahriman-core/tests/ahriman/conftest.py

@@ -1,162 +0,0 @@
-import datetime
-import pytest
-
-from unittest.mock import MagicMock, PropertyMock
-
-from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote import AUR
-from ahriman.core.configuration import Configuration
-from ahriman.models.aur_package import AURPackage
-from ahriman.models.package import Package
-from ahriman.models.package_description import PackageDescription
-from ahriman.models.package_source import PackageSource
-from ahriman.models.pacman_synchronization import PacmanSynchronization
-from ahriman.models.remote_source import RemoteSource
-from ahriman.models.scan_paths import ScanPaths
-
-
-@pytest.fixture
-def aur_package_akonadi() -> AURPackage:
-    """
-    fixture for AUR package
-
-    Returns:
-        AURPackage: AUR package test instance
-    """
-    return AURPackage(
-        id=0,
-        name="akonadi",
-        package_base_id=0,
-        package_base="akonadi",
-        version="21.12.3-2",
-        description="PIM layer, which provides an asynchronous API to access all kind of PIM data",
-        num_votes=0,
-        popularity=0.0,
-        first_submitted=datetime.datetime.fromtimestamp(0, datetime.UTC),
-        last_modified=datetime.datetime.fromtimestamp(1646555990.610, datetime.UTC),
-        url_path="",
-        url="https://kontact.kde.org",
-        out_of_date=None,
-        maintainer="felixonmars",
-        repository="extra",
-        depends=[
-            "libakonadi",
-            "mariadb",
-        ],
-        make_depends=[
-            "boost",
-            "doxygen",
-            "extra-cmake-modules",
-            "kaccounts-integration",
-            "kitemmodels",
-            "postgresql",
-            "qt5-tools",
-        ],
-        opt_depends=[
-            "postgresql: PostgreSQL backend",
-        ],
-        conflicts=[],
-        provides=[],
-        license=["LGPL"],
-        keywords=[],
-        groups=[],
-    )
-
-
-@pytest.fixture
-def package_tpacpi_bat_git() -> Package:
-    """
-    git package fixture
-
-    Returns:
-        Package: git package test instance
-    """
-    return Package(
-        base="tpacpi-bat-git",
-        version="3.1.r12.g4959b52-1",
-        remote=RemoteSource(
-            source=PackageSource.AUR,
-            git_url=AUR.remote_git_url("tpacpi-bat-git", "aur"),
-            web_url=AUR.remote_web_url("tpacpi-bat-git"),
-            path=".",
-            branch="master",
-        ),
-        packages={"tpacpi-bat-git": PackageDescription()})
-
-
-@pytest.fixture
-def pacman(configuration: Configuration) -> Pacman:
-    """
-    fixture for pacman wrapper
-
-    Args:
-        configuration(Configuration): configuration fixture
-
-    Returns:
-        Pacman: pacman wrapper test instance
-    """
-    _, repository_id = configuration.check_loaded()
-    return Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.Disabled)
-
-
-@pytest.fixture
-def passwd() -> MagicMock:
-    """
-    get passwd structure for the user
-
-    Returns:
-        MagicMock: passwd structure test instance
-    """
-    passwd = MagicMock()
-    passwd.pw_dir = "home"
-    passwd.pw_name = "ahriman"
-    return passwd
-
-
-@pytest.fixture
-def pyalpm_package_ahriman(aur_package_ahriman: AURPackage) -> MagicMock:
-    """
-    mock object for pyalpm package
-
-    Args:
-        aur_package_ahriman(AURPackage): package fixture
-
-    Returns:
-        MagicMock: pyalpm package mock
-    """
-    mock = MagicMock()
-    db = type(mock).db = MagicMock()
-
-    type(mock).base = PropertyMock(return_value=aur_package_ahriman.package_base)
-    type(mock).builddate = PropertyMock(
-        return_value=aur_package_ahriman.last_modified.replace(tzinfo=datetime.timezone.utc).timestamp())
-    type(mock).conflicts = PropertyMock(return_value=aur_package_ahriman.conflicts)
-    type(db).name = PropertyMock(return_value="aur")
-    type(mock).depends = PropertyMock(return_value=aur_package_ahriman.depends)
-    type(mock).desc = PropertyMock(return_value=aur_package_ahriman.description)
-    type(mock).licenses = PropertyMock(return_value=aur_package_ahriman.license)
-    type(mock).makedepends = PropertyMock(return_value=aur_package_ahriman.make_depends)
-    type(mock).name = PropertyMock(return_value=aur_package_ahriman.name)
-    type(mock).optdepends = PropertyMock(return_value=aur_package_ahriman.opt_depends)
-    type(mock).checkdepends = PropertyMock(return_value=aur_package_ahriman.check_depends)
-    type(mock).packager = PropertyMock(return_value="packager")
-    type(mock).provides = PropertyMock(return_value=aur_package_ahriman.provides)
-    type(mock).version = PropertyMock(return_value=aur_package_ahriman.version)
-    type(mock).url = PropertyMock(return_value=aur_package_ahriman.url)
-    type(mock).groups = PropertyMock(return_value=aur_package_ahriman.groups)
-
-    return mock
-
-
-@pytest.fixture
-def scan_paths(configuration: Configuration) -> ScanPaths:
-    """
-    scan paths fixture
-
-    Args:
-        configuration(Configuration): configuration test instance
-
-    Returns:
-        ScanPaths: scan paths test instance
-    """
-    return ScanPaths(configuration.getlist("build", "scan_paths", fallback=[]))

ahriman-triggers/pyproject.toml

@@ -1,27 +0,0 @@
-[build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
-
-[project]
-name = "ahriman-triggers"
-dependencies = [
-    "ahriman-core",
-]
-description = "ArcH linux ReposItory MANager, additional extensions"
-dynamic = [
-    "version",
-]
-requires-python = ">=3.14"
-
-[tool.hatch.build.targets.wheel]
-packages = [
-    "src/ahriman",
-]
-
-[tool.hatch.build.targets.wheel.shared-data]
-"package/share" = "share"
-
-[tool.hatch.version]
-path = "../ahriman-core/src/ahriman/__init__.py"

ahriman-web/pyproject.toml

@@ -1,50 +0,0 @@
-[build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
-
-[project]
-name = "ahriman-web"
-dependencies = [
-    "ahriman-core",
-    "aiohttp",
-    "aiohttp_cors",
-    "aiohttp_jinja2",
-    "aiohttp_sse",
-]
-description = "ArcH linux ReposItory MANager, web server"
-dynamic = [
-    "version",
-]
-requires-python = ">=3.14"
-
-[project.optional-dependencies]
-auth = [
-    "aiohttp_session",
-    "aiohttp_security",
-    "cryptography",
-]
-docs = [
-    "aiohttp-apispec",
-    "setuptools",  # required by aiohttp-apispec
-]
-metrics = [
-    "aiohttp-openmetrics",
-]
-oauth2 = [
-    "ahriman-web[auth]",
-    "aioauth-client",
-]
-
-[tool.hatch.build.targets.wheel]
-packages = [
-    "src/ahriman",
-]
-
-[tool.hatch.build.targets.wheel.shared-data]
-"package/lib" = "lib"
-"package/share" = "share"
-
-[tool.hatch.version]
-path = "../ahriman-core/src/ahriman/__init__.py"

ahriman-web/src/ahriman/web/views/v2/status/__init__.py

@@ -1,19 +0,0 @@
-#
-# Copyright (c) 2021-2026 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#

ahriman-web/tests/ahriman/conftest.py

@@ -1,18 +0,0 @@
-import pytest
-
-from ahriman.core.auth import Auth
-from ahriman.core.configuration import Configuration
-
-
-@pytest.fixture
-def auth(configuration: Configuration) -> Auth:
-    """
-    auth provider fixture
-
-    Args:
-        configuration(Configuration): configuration fixture
-
-    Returns:
-        Auth: auth service instance
-    """
-    return Auth(configuration)

archlinux/sudoers.conf

@@ -1,2 +0,0 @@
-Defaults!/usr/bin/ahriman-archbuild env_keep += "SOURCE_DATE_EPOCH SRCDEST SRCPKGDEST PKGDEST LOGDEST NPROC MAKEFLAGS PACKAGER GNUPGHOME"
-ahriman ALL= NOPASSWD:NOSETENV: /usr/bin/ahriman-archbuild *

docker/01-docker.ini

@@ -1,2 +0,0 @@
-[web]
-host = $AHRIMAN_HOST

docker/Dockerfile

@@ -8,7 +8,7 @@ ARG BUILD_DATE
 RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build
 
 ## extract container creation date and set mirror for this timestamp, set PKGEXT and refresh database next
-RUN echo "Server = https://archive.archlinux.org/repos/${BUILD_DATE//-//}/\$repo/os/\$arch" > "/etc/pacman.d/mirrorlist" && \
+RUN echo "Server = https://archive.archlinux.org/repos/${BUILD_DATE//-/\/}/\$repo/os/\$arch" > "/etc/pacman.d/mirrorlist" && \
     pacman -Syyuu --noconfirm
 ## setup package cache
 RUN runuser -u build -- mkdir "/tmp/pkg" && \
@@ -35,7 +35,7 @@ RUN pacman -S --noconfirm --asdeps \
 RUN pacman -S --noconfirm --asdeps \
         base-devel \
         python-build \
-        python-hatchling \
+        python-flit \
         python-installer \
         python-setuptools \
         python-tox \
@@ -68,8 +68,8 @@ COPY --chown=build . "/home/build/ahriman"
 ## create package archive and install it
 RUN cd "/home/build/ahriman" && \
     tox -e archive && \
-    cp ./dist/*.tar.gz "archlinux" && \
-    cd "archlinux" && \
+    cp ./dist/*.tar.gz "package/archlinux" && \
+    cd "package/archlinux" && \
     runuser -u build -- makepkg --noconfirm --skipchecksums && \
     cd / && rm -r "/home/build/ahriman"
 
@@ -80,6 +80,7 @@ FROM archlinux:base AS ahriman
 # image configuration
 ENV AHRIMAN_ARCHITECTURE="x86_64"
 ENV AHRIMAN_DEBUG=""
+ENV AHRIMAN_FORCE_ROOT=""
 ENV AHRIMAN_HOST="0.0.0.0"
 ENV AHRIMAN_MULTILIB="yes"
 ENV AHRIMAN_OUTPUT=""
@@ -90,6 +91,7 @@ ENV AHRIMAN_POSTSETUP_COMMAND=""
 ENV AHRIMAN_PRESETUP_COMMAND=""
 ENV AHRIMAN_REPOSITORY="aur"
 ENV AHRIMAN_REPOSITORY_SERVER=""
+ENV AHRIMAN_REPOSITORY_ROOT="/var/lib/ahriman/ahriman"
 ENV AHRIMAN_UNIX_SOCKET=""
 ENV AHRIMAN_USER="ahriman"
 ENV AHRIMAN_VALIDATE_CONFIGURATION="yes"
@@ -133,15 +135,11 @@ RUN find "/var/cache/pacman/pkg" "/var/lib/pacman/sync" -type "f,l" -delete && \
 VOLUME ["/var/lib/ahriman"]
 
 # minimal runtime ahriman setup
-RUN systemd-machine-id-setup
-COPY "docker/01-docker.ini" "/etc/ahriman.ini.d/01-docker.ini"
 ## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
 COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 ## entrypoint setup
 COPY "docker/entrypoint.sh" "/usr/local/bin/entrypoint"
 COPY "docker/entrypoint-web.sh" "/usr/local/bin/entrypoint-web"
-
-USER ahriman
 ENTRYPOINT ["entrypoint"]
 # default command
 CMD ["repo-update", "--refresh"]

docker/entrypoint-web.sh

@@ -2,9 +2,4 @@
 # Special workaround for running web service in github actions, must not be usually used in real environment,
 # consider running web command explicitly instead
 
-if (( EUID == 0 )); then
-    chown ahriman:ahriman /var/lib/ahriman
-    exec sudo -E -u ahriman -- entrypoint web "$@"
-fi
-
-exec entrypoint web "$@"
+exec entrypoint web "$@"

docker/entrypoint.sh

@@ -3,15 +3,30 @@
 set -e
 [ -n "$AHRIMAN_DEBUG" ] && set -x
 
+# configuration tune
+cat <<EOF > "/etc/ahriman.ini.d/01-docker.ini"
+[repository]
+root = $AHRIMAN_REPOSITORY_ROOT
+
+[web]
+host = $AHRIMAN_HOST
+
+EOF
+
 AHRIMAN_DEFAULT_ARGS=("--architecture" "$AHRIMAN_ARCHITECTURE")
 AHRIMAN_DEFAULT_ARGS+=("--repository" "$AHRIMAN_REPOSITORY")
 if [ -n "$AHRIMAN_OUTPUT" ]; then
     AHRIMAN_DEFAULT_ARGS+=("--log-handler" "$AHRIMAN_OUTPUT")
 fi
 
+# create repository root inside the [[mounted]] directory and set correct ownership
+[ -d "$AHRIMAN_REPOSITORY_ROOT" ] || mkdir "$AHRIMAN_REPOSITORY_ROOT"
+chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_REPOSITORY_ROOT"
+
 # create .gnupg directory which is required for keys
 AHRIMAN_GNUPG_HOME="$(getent passwd "$AHRIMAN_USER" | cut -d : -f 6)/.gnupg"
 [ -d "$AHRIMAN_GNUPG_HOME" ] || mkdir -m700 "$AHRIMAN_GNUPG_HOME"
+chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_GNUPG_HOME"
 
 # run built-in setup command
 AHRIMAN_SETUP_ARGS=("--build-as-user" "$AHRIMAN_USER")
@@ -39,7 +54,19 @@ ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
 # validate configuration if set
 [ -n "$AHRIMAN_VALIDATE_CONFIGURATION" ] && ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-config-validate --exit-code
 
+# create machine-id which is required by build tools
+systemd-machine-id-setup &> /dev/null
+
 # special workaround to emulate /bin/bash entrypoint if first argument starts with /
 [[ "$1" =~ ^/.* ]] && exec "$@"
 
-exec ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" "$@"
+# if AHRIMAN_FORCE_ROOT is set or command is unsafe we can run without sudo
+# otherwise we prepend executable by sudo command
+if [ -n "$AHRIMAN_FORCE_ROOT" ]; then
+    AHRIMAN_EXECUTABLE=("ahriman")
+elif ahriman help-commands-unsafe -- "$@" &> /dev/null; then
+    AHRIMAN_EXECUTABLE=("sudo" "-E" "-u" "$AHRIMAN_USER" "--" "ahriman")
+else
+    AHRIMAN_EXECUTABLE=("ahriman")
+fi
+exec "${AHRIMAN_EXECUTABLE[@]}" "${AHRIMAN_DEFAULT_ARGS[@]}" "$@"

docs/ahriman.application.handlers.rst

@@ -1,15 +1,6 @@
 ahriman.application.handlers package
 ====================================
 
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   ahriman.application.handlers.triggers_support
-   ahriman.application.handlers.web
-
 Submodules
 ----------
 
@@ -277,6 +268,14 @@ ahriman.application.handlers.triggers module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.triggers\_support module
+-----------------------------------------------------
+
+.. automodule:: ahriman.application.handlers.triggers_support
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.unsafe\_commands module
 ----------------------------------------------------
 
@@ -317,6 +316,14 @@ ahriman.application.handlers.versions module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.web module
+---------------------------------------
+
+.. automodule:: ahriman.application.handlers.web
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.application.handlers.triggers_support.rst

@@ -1,21 +0,0 @@
-ahriman.application.handlers.triggers\_support package
-======================================================
-
-Submodules
-----------
-
-ahriman.application.handlers.triggers\_support.triggers\_support module
------------------------------------------------------------------------
-
-.. automodule:: ahriman.application.handlers.triggers_support.triggers_support
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.application.handlers.triggers_support
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/ahriman.application.handlers.web.rst

@@ -1,21 +0,0 @@
-ahriman.application.handlers.web package
-========================================
-
-Submodules
-----------
-
-ahriman.application.handlers.web.web module
--------------------------------------------
-
-.. automodule:: ahriman.application.handlers.web.web
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.application.handlers.web
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/architecture.rst

@@ -116,7 +116,7 @@ Filesystem tree
 
 The application supports two types of trees, one is for the legacy configuration (when there were no explicit repository name configuration available) and another one is the new-style tree. This document describes only new-style tree in order to avoid deprecated structures.
 
-Having default root as ``/var/lib/ahriman``, the directory structure is the following:
+Having default root as ``/var/lib/ahriman`` (differs from container though), the directory structure is the following:
 
 .. code-block::
 

docs/conf.py

@@ -11,6 +11,14 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import datetime
+import sys
+
+from pathlib import Path
+
+
+# support package imports
+basedir = Path(__file__).resolve().parent.parent / "src"
+sys.path.insert(0, str(basedir))
 
 
 # -- Project information -----------------------------------------------------

docs/configuration.rst

@@ -82,7 +82,7 @@ Base configuration settings.
 
 * ``apply_migrations`` - perform database migrations on the application start, boolean, optional, default ``yes``. Useful if you are using git version. Note, however, that this option must be changed only if you know what to do and going to handle migrations manually.
 * ``database`` - path to the application SQLite database, string, required.
-* ``include`` - path to directories with configuration files overrides, space separated list of strings, optional. Files will be read in alphabetical order.
+* ``include`` - path to directory with configuration files overrides, string, optional. Files will be read in alphabetical order.
 * ``logging`` - path to logging configuration, string, required. Check ``logging.ini`` for reference.
 
 ``alpm:*`` groups
@@ -131,15 +131,11 @@ Authorized users are stored inside internal database, if any of external provide
 Build related configuration. Group name can refer to architecture, e.g. ``build:x86_64`` can be used for x86_64 architecture specific settings.
 
 * ``archbuild_flags`` - additional flags passed to ``archbuild`` command, space separated list of strings, optional.
-* ``devtools_configs`` - path to devtools configuration directory, string, required.
-* ``devtools_wrapper`` - path to devtools wrapper, space separated list of strings, required.
+* ``build_command`` - default build command, string, required.
 * ``ignore_packages`` - list packages to ignore during a regular update (manual update will still work), space separated list of strings, optional.
 * ``include_debug_packages`` - distribute debug packages, boolean, optional, default ``yes``.
-* ``make_flags`` - additional flags passed to ``make`` command via environment variable, space separated list of strings, optional.
-* ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
 * ``makepkg_flags`` - additional flags passed to ``makepkg`` command, space separated list of strings, optional.
-* ``min_age`` - minimal age in seconds since the latest AUR package modification before automatic updates are allowed, integer, optional, default ``0``.
-* ``packager`` - default packager identifier in form ``Name Surname <mail@example.com>``, string, optional.
+* ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
 * ``scan_paths`` - paths to be used for implicit dependencies scan, space separated list of strings, optional. If any of those paths is matched against the path, it will be added to the allowed list.
 * ``triggers`` - list of ``ahriman.core.triggers.Trigger`` class implementation (e.g. ``ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger``) which will be loaded and run at the end of processing, space separated list of strings, optional. You can also specify triggers by their paths, e.g. ``/usr/lib/python3.10/site-packages/ahriman/core/report/report.py.ReportTrigger``. Triggers are run in the order of definition.
 * ``triggers_known`` - optional list of ``ahriman.core.triggers.Trigger`` class implementations which are not run automatically and used only for trigger discovery and configuration validation.

docs/faq/docker.rst

@@ -22,12 +22,6 @@ In order to make data available outside of container, you would need to mount lo
 
    docker run --privileged -v /path/to/local/repo:/var/lib/ahriman -v /path/to/overrides/overrides.ini:/etc/ahriman.ini.d/10-overrides.ini arcan1s/ahriman:latest
 
-The volume must have correct rights, e.g.:
-
-.. code-block:: shell
-
-   chown 643:643 /path/to/local/repo
-
 The action can be specified during run, e.g.:
 
 .. code-block:: shell
@@ -65,17 +59,19 @@ The following environment variables are supported:
 
 * ``AHRIMAN_ARCHITECTURE`` - architecture of the repository, default is ``x86_64``.
 * ``AHRIMAN_DEBUG`` - if set all commands will be logged to console.
+* ``AHRIMAN_FORCE_ROOT`` - force run ahriman as root instead of guessing by subcommand.
 * ``AHRIMAN_HOST`` - host for the web interface, default is ``0.0.0.0``.
 * ``AHRIMAN_MULTILIB`` - if set (default) multilib repository will be used, disabled otherwise.
 * ``AHRIMAN_OUTPUT`` - controls logging handler, e.g. ``syslog``, ``console``. The name must be found in logging configuration. Note that if ``syslog`` handler is used you will need to mount ``/dev/log`` inside container because it is not available there.
 * ``AHRIMAN_PACKAGER`` - packager name from which packages will be built, default is ``ahriman bot <ahriman@example.com>``.
 * ``AHRIMAN_PACMAN_MIRROR`` - override pacman mirror server if set.
 * ``AHRIMAN_PORT`` - HTTP server port if any, default is empty.
-* ``AHRIMAN_POSTSETUP_COMMAND`` - if set, the command which will be called after the setup command, but before any other actions.
-* ``AHRIMAN_PRESETUP_COMMAND`` - if set, the command which will be called right before the setup command.
+* ``AHRIMAN_POSTSETUP_COMMAND`` - if set, the command which will be called (as root) after the setup command, but before any other actions.
+* ``AHRIMAN_PRESETUP_COMMAND`` - if set, the command which will be called (as root) right before the setup command.
 * ``AHRIMAN_REPOSITORY`` - repository name, default is ``aur``.
 * ``AHRIMAN_REPOSITORY_SERVER`` - optional override for the repository URL. Useful if you would like to download packages from remote instead of local filesystem.
-* ``AHRIMAN_UNIX_SOCKET`` - full path to unix socket which is used by web server, default is empty. Note that more likely you would like to put it inside repository root directory (e.g. ``/var/lib/ahriman/ahriman-web.sock``) or to ``/run/ahriman``.
+* ``AHRIMAN_REPOSITORY_ROOT`` - repository root. Because of filesystem rights it is required to override default repository root. By default, it uses ``ahriman`` directory inside ahriman's home, which can be passed as mount volume.
+* ``AHRIMAN_UNIX_SOCKET`` - full path to unix socket which is used by web server, default is empty. Note that more likely you would like to put it inside ``AHRIMAN_REPOSITORY_ROOT`` directory (e.g. ``/var/lib/ahriman/ahriman/ahriman-web.sock``) or to ``/run/ahriman``.
 * ``AHRIMAN_USER`` - ahriman user, usually must not be overwritten, default is ``ahriman``.
 * ``AHRIMAN_VALIDATE_CONFIGURATION`` - if set (default) validate service configuration.
 
@@ -103,7 +99,7 @@ For that you would need to have web container instance running forever; it can b
 
 .. code-block:: shell
 
-   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
 Note about ``AHRIMAN_PORT`` environment variable which is required in order to enable web service. An additional port bind by ``-p 8080:8080`` is required to pass docker port outside of container.
 
@@ -113,7 +109,7 @@ If you are using ``AHRIMAN_UNIX_SOCKET`` variable, for every next container run
 
 .. code-block:: shell
 
-   docker run --privileged -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
 Otherwise, you would need to pass ``AHRIMAN_PORT`` and mount container network to the host system (``--net=host``), e.g.:
 
@@ -132,7 +128,7 @@ In order to create configuration for additional repositories, the ``AHRIMAN_POST
 
 .. code-block:: shell
 
-   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman-web.sock -e AHRIMAN_POSTSETUP_COMMAND="ahriman --architecture x86_64 --repository aur-v2 service-setup --build-as-user ahriman --packager 'ahriman bot <ahriman@example.com>'" -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -e AHRIMAN_POSTSETUP_COMMAND="ahriman --architecture x86_64 --repository aur-v2 service-setup --build-as-user ahriman --packager 'ahriman bot <ahriman@example.com>'" -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
 The command above will also create configuration for the repository named ``aur-v2``.
 

docs/faq/non-x86_64-setup.rst

@@ -55,13 +55,6 @@ There are two possible ways to achieve same setup, by using docker container. Th
 
       FROM arcan1s/ahriman:latest
 
-#.
-   Switch to ``root`` user:
-
-   .. code-block:: dockerfile
-
-      USER root
-
 #.
    Init pacman keys. This command is required in order to populate distribution keys:
 
@@ -85,16 +78,12 @@ There are two possible ways to achieve same setup, by using docker container. Th
 
       FROM arcan1s/ahriman:latest
 
-      USER root
-
       RUN pacman-key --init
 
       RUN pacman --noconfirm -Sy wget
       RUN wget https://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.2-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.2-any.pkg.tar.zst
       RUN wget https://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20230705-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20230705-1.0-any.pkg.tar.zst
 
-      USER ahriman
-
 #.
    After that you can build you own container, e.g.:
 

docs/migrations/2.22.0.rst

@@ -1,56 +0,0 @@
-To 2.22.0
----------
-
-This release stores newly generated configuration files in the repository root and changes the docker image to run as the ``ahriman`` user. Existing system-wide configuration files remain supported, so regular installations do not require manual intervention. Docker installations require data migration.
-
-Regular installation
-^^^^^^^^^^^^^^^^^^^^
-
-Newly generated ahriman and devtools configuration files are stored below ``/var/lib/ahriman/.config/ahriman`` instead of system-wide configuration directories. Existing configurations continue to work without any changes.
-
-However, it is recommended to migrate to the new configuration schema by doing the following steps:
-
-#.
-   Stop all ahriman services.
-
-#.
-   Remove the old generated configuration files. For example, for repository ``aur`` and architecture ``x86_64``:
-
-   .. code-block:: shell
-
-      sudo rm /etc/ahriman.ini.d/00-setup-overrides-x86_64-aur.ini
-      sudo rm /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
-
-   Repeat this step for every configured repository. Do not remove manually maintained configuration overrides.
-
-#.
-   Run setup command (i.e. ``ahriman service-setup``) again with the same arguments as used before as the ``ahriman`` user.
-
-#.
-   Start the services again.
-
-Docker installation
-^^^^^^^^^^^^^^^^^^^
-
-The repository root inside the Docker image has changed from ``/var/lib/ahriman/ahriman`` to ``/var/lib/ahriman``. Existing repository contents must therefore be moved one directory level up, and the volume must be owned by the ``ahriman`` user.
-
-#.
-   Stop all containers using the repository volume and create a backup.
-
-#.
-   Run a one-off container which mounts the existing volume. Replace ``VOLUME`` with the named volume or bind mount used by the installation:
-
-   .. code-block:: shell
-
-      docker run --rm --user root --entrypoint bash \
-          --volume VOLUME:/var/lib/ahriman \
-          arcan1s/ahriman:latest \
-          -c 'find /var/lib/ahriman/ahriman -mindepth 1 -maxdepth 1 -exec mv -t /var/lib/ahriman -- {} + && rmdir /var/lib/ahriman/ahriman && chown ahriman:ahriman /var/lib/ahriman'
-
-#.
-   Update custom configuration and container arguments which refer to ``/var/lib/ahriman/ahriman``. The new path is ``/var/lib/ahriman``.
-
-#.
-   Start the containers again.
-
-Please note, that some environment variables - ``AHRIMAN_FORCE_ROOT`` and ``AHRIMAN_REPOSITORY_ROOT`` - have been also removed and not supported anymore. ``AHRIMAN_POSTSETUP_COMMAND`` and ``AHRIMAN_PRESETUP_COMMAND`` are now executed as non-root user.

docs/migrations/index.rst

@@ -12,4 +12,3 @@ Upgrades to breakpoints
    2.9.0
    2.12.0
    2.16.0
-   2.22.0

docs/requirements.txt

@@ -1,19 +1,19 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --group pyproject.toml:docs --no-emit-package ahriman-core --no-emit-package ahriman-triggers --no-emit-package ahriman-web --output-file docs/requirements.txt pyproject.toml
+#    uv pip compile --group pyproject.toml:docs --extra s3 --extra validator --extra web --output-file docs/requirements.txt pyproject.toml
 aiohappyeyeballs==2.6.1
     # via aiohttp
 aiohttp==3.11.18
     # via
-    #   ahriman-web
+    #   ahriman (pyproject.toml)
     #   aiohttp-cors
     #   aiohttp-jinja2
     #   aiohttp-sse
 aiohttp-cors==0.8.1
-    # via ahriman-web
+    # via ahriman (pyproject.toml)
 aiohttp-jinja2==1.6
-    # via ahriman-web
+    # via ahriman (pyproject.toml)
 aiohttp-sse==2.2.0
-    # via ahriman-web
+    # via ahriman (pyproject.toml)
 aiosignal==1.3.2
     # via aiohttp
 alabaster==1.0.0
@@ -25,15 +25,15 @@ attrs==25.3.0
 babel==2.17.0
     # via sphinx
 bcrypt==4.3.0
-    # via ahriman-core
-boto3==1.43.47
-    # via ahriman-core
-botocore==1.43.47
+    # via ahriman (pyproject.toml)
+boto3==1.38.11
+    # via ahriman (pyproject.toml)
+botocore==1.38.11
     # via
     #   boto3
     #   s3transfer
-cerberus==1.3.8
-    # via ahriman-core
+cerberus==1.3.7
+    # via ahriman (pyproject.toml)
 certifi==2025.4.26
     # via requests
 charset-normalizer==3.4.2
@@ -44,7 +44,7 @@ docutils==0.21.2
     #   sphinx-argparse
     #   sphinx-rtd-theme
 filelock==3.24.0
-    # via ahriman-core
+    # via ahriman (pyproject.toml)
 frozenlist==1.6.0
     # via
     #   aiohttp
@@ -56,12 +56,12 @@ idna==3.10
 imagesize==1.4.1
     # via sphinx
 inflection==0.5.1
-    # via ahriman-core
+    # via ahriman (pyproject.toml)
 jinja2==3.1.6
     # via
     #   aiohttp-jinja2
     #   sphinx
-jmespath==1.1.0
+jmespath==1.0.1
     # via
     #   boto3
     #   botocore
@@ -80,18 +80,18 @@ propcache==0.3.1
 pydeps==3.0.1
     # via ahriman (pyproject.toml:docs)
 pyelftools==0.32
-    # via ahriman-core
+    # via ahriman (pyproject.toml)
 pygments==2.19.1
     # via sphinx
 python-dateutil==2.9.0.post0
     # via botocore
 requests==2.32.3
     # via
-    #   ahriman-core
+    #   ahriman (pyproject.toml)
     #   sphinx
 roman-numerals-py==3.1.0
     # via sphinx
-s3transfer==0.19.1
+s3transfer==0.12.0
     # via boto3
 shtab==1.7.2
     # via ahriman (pyproject.toml:docs)
@@ -131,8 +131,3 @@ urllib3==2.4.0
     #   requests
 yarl==1.20.0
     # via aiohttp
-
-# The following packages were excluded from the output:
-# ahriman-core
-# ahriman-triggers
-# ahriman-web

docs/setup.rst

@@ -10,32 +10,65 @@ Initial setup
 
    .. code-block:: shell
 
-      sudo -u ahriman -- ahriman -a x86_64 -r aur service-setup \
-          --packager "ahriman bot <ahriman@example.com>" ...
+      sudo ahriman -a x86_64 -r aur service-setup ...
 
    .. admonition:: Details
       :collapsible: closed
 
-      ``service-setup`` does the following steps:
+      ``service-setup`` literally does the following steps:
 
       #.
-         Create a repository-specific ahriman configuration below
-         ``/var/lib/ahriman/.config/ahriman/ahriman.ini.d``. This configuration stores the
-         packager identity, ``MAKEFLAGS`` and other options supplied on the command line.
+         Create ``/var/lib/ahriman/.makepkg.conf`` with ``makepkg.conf`` overrides if required (at least you might want to set ``PACKAGER``):
+
+         .. code-block:: shell
+
+            echo 'PACKAGER="ahriman bot <ahriman@example.com>"' | sudo -u ahriman tee -a /var/lib/ahriman/.makepkg.conf
 
       #.
-         Generate the devtools pacman configuration in
-         ``/var/lib/ahriman/.config/ahriman/pacman.conf.d``. The file is based on the
-         configuration selected by ``--from-configuration`` and contains the requested mirror,
-         multilib settings and the ahriman repository path.
+         Configure build tools (it is required for correct dependency management system):
 
       #.
-         Create the repository directories, initialize the package repository and synchronize
-         its pacman database.
+         Create build command (you can choose any name for command, basically it should be ``{name}-{arch}-build``):
 
-      Both configuration locations are below the repository root and must be writable by the
-      user running ahriman. Existing system-wide overrides remain supported; see
-      :doc:`the 2.22.0 migration guide <migrations/2.22.0>` when upgrading.
+         .. code-block:: shell
+
+            ln -s /usr/bin/archbuild /usr/local/bin/aur-x86_64-build
+
+      #. 
+         Create configuration file (same as previous ``{name}.conf``):
+
+         .. code-block:: shell
+
+            cp /usr/share/devtools/pacman.conf.d/{extra,aur}.conf
+
+      #. 
+         Change configuration file, add your own repository, add multilib repository etc:
+
+         .. code-block:: shell
+
+            echo '[multilib]' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+            echo 'Include = /etc/pacman.d/mirrorlist' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+
+            echo '[aur]' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+            echo 'SigLevel = Optional TrustAll' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+            echo 'Server = file:///var/lib/ahriman/repository/$repo/$arch' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+
+      #. 
+         Set ``build_command`` option to point to your command:
+
+         .. code-block:: shell
+
+            echo '[build]' | tee -a /etc/ahriman.ini.d/build.ini
+            echo 'build_command = aur-x86_64-build' | tee -a /etc/ahriman.ini.d/build.ini
+
+      #.
+         Configure ``/etc/sudoers.d/ahriman`` to allow running command without a password:
+
+         .. code-block:: shell
+
+            echo 'Cmnd_Alias CARCHBUILD_CMD = /usr/local/bin/aur-x86_64-build *' | tee -a /etc/sudoers.d/ahriman
+            echo 'ahriman ALL=(ALL) NOPASSWD:SETENV: CARCHBUILD_CMD' | tee -a /etc/sudoers.d/ahriman
+            chmod 400 /etc/sudoers.d/ahriman
 
    This command supports several arguments, kindly refer to its help message.
 
@@ -44,14 +77,14 @@ Initial setup
 
    .. code-block:: shell
 
-       sudo systemctl enable --now ahriman@x86_64-aur.timer
+       systemctl enable --now ahriman@x86_64-aur.timer
 
 #. 
    Start and enable status page:
 
    .. code-block:: shell
 
-       sudo systemctl enable --now ahriman-web
+       systemctl enable --now ahriman-web
 
 #. 
    Add packages by using ``ahriman package-add {package}`` command:

frontend/package.json

@@ -2,10 +2,10 @@
     "dependencies": {
         "@emotion/react": ">=11.14.0 <11.15.0",
         "@emotion/styled": ">=11.14.0 <11.15.0",
-        "@mui/icons-material": ">=9.3.0 <9.4.0",
-        "@mui/material": ">=9.3.0 <9.4.0",
-        "@mui/x-data-grid": ">=9.11.0 <9.12.0",
-        "@tanstack/react-query": ">=5.101.0 <5.102.0",
+        "@mui/icons-material": ">=7.3.0 <7.4.0",
+        "@mui/material": ">=7.3.0 <7.4.0",
+        "@mui/x-data-grid": ">=8.28.0 <8.29.0",
+        "@tanstack/react-query": ">=5.94.0 <5.95.0",
         "chart.js": ">=4.5.0 <4.6.0",
         "react": ">=19.2.0 <19.3.0",
         "react-chartjs-2": ">=5.3.0 <5.4.0",
@@ -22,14 +22,14 @@
         "@vitejs/plugin-react": ">=6.0.0 <6.1.0",
         "eslint": ">=9.39.0 <9.40.0",
         "eslint-plugin-react": ">=7.37.0 <7.38.0",
-        "eslint-plugin-react-hooks": ">=7.1.0 <7.2.0",
+        "eslint-plugin-react-hooks": ">=7.0.0 <7.1.0",
         "eslint-plugin-react-refresh": ">=0.5.0 <0.6.0",
-        "eslint-plugin-simple-import-sort": ">=14.0.0 <14.1.0",
-        "typescript": ">=6.0.0 <6.1.0",
-        "typescript-eslint": ">=8.67.0 <8.68.0",
-        "vite": ">=8.2.0 <8.3.0"
+        "eslint-plugin-simple-import-sort": ">=12.1.0 <12.2.0",
+        "typescript": ">=5.9.0 <5.10.0",
+        "typescript-eslint": ">=8.57.0 <8.58.0",
+        "vite": ">=8.0.0 <8.1.0"
     },
-    "name": "ahriman",
+    "name": "ahriman-frontend",
     "private": true,
     "scripts": {
         "build": "tsc && vite build",
@@ -39,5 +39,5 @@
         "preview": "vite preview"
     },
     "type": "module",
-    "version": "2.22.1"
+    "version": "2.20.0"
 }

frontend/src/App.tsx

@@ -31,6 +31,7 @@ const queryClient = new QueryClient({
     defaultOptions: {
         queries: {
             retry: 1,
+            staleTime: 30_000,
         },
     },
 });

frontend/src/components/dialogs/PackageInfoDialog.tsx

@@ -58,7 +58,11 @@ export default function PackageInfoDialog({
     const { showSuccess, showError } = useNotification();
     const queryClient = useQueryClient();
 
-    const localPackageBase = packageBase;
+    const [localPackageBase, setLocalPackageBase] = useState(packageBase);
+    if (packageBase !== null && packageBase !== localPackageBase) {
+        setLocalPackageBase(packageBase);
+    }
+
     const [activeTab, setActiveTab] = useState<TabKey>("logs");
     const [refreshDatabase, setRefreshDatabase] = useState(true);
 
@@ -153,42 +157,38 @@ export default function PackageInfoDialog({
 
         <DialogContent>
             {pkg &&
-                <PackageDetailsGrid dependencies={dependencies} pkg={pkg} />
-            }
-            {localPackageBase &&
-                <PackagePatchesList
-                    editable={isAuthorized}
-                    onDelete={key => void handleDeletePatch(key)}
-                    patches={patches}
-                />
-            }
-
-            {localPackageBase && currentRepository &&
                 <>
+                    <PackageDetailsGrid dependencies={dependencies} pkg={pkg} />
+                    <PackagePatchesList
+                        editable={isAuthorized}
+                        onDelete={key => void handleDeletePatch(key)}
+                        patches={patches}
+                    />
+
                     <Box sx={{ borderBottom: 1, borderColor: "divider", mt: 2 }}>
                         <Tabs onChange={(_, tab: TabKey) => setActiveTab(tab)} value={activeTab}>
                             {tabs.map(({ key, label }) => <Tab key={key} label={label} value={key} />)}
                         </Tabs>
                     </Box>
 
-                    {activeTab === "logs" &&
+                    {activeTab === "logs" && localPackageBase && currentRepository &&
                         <BuildLogsTab
                             packageBase={localPackageBase}
                             repository={currentRepository}
                         />
                     }
-                    {activeTab === "changes" &&
+                    {activeTab === "changes" && localPackageBase && currentRepository &&
                         <ChangesTab packageBase={localPackageBase} repository={currentRepository} />
                     }
-                    {activeTab === "pkgbuild" &&
+                    {activeTab === "pkgbuild" && localPackageBase && currentRepository &&
                         <PkgbuildTab packageBase={localPackageBase} repository={currentRepository} />
                     }
-                    {activeTab === "events" &&
+                    {activeTab === "events" && localPackageBase && currentRepository &&
                         <EventsTab packageBase={localPackageBase} repository={currentRepository} />
                     }
-                    {activeTab === "artifacts" &&
+                    {activeTab === "artifacts" && localPackageBase && currentRepository &&
                         <ArtifactsTab
-                            currentVersion={pkg?.version}
+                            currentVersion={pkg.version}
                             packageBase={localPackageBase}
                             repository={currentRepository}
                         />

frontend/src/components/package/ArtifactsTab.tsx

@@ -32,7 +32,7 @@ import { useCallback, useMemo } from "react";
 import { DETAIL_TABLE_PROPS } from "utils";
 
 interface ArtifactsTabProps {
-    currentVersion?: string;
+    currentVersion: string;
     packageBase: string;
     repository: RepositoryId;
 }
@@ -78,7 +78,6 @@ export default function ArtifactsTab({
             })).reverse();
         },
         queryKey: QueryKeys.artifacts(packageBase, repository),
-        refetchOnMount: "always",
     });
 
     const handleRollback = useCallback(async (version: string): Promise<void> => {
@@ -102,7 +101,7 @@ export default function ArtifactsTab({
                 <Tooltip title={params.row.version === currentVersion ? "Current version" : "Rollback to this version"}>
                     <span>
                         <IconButton
-                            disabled={currentVersion === params.row.version}
+                            disabled={params.row.version === currentVersion}
                             onClick={() => void handleRollback(params.row.version)}
                             size="small"
                         >

frontend/src/components/package/BuildLogsTab.tsx

@@ -61,7 +61,6 @@ export default function BuildLogsTab({
         enabled: !!packageBase,
         queryFn: () => client.fetch.fetchPackageLogs(packageBase, repository),
         queryKey: QueryKeys.logs(packageBase, repository),
-        refetchOnMount: "always",
     });
 
     // Build version selectors from all logs
@@ -117,7 +116,6 @@ export default function BuildLogsTab({
             )
             : skipToken,
         queryKey: QueryKeys.logsVersion(packageBase, repository, activeVersion?.version ?? "", activeVersion?.processId ?? ""),
-        refetchOnMount: "always",
     });
 
     // Derive displayed logs: prefer fresh polled data when available

frontend/src/components/package/EventsTab.tsx

@@ -54,7 +54,6 @@ export default function EventsTab({ packageBase, repository }: EventsTabProps):
         enabled: !!packageBase,
         queryFn: () => client.fetch.fetchPackageEvents(repository, packageBase, 30),
         queryKey: QueryKeys.events(repository, packageBase),
-        refetchOnMount: "always",
     });
 
     const rows = useMemo<EventRow[]>(() => events.map((event, index) => ({

frontend/src/components/package/PackageDetailsGrid.tsx

@@ -89,7 +89,7 @@ export default function PackageDetailsGrid({ dependencies, pkg }: PackageDetails
             <Grid size={{ md: 1, xs: 4 }}><Typography align="right" color="text.secondary" variant="body2">upstream</Typography></Grid>
             <Grid size={{ md: 5, xs: 8 }}>
                 {upstreamUrls.map(url =>
-                    <Link href={url} key={url} rel="noopener noreferrer" sx={{ display: "block" }} target="_blank" underline="hover" variant="body2">
+                    <Link display="block" href={url} key={url} rel="noopener noreferrer" target="_blank" underline="hover" variant="body2">
                         {url}
                     </Link>,
                 )}

frontend/src/hooks/useBuildLogStream.ts

@@ -17,10 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import type { QueryClient } from "@tanstack/react-query";
 import { useQueryClient } from "@tanstack/react-query";
 import { buildEventStreamUrl } from "hooks/useEventStream";
-import { useNotification } from "hooks/useNotification";
 import type { LogRecord } from "models/LogRecord";
 import type { RepositoryId } from "models/RepositoryId";
 import { useEffect } from "react";
@@ -36,38 +34,14 @@ function appendLogRecord(existing: LogRecord[] | undefined, record: LogRecord):
     return [...existing ?? [], record];
 }
 
-function invalidateLogs(queryClient: QueryClient, repository: RepositoryId, packageBase: string): void {
-    void queryClient.invalidateQueries({ queryKey: ["logs", repository.key, packageBase] });
-}
-
 export function useBuildLogStream(packageBase: string, repository: RepositoryId): void {
     const queryClient = useQueryClient();
-    const { showError } = useNotification();
 
     useEffect(() => {
         const source = new EventSource(buildEventStreamUrl(repository, ["build-log"], packageBase));
-        let needsRefresh = false;
-
-        source.addEventListener("error", () => {
-            needsRefresh = true;
-        });
-
-        source.addEventListener("open", () => {
-            if (needsRefresh) {
-                invalidateLogs(queryClient, repository, packageBase);
-                needsRefresh = false;
-            }
-        });
 
         source.addEventListener("build-log", (event: MessageEvent<string>) => {
-            let data: BuildLogEvent;
-            try {
-                data = JSON.parse(event.data) as BuildLogEvent;
-            } catch {
-                showError("Live updates failed", "Could not parse build log event; refreshing logs.");
-                invalidateLogs(queryClient, repository, packageBase);
-                return;
-            }
+            const data = JSON.parse(event.data) as BuildLogEvent;
 
             const record: LogRecord = {
                 created: data.created,
@@ -92,5 +66,5 @@ export function useBuildLogStream(packageBase: string, repository: RepositoryId)
         return () => {
             source.close();
         };
-    }, [queryClient, packageBase, repository, showError]);
+    }, [queryClient, packageBase, repository]);
 }

frontend/src/hooks/useEventStream.ts

@@ -18,7 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import type { QueryClient } from "@tanstack/react-query";
-import { useNotification } from "hooks/useNotification";
 import type { RepositoryId } from "models/RepositoryId";
 import { useEffect } from "react";
 
@@ -63,12 +62,6 @@ function invalidateForEvent(
     }
 }
 
-function invalidateRepository(queryClient: QueryClient, repositoryKey: string): void {
-    void queryClient.invalidateQueries({ queryKey: ["packages", repositoryKey] });
-    void queryClient.invalidateQueries({ queryKey: ["status", repositoryKey] });
-    void queryClient.invalidateQueries({ queryKey: ["events", repositoryKey] });
-}
-
 export function buildEventStreamUrl(
     repository: RepositoryId,
     events?: readonly string[],
@@ -87,41 +80,22 @@ export function buildEventStreamUrl(
 }
 
 export function useEventStream(queryClient: QueryClient, repository: RepositoryId | null): void {
-    const { showError } = useNotification();
-
     useEffect(() => {
         if (!repository) {
             return;
         }
 
         const source = new EventSource(buildEventStreamUrl(repository, GLOBAL_EVENT_TYPES));
-        let needsRefresh = false;
-
-        source.addEventListener("error", () => {
-            needsRefresh = true;
-        });
-
-        source.addEventListener("open", () => {
-            if (needsRefresh) {
-                invalidateRepository(queryClient, repository.key);
-                needsRefresh = false;
-            }
-        });
 
         for (const eventType of GLOBAL_EVENT_TYPES) {
             source.addEventListener(eventType, (event: MessageEvent<string>) => {
-                try {
-                    const data = JSON.parse(event.data) as { object_id?: string };
-                    invalidateForEvent(queryClient, repository.key, eventType, data.object_id ?? undefined);
-                } catch {
-                    showError("Live updates failed", "Could not parse server event; refreshing data.");
-                    invalidateRepository(queryClient, repository.key);
-                }
+                const data = JSON.parse(event.data) as { object_id?: string };
+                invalidateForEvent(queryClient, repository.key, eventType, data.object_id ?? undefined);
             });
         }
 
         return () => {
             source.close();
         };
-    }, [queryClient, repository, showError]);
+    }, [queryClient, repository]);
 }

frontend/src/hooks/usePackageChanges.ts

@@ -30,7 +30,6 @@ export function usePackageChanges(packageBase: string, repository: RepositoryId)
         enabled: !!packageBase,
         queryFn: () => client.fetch.fetchPackageChanges(packageBase, repository),
         queryKey: QueryKeys.changes(packageBase, repository),
-        refetchOnMount: "always",
     });
 
     return data;

frontend/tsconfig.json

@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "allowImportingTsExtensions": true,
+        "baseUrl": "src",
         "isolatedModules": true,
         "jsx": "react-jsx",
         "lib": ["ESNext", "DOM", "DOM.Iterable"],
@@ -11,17 +12,6 @@
         "noImplicitOverride": true,
         "noUnusedLocals": true,
         "noUnusedParameters": true,
-        "paths": {
-            "App": ["./src/App.tsx"],
-            "api/*": ["./src/api/*"],
-            "chartSetup": ["./src/chartSetup.ts"],
-            "components/*": ["./src/components/*"],
-            "contexts/*": ["./src/contexts/*"],
-            "hooks/*": ["./src/hooks/*"],
-            "models/*": ["./src/models/*"],
-            "theme/*": ["./src/theme/*"],
-            "utils": ["./src/utils.ts"]
-        },
         "resolveJsonModule": true,
         "skipLibCheck": true,
         "strict": true,

frontend/vite.config.ts

@@ -19,7 +19,7 @@ export default defineConfig({
     build: {
         chunkSizeWarningLimit: 10000,
         emptyOutDir: false,
-        outDir: path.resolve(import.meta.dirname, "../ahriman-web/package/share/ahriman/templates"),
+        outDir: path.resolve(__dirname, "../package/share/ahriman/templates"),
         rolldownOptions: {
             output: {
                 assetFileNames: "static/[name].[ext]",

package/archlinux/PKGBUILD

@@ -2,18 +2,17 @@
 
 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.22.1
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
 url="https://ahriman.readthedocs.io/"
 license=('GPL-3.0-or-later')
 depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-bcrypt' 'python-filelock' 'python-inflection' 'python-pyelftools' 'python-requests')
-makedepends=('npm' 'python-build' 'python-hatchling' 'python-installer' 'python-wheel')
+makedepends=('npm' 'python-build' 'python-flit' 'python-installer' 'python-wheel')
 source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgbase-$pkgver.tar.gz"
         "$pkgbase.sysusers"
-        "$pkgbase.tmpfiles"
-        "sudoers.conf")
+        "$pkgbase.tmpfiles")
 
 build() {
     cd "$pkgbase-$pkgver"
@@ -21,9 +20,7 @@ build() {
     npm --prefix "frontend" install --cache "$srcdir/npm-cache"
     npm --prefix "frontend" run build
 
-    python -m build --wheel --no-isolation "ahriman-core"
-    python -m build --wheel --no-isolation "ahriman-triggers"
-    python -m build --wheel --no-isolation "ahriman-web"
+    python -m build --wheel --no-isolation
 }
 
 package_ahriman() {
@@ -51,7 +48,8 @@ package_ahriman-core() {
 
     cd "$pkgbase-$pkgver"
 
-    python -m installer --destdir="$pkgdir" "$pkgname/dist/ahriman_core-$pkgver-py3-none-any.whl"
+    python -m installer --destdir="$pkgdir" "dist/$pkgbase-$pkgver-py3-none-any.whl"
+    python subpackages.py "$pkgdir" "$pkgname"
 
     # keep usr/share configs as reference and copy them to /etc
     install -Dm644 "$pkgdir/usr/share/$pkgbase/settings/ahriman.ini" "$pkgdir/etc/ahriman.ini"
@@ -60,8 +58,6 @@ package_ahriman-core() {
 
     install -Dm644 "$srcdir/$pkgbase.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
     install -Dm644 "$srcdir/$pkgbase.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf"
-
-    install -Dm440 "$srcdir/sudoers.conf" "$pkgdir/etc/sudoers.d/$pkgname"
 }
 
 package_ahriman-triggers() {
@@ -72,7 +68,8 @@ package_ahriman-triggers() {
 
     cd "$pkgbase-$pkgver"
 
-    python -m installer --destdir="$pkgdir" "$pkgname/dist/ahriman_triggers-$pkgver-py3-none-any.whl"
+    python -m installer --destdir="$pkgdir" "dist/$pkgbase-$pkgver-py3-none-any.whl"
+    python subpackages.py "$pkgdir" "$pkgname"
 
     install -Dm644 "$pkgdir/usr/share/$pkgbase/settings/ahriman.ini.d/00-triggers.ini" "$pkgdir/etc/ahriman.ini.d/00-triggers.ini"
 }
@@ -91,7 +88,8 @@ package_ahriman-web() {
 
     cd "$pkgbase-$pkgver"
 
-    python -m installer --destdir="$pkgdir" "$pkgname/dist/ahriman_web-$pkgver-py3-none-any.whl"
+    python -m installer --destdir="$pkgdir" "dist/$pkgbase-$pkgver-py3-none-any.whl"
+    python subpackages.py "$pkgdir" "$pkgname"
 
     install -Dm644 "$pkgdir/usr/share/$pkgbase/settings/ahriman.ini.d/00-web.ini" "$pkgdir/etc/ahriman.ini.d/00-web.ini"
 }

package/share/ahriman/settings/ahriman.ini

@@ -1,7 +1,6 @@
 [settings]
 ; Relative path to directory with configuration files overrides. Overrides will be applied in alphabetic order.
-include[] = ahriman.ini.d
-include[] = ${repository:root}/.config/ahriman/ahriman.ini.d
+include = ahriman.ini.d
 ; Relative path to configuration used by logging package.
 logging = ahriman.ini.d/logging.ini
 ; Perform database migrations on the application start. Do not touch this option unless you know what you are doing.
@@ -35,24 +34,16 @@ retry_backoff = 1.0
 [build]
 ; List of additional flags passed to archbuild command.
 ;archbuild_flags =
-; Path to local directory with devtools configuration files, which will be bind-mounted for devtools.
-devtools_configs = ${repository:root}/.config/ahriman/pacman.conf.d
 ; Path to build command.
-devtools_wrapper = ahriman-archbuild
+;build_command =
 ; List of packages to be ignored during automatic updates.
 ;ignore_packages =
 ; Include debug packages.
 ;include_debug_packages = yes
-; List of additional flags passed to make via environment variable via makepkg command.
-;make_flags =
 ; List of additional flags passed to makechrootpkg command.
 ;makechrootpkg_flags =
 ; List of additional flags passed to makepkg command.
 makepkg_flags = --nocolor --ignorearch
-; Minimal age in seconds since the latest AUR package modification before automatic updates are allowed.
-;min_age = 0
-; Default packager identifier to be used for package builds
-;packager =
 ; List of paths to be used for implicit dependency scan. Regular expressions are supported.
 scan_paths = ^usr/lib(?!/cmake).*$
 ; List of enabled triggers in the order of calls.

package/share/bash-completion/completions/_ahriman

@@ -1,129 +1,134 @@
-# AUTOMATICALLY GENERATED by https://github.com/tqdm/shtab
+# AUTOMATICALLY GENERATED by `shtab`
 
-_shtab_ahriman_subparsers=(add aur-search check clean config config-validate copy daemon help help-commands-unsafe help-updates help-version init key-import package-add package-archives package-changes package-changes-remove package-copy package-hold package-pkgbuild package-pkgbuild-remove package-remove package-rollback package-status package-status-remove package-status-update package-unhold package-update patch-add patch-list patch-remove patch-set-add rebuild remove remove-unknown repo-backup repo-check repo-clean repo-config repo-config-validate repo-create-keyring repo-create-mirrorlist repo-daemon repo-init repo-rebuild repo-remove-unknown repo-report repo-restore repo-setup repo-sign repo-statistics repo-status-update repo-sync repo-tree repo-triggers repo-update report run search service-clean service-config service-config-validate service-key-import service-repositories service-run service-setup service-shell service-tree-migrate setup shell sign status status-update sync update user-add user-list user-remove version web web-reload)
+_shtab_ahriman_subparsers=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-changes' 'package-changes-remove' 'package-copy' 'package-remove' 'package-status' 'package-status-remove' 'package-status-update' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')
 
-_shtab_ahriman_add_option_strings=(-h --help --changes --no-changes --dependencies --no-dependencies -e --exit-code --increment --no-increment -n --now -s --source -u --username -v --variable -y --refresh)
-_shtab_ahriman_aur_search_option_strings=(-h --help -e --exit-code --info --no-info --sort-by)
-_shtab_ahriman_check_option_strings=(-h --help --changes --no-changes --check-files --no-check-files -e --exit-code --vcs --no-vcs -y --refresh)
-_shtab_ahriman_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
-_shtab_ahriman_config_option_strings=(-h --help --info --no-info --secure --no-secure)
-_shtab_ahriman_config_validate_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_copy_option_strings=(-h --help -e --exit-code --remove)
-_shtab_ahriman_daemon_option_strings=(-h --help -i --interval --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run --increment --no-increment --local --no-local --manual --no-manual --partitions --no-partitions -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_help_option_strings=(-h --help)
-_shtab_ahriman_help_commands_unsafe_option_strings=(-h --help)
-_shtab_ahriman_help_updates_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_help_version_option_strings=(-h --help)
-_shtab_ahriman_init_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_key_import_option_strings=(-h --help --key-server)
-_shtab_ahriman_package_add_option_strings=(-h --help --changes --no-changes --dependencies --no-dependencies -e --exit-code --increment --no-increment -n --now -s --source -u --username -v --variable -y --refresh)
-_shtab_ahriman_package_archives_option_strings=(-h --help -e --exit-code --info --no-info)
-_shtab_ahriman_package_changes_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_package_changes_remove_option_strings=(-h --help)
-_shtab_ahriman_package_copy_option_strings=(-h --help -e --exit-code --remove)
-_shtab_ahriman_package_hold_option_strings=(-h --help)
-_shtab_ahriman_package_pkgbuild_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_package_pkgbuild_remove_option_strings=(-h --help)
-_shtab_ahriman_package_remove_option_strings=(-h --help)
-_shtab_ahriman_package_rollback_option_strings=(-h --help --hold --no-hold -u --username)
-_shtab_ahriman_package_status_option_strings=(-h --help --ahriman -e --exit-code --info --no-info -s --status)
-_shtab_ahriman_package_status_remove_option_strings=(-h --help)
-_shtab_ahriman_package_status_update_option_strings=(-h --help -s --status)
-_shtab_ahriman_package_unhold_option_strings=(-h --help)
-_shtab_ahriman_package_update_option_strings=(-h --help --changes --no-changes --dependencies --no-dependencies -e --exit-code --increment --no-increment -n --now -s --source -u --username -v --variable -y --refresh)
-_shtab_ahriman_patch_add_option_strings=(-h --help)
-_shtab_ahriman_patch_list_option_strings=(-h --help -e --exit-code -v --variable)
-_shtab_ahriman_patch_remove_option_strings=(-h --help -v --variable)
-_shtab_ahriman_patch_set_add_option_strings=(-h --help -t --track)
-_shtab_ahriman_rebuild_option_strings=(-h --help --depends-on --dry-run --from-database --increment --no-increment -e --exit-code -s --status -u --username)
-_shtab_ahriman_remove_option_strings=(-h --help)
-_shtab_ahriman_remove_unknown_option_strings=(-h --help --dry-run)
-_shtab_ahriman_repo_backup_option_strings=(-h --help)
-_shtab_ahriman_repo_check_option_strings=(-h --help --changes --no-changes --check-files --no-check-files -e --exit-code --vcs --no-vcs -y --refresh)
-_shtab_ahriman_repo_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
-_shtab_ahriman_repo_config_option_strings=(-h --help --info --no-info --secure --no-secure)
-_shtab_ahriman_repo_config_validate_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_repo_create_keyring_option_strings=(-h --help)
-_shtab_ahriman_repo_create_mirrorlist_option_strings=(-h --help)
-_shtab_ahriman_repo_daemon_option_strings=(-h --help -i --interval --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run --increment --no-increment --local --no-local --manual --no-manual --partitions --no-partitions -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_repo_init_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_repo_rebuild_option_strings=(-h --help --depends-on --dry-run --from-database --increment --no-increment -e --exit-code -s --status -u --username)
-_shtab_ahriman_repo_remove_unknown_option_strings=(-h --help --dry-run)
-_shtab_ahriman_repo_report_option_strings=(-h --help)
-_shtab_ahriman_repo_restore_option_strings=(-h --help -o --output)
-_shtab_ahriman_repo_setup_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_repo_sign_option_strings=(-h --help)
-_shtab_ahriman_repo_statistics_option_strings=(-h --help --chart -e --event --from-date --limit --offset --to-date)
-_shtab_ahriman_repo_status_update_option_strings=(-h --help -s --status)
-_shtab_ahriman_repo_sync_option_strings=(-h --help)
-_shtab_ahriman_repo_tree_option_strings=(-h --help -p --partitions)
-_shtab_ahriman_repo_triggers_option_strings=(-h --help)
-_shtab_ahriman_repo_update_option_strings=(-h --help --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run -e --exit-code --increment --no-increment --local --no-local --manual --no-manual -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_report_option_strings=(-h --help)
-_shtab_ahriman_run_option_strings=(-h --help)
-_shtab_ahriman_search_option_strings=(-h --help -e --exit-code --info --no-info --sort-by)
-_shtab_ahriman_service_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
-_shtab_ahriman_service_config_option_strings=(-h --help --info --no-info --secure --no-secure)
-_shtab_ahriman_service_config_validate_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_service_key_import_option_strings=(-h --help --key-server)
-_shtab_ahriman_service_repositories_option_strings=(-h --help --id-only --no-id-only)
-_shtab_ahriman_service_run_option_strings=(-h --help)
-_shtab_ahriman_service_setup_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_service_shell_option_strings=(-h --help -o --output)
-_shtab_ahriman_service_tree_migrate_option_strings=(-h --help)
-_shtab_ahriman_setup_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_shell_option_strings=(-h --help -o --output)
-_shtab_ahriman_sign_option_strings=(-h --help)
-_shtab_ahriman_status_option_strings=(-h --help --ahriman -e --exit-code --info --no-info -s --status)
-_shtab_ahriman_status_update_option_strings=(-h --help -s --status)
-_shtab_ahriman_sync_option_strings=(-h --help)
-_shtab_ahriman_update_option_strings=(-h --help --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run -e --exit-code --increment --no-increment --local --no-local --manual --no-manual -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_user_add_option_strings=(-h --help --key --packager -p --password -R --role)
-_shtab_ahriman_user_list_option_strings=(-h --help -e --exit-code -R --role)
-_shtab_ahriman_user_remove_option_strings=(-h --help)
-_shtab_ahriman_version_option_strings=(-h --help)
-_shtab_ahriman_web_option_strings=(-h --help)
-_shtab_ahriman_web_reload_option_strings=(-h --help)
-_shtab_ahriman_option_strings=(-h --help -a --architecture -c --configuration --force -l --lock --log-handler -q --quiet --report --no-report -r --repository --unsafe -V --version --wait-timeout)
+_shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--log-handler' '-q' '--quiet' '--report' '--no-report' '-r' '--repository' '--unsafe' '-V' '--version' '--wait-timeout')
+_shtab_ahriman_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
+_shtab_ahriman_aur_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
+_shtab_ahriman_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
+_shtab_ahriman_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '--partitions' '--no-partitions' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_help_option_strings=('-h' '--help')
+_shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help')
+_shtab_ahriman_help_updates_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_help_version_option_strings=('-h' '--help')
+_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_package_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
+_shtab_ahriman_package_changes_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_package_changes_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
+_shtab_ahriman_package_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_package_status_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_package_update_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
+_shtab_ahriman_patch_add_option_strings=('-h' '--help')
+_shtab_ahriman_patch_list_option_strings=('-h' '--help' '-e' '--exit-code' '-v' '--variable')
+_shtab_ahriman_patch_remove_option_strings=('-h' '--help' '-v' '--variable')
+_shtab_ahriman_patch_set_add_option_strings=('-h' '--help' '-t' '--track')
+_shtab_ahriman_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
+_shtab_ahriman_remove_option_strings=('-h' '--help')
+_shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_repo_backup_option_strings=('-h' '--help')
+_shtab_ahriman_repo_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_repo_create_keyring_option_strings=('-h' '--help')
+_shtab_ahriman_repo_create_mirrorlist_option_strings=('-h' '--help')
+_shtab_ahriman_repo_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '--partitions' '--no-partitions' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
+_shtab_ahriman_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_repo_report_option_strings=('-h' '--help')
+_shtab_ahriman_repo_restore_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_sign_option_strings=('-h' '--help')
+_shtab_ahriman_repo_statistics_option_strings=('-h' '--help' '--chart' '-e' '--event' '--from-date' '--limit' '--offset' '--to-date')
+_shtab_ahriman_repo_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_repo_sync_option_strings=('-h' '--help')
+_shtab_ahriman_repo_tree_option_strings=('-h' '--help' '-p' '--partitions')
+_shtab_ahriman_repo_triggers_option_strings=('-h' '--help')
+_shtab_ahriman_repo_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_report_option_strings=('-h' '--help')
+_shtab_ahriman_run_option_strings=('-h' '--help')
+_shtab_ahriman_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
+_shtab_ahriman_service_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_service_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_service_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_service_repositories_option_strings=('-h' '--help' '--id-only' '--no-id-only')
+_shtab_ahriman_service_run_option_strings=('-h' '--help')
+_shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_service_shell_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_service_tree_migrate_option_strings=('-h' '--help')
+_shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_shell_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_sign_option_strings=('-h' '--help')
+_shtab_ahriman_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_sync_option_strings=('-h' '--help')
+_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_user_add_option_strings=('-h' '--help' '--key' '--packager' '-p' '--password' '-R' '--role')
+_shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-R' '--role')
+_shtab_ahriman_user_remove_option_strings=('-h' '--help')
+_shtab_ahriman_version_option_strings=('-h' '--help')
+_shtab_ahriman_web_option_strings=('-h' '--help')
+_shtab_ahriman_web_reload_option_strings=('-h' '--help')
 
 
 
-_shtab_ahriman_add__s_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_add___source_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_aur_search___sort_by_choices=(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)
-_shtab_ahriman_init___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_package_add__s_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_package_add___source_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_package_status__s_choices=(unknown pending building failed success)
-_shtab_ahriman_package_status___status_choices=(unknown pending building failed success)
-_shtab_ahriman_package_status_update__s_choices=(unknown pending building failed success)
-_shtab_ahriman_package_status_update___status_choices=(unknown pending building failed success)
-_shtab_ahriman_package_update__s_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_package_update___source_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_rebuild__s_choices=(unknown pending building failed success)
-_shtab_ahriman_rebuild___status_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_init___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_repo_rebuild__s_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_rebuild___status_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_setup___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_repo_statistics__e_choices=(build-log package-held package-outdated package-removed package-status-changed package-update-failed package-updated service-status-changed)
-_shtab_ahriman_repo_statistics___event_choices=(build-log package-held package-outdated package-removed package-status-changed package-update-failed package-updated service-status-changed)
-_shtab_ahriman_repo_status_update__s_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_status_update___status_choices=(unknown pending building failed success)
-_shtab_ahriman_search___sort_by_choices=(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)
-_shtab_ahriman_service_setup___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_setup___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_status__s_choices=(unknown pending building failed success)
-_shtab_ahriman_status___status_choices=(unknown pending building failed success)
-_shtab_ahriman_status_update__s_choices=(unknown pending building failed success)
-_shtab_ahriman_status_update___status_choices=(unknown pending building failed success)
-_shtab_ahriman_user_add__R_choices=(unauthorized read reporter full)
-_shtab_ahriman_user_add___role_choices=(unauthorized read reporter full)
-_shtab_ahriman_user_list__R_choices=(unauthorized read reporter full)
-_shtab_ahriman_user_list___role_choices=(unauthorized read reporter full)
-_shtab_ahriman_pos_0_choices=(add aur-search check clean config config-validate copy daemon help help-commands-unsafe help-updates help-version init key-import package-add package-archives package-changes package-changes-remove package-copy package-hold package-pkgbuild package-pkgbuild-remove package-remove package-rollback package-status package-status-remove package-status-update package-unhold package-update patch-add patch-list patch-remove patch-set-add rebuild remove remove-unknown repo-backup repo-check repo-clean repo-config repo-config-validate repo-create-keyring repo-create-mirrorlist repo-daemon repo-init repo-rebuild repo-remove-unknown repo-report repo-restore repo-setup repo-sign repo-statistics repo-status-update repo-sync repo-tree repo-triggers repo-update report run search service-clean service-config service-config-validate service-key-import service-repositories service-run service-setup service-shell service-tree-migrate setup shell sign status status-update sync update user-add user-list user-remove version web web-reload)
-_shtab_ahriman___log_handler_choices=(console syslog journald)
+_shtab_ahriman_pos_0_choices=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-changes' 'package-changes-remove' 'package-copy' 'package-remove' 'package-status' 'package-status-remove' 'package-status-update' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')
+_shtab_ahriman___log_handler_choices=('console' 'syslog' 'journald')
+_shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_aur_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
+_shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_package_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_update__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_update___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_statistics__e_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
+_shtab_ahriman_repo_statistics___event_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
+_shtab_ahriman_repo_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
+_shtab_ahriman_service_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_user_add__R_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_add___role_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_list__R_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_list___role_choices=('unauthorized' 'read' 'reporter' 'full')
 
+_shtab_ahriman_pos_0_nargs=A...
+_shtab_ahriman__h_nargs=0
+_shtab_ahriman___help_nargs=0
+_shtab_ahriman___force_nargs=0
+_shtab_ahriman__q_nargs=0
+_shtab_ahriman___quiet_nargs=0
+_shtab_ahriman___report_nargs=0
+_shtab_ahriman___no_report_nargs=0
+_shtab_ahriman___unsafe_nargs=0
+_shtab_ahriman__V_nargs=0
+_shtab_ahriman___version_nargs=0
 _shtab_ahriman_add_pos_0_nargs=+
 _shtab_ahriman_add__h_nargs=0
 _shtab_ahriman_add___help_nargs=0
@@ -146,7 +151,7 @@ _shtab_ahriman_aur_search__e_nargs=0
 _shtab_ahriman_aur_search___exit_code_nargs=0
 _shtab_ahriman_aur_search___info_nargs=0
 _shtab_ahriman_aur_search___no_info_nargs=0
-_shtab_ahriman_check_pos_0_nargs='*'
+_shtab_ahriman_check_pos_0_nargs=*
 _shtab_ahriman_check__h_nargs=0
 _shtab_ahriman_check___help_nargs=0
 _shtab_ahriman_check___changes_nargs=0
@@ -212,7 +217,7 @@ _shtab_ahriman_daemon__y_nargs=0
 _shtab_ahriman_daemon___refresh_nargs=0
 _shtab_ahriman_help__h_nargs=0
 _shtab_ahriman_help___help_nargs=0
-_shtab_ahriman_help_commands_unsafe_pos_0_nargs='*'
+_shtab_ahriman_help_commands_unsafe_pos_0_nargs=*
 _shtab_ahriman_help_commands_unsafe__h_nargs=0
 _shtab_ahriman_help_commands_unsafe___help_nargs=0
 _shtab_ahriman_help_updates__h_nargs=0
@@ -246,12 +251,6 @@ _shtab_ahriman_package_add__n_nargs=0
 _shtab_ahriman_package_add___now_nargs=0
 _shtab_ahriman_package_add__y_nargs=0
 _shtab_ahriman_package_add___refresh_nargs=0
-_shtab_ahriman_package_archives__h_nargs=0
-_shtab_ahriman_package_archives___help_nargs=0
-_shtab_ahriman_package_archives__e_nargs=0
-_shtab_ahriman_package_archives___exit_code_nargs=0
-_shtab_ahriman_package_archives___info_nargs=0
-_shtab_ahriman_package_archives___no_info_nargs=0
 _shtab_ahriman_package_changes__h_nargs=0
 _shtab_ahriman_package_changes___help_nargs=0
 _shtab_ahriman_package_changes__e_nargs=0
@@ -264,23 +263,10 @@ _shtab_ahriman_package_copy___help_nargs=0
 _shtab_ahriman_package_copy__e_nargs=0
 _shtab_ahriman_package_copy___exit_code_nargs=0
 _shtab_ahriman_package_copy___remove_nargs=0
-_shtab_ahriman_package_hold_pos_0_nargs=+
-_shtab_ahriman_package_hold__h_nargs=0
-_shtab_ahriman_package_hold___help_nargs=0
-_shtab_ahriman_package_pkgbuild__h_nargs=0
-_shtab_ahriman_package_pkgbuild___help_nargs=0
-_shtab_ahriman_package_pkgbuild__e_nargs=0
-_shtab_ahriman_package_pkgbuild___exit_code_nargs=0
-_shtab_ahriman_package_pkgbuild_remove__h_nargs=0
-_shtab_ahriman_package_pkgbuild_remove___help_nargs=0
 _shtab_ahriman_package_remove_pos_0_nargs=+
 _shtab_ahriman_package_remove__h_nargs=0
 _shtab_ahriman_package_remove___help_nargs=0
-_shtab_ahriman_package_rollback__h_nargs=0
-_shtab_ahriman_package_rollback___help_nargs=0
-_shtab_ahriman_package_rollback___hold_nargs=0
-_shtab_ahriman_package_rollback___no_hold_nargs=0
-_shtab_ahriman_package_status_pos_0_nargs='*'
+_shtab_ahriman_package_status_pos_0_nargs=*
 _shtab_ahriman_package_status__h_nargs=0
 _shtab_ahriman_package_status___help_nargs=0
 _shtab_ahriman_package_status___ahriman_nargs=0
@@ -291,12 +277,9 @@ _shtab_ahriman_package_status___no_info_nargs=0
 _shtab_ahriman_package_status_remove_pos_0_nargs=+
 _shtab_ahriman_package_status_remove__h_nargs=0
 _shtab_ahriman_package_status_remove___help_nargs=0
-_shtab_ahriman_package_status_update_pos_0_nargs='*'
+_shtab_ahriman_package_status_update_pos_0_nargs=*
 _shtab_ahriman_package_status_update__h_nargs=0
 _shtab_ahriman_package_status_update___help_nargs=0
-_shtab_ahriman_package_unhold_pos_0_nargs=+
-_shtab_ahriman_package_unhold__h_nargs=0
-_shtab_ahriman_package_unhold___help_nargs=0
 _shtab_ahriman_package_update_pos_0_nargs=+
 _shtab_ahriman_package_update__h_nargs=0
 _shtab_ahriman_package_update___help_nargs=0
@@ -338,7 +321,7 @@ _shtab_ahriman_remove_unknown___help_nargs=0
 _shtab_ahriman_remove_unknown___dry_run_nargs=0
 _shtab_ahriman_repo_backup__h_nargs=0
 _shtab_ahriman_repo_backup___help_nargs=0
-_shtab_ahriman_repo_check_pos_0_nargs='*'
+_shtab_ahriman_repo_check_pos_0_nargs=*
 _shtab_ahriman_repo_check__h_nargs=0
 _shtab_ahriman_repo_check___help_nargs=0
 _shtab_ahriman_repo_check___changes_nargs=0
@@ -431,7 +414,7 @@ _shtab_ahriman_repo_setup___makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___multilib_nargs=0
 _shtab_ahriman_repo_setup___no_multilib_nargs=0
-_shtab_ahriman_repo_sign_pos_0_nargs='*'
+_shtab_ahriman_repo_sign_pos_0_nargs=*
 _shtab_ahriman_repo_sign__h_nargs=0
 _shtab_ahriman_repo_sign___help_nargs=0
 _shtab_ahriman_repo_statistics__h_nargs=0
@@ -442,10 +425,10 @@ _shtab_ahriman_repo_sync__h_nargs=0
 _shtab_ahriman_repo_sync___help_nargs=0
 _shtab_ahriman_repo_tree__h_nargs=0
 _shtab_ahriman_repo_tree___help_nargs=0
-_shtab_ahriman_repo_triggers_pos_0_nargs='*'
+_shtab_ahriman_repo_triggers_pos_0_nargs=*
 _shtab_ahriman_repo_triggers__h_nargs=0
 _shtab_ahriman_repo_triggers___help_nargs=0
-_shtab_ahriman_repo_update_pos_0_nargs='*'
+_shtab_ahriman_repo_update_pos_0_nargs=*
 _shtab_ahriman_repo_update__h_nargs=0
 _shtab_ahriman_repo_update___help_nargs=0
 _shtab_ahriman_repo_update___aur_nargs=0
@@ -522,6 +505,8 @@ _shtab_ahriman_service_setup___multilib_nargs=0
 _shtab_ahriman_service_setup___no_multilib_nargs=0
 _shtab_ahriman_service_shell__h_nargs=0
 _shtab_ahriman_service_shell___help_nargs=0
+_shtab_ahriman_service_shell__v_nargs=0
+_shtab_ahriman_service_shell___verbose_nargs=0
 _shtab_ahriman_service_tree_migrate__h_nargs=0
 _shtab_ahriman_service_tree_migrate___help_nargs=0
 _shtab_ahriman_setup__h_nargs=0
@@ -534,10 +519,12 @@ _shtab_ahriman_setup___multilib_nargs=0
 _shtab_ahriman_setup___no_multilib_nargs=0
 _shtab_ahriman_shell__h_nargs=0
 _shtab_ahriman_shell___help_nargs=0
-_shtab_ahriman_sign_pos_0_nargs='*'
+_shtab_ahriman_shell__v_nargs=0
+_shtab_ahriman_shell___verbose_nargs=0
+_shtab_ahriman_sign_pos_0_nargs=*
 _shtab_ahriman_sign__h_nargs=0
 _shtab_ahriman_sign___help_nargs=0
-_shtab_ahriman_status_pos_0_nargs='*'
+_shtab_ahriman_status_pos_0_nargs=*
 _shtab_ahriman_status__h_nargs=0
 _shtab_ahriman_status___help_nargs=0
 _shtab_ahriman_status___ahriman_nargs=0
@@ -545,12 +532,12 @@ _shtab_ahriman_status__e_nargs=0
 _shtab_ahriman_status___exit_code_nargs=0
 _shtab_ahriman_status___info_nargs=0
 _shtab_ahriman_status___no_info_nargs=0
-_shtab_ahriman_status_update_pos_0_nargs='*'
+_shtab_ahriman_status_update_pos_0_nargs=*
 _shtab_ahriman_status_update__h_nargs=0
 _shtab_ahriman_status_update___help_nargs=0
 _shtab_ahriman_sync__h_nargs=0
 _shtab_ahriman_sync___help_nargs=0
-_shtab_ahriman_update_pos_0_nargs='*'
+_shtab_ahriman_update_pos_0_nargs=*
 _shtab_ahriman_update__h_nargs=0
 _shtab_ahriman_update___help_nargs=0
 _shtab_ahriman_update___aur_nargs=0
@@ -588,17 +575,6 @@ _shtab_ahriman_web__h_nargs=0
 _shtab_ahriman_web___help_nargs=0
 _shtab_ahriman_web_reload__h_nargs=0
 _shtab_ahriman_web_reload___help_nargs=0
-_shtab_ahriman_pos_0_nargs=A...
-_shtab_ahriman__h_nargs=0
-_shtab_ahriman___help_nargs=0
-_shtab_ahriman___force_nargs=0
-_shtab_ahriman__q_nargs=0
-_shtab_ahriman___quiet_nargs=0
-_shtab_ahriman___report_nargs=0
-_shtab_ahriman___no_report_nargs=0
-_shtab_ahriman___unsafe_nargs=0
-_shtab_ahriman__V_nargs=0
-_shtab_ahriman___version_nargs=0
 
 
 # $1=COMP_WORDS[1]
@@ -676,7 +652,7 @@ _shtab_ahriman() {
 
   local prefix=_shtab_ahriman
   local word_index=0
-  local pos_only=0 # "--" delimiter not encountered yet
+  local pos_only=0 # "--" delimeter not encountered yet
   _set_parser_defaults
   word_index=1
 
@@ -709,7 +685,7 @@ _shtab_ahriman() {
         _set_new_action "pos_${completed_positional_actions}" true
       fi
     else
-      pos_only=1 # "--" delimiter encountered
+      pos_only=1 # "--" delimeter encountered
     fi
 
     let "word_index+=1"
@@ -717,21 +693,20 @@ _shtab_ahriman() {
 
   # Generate the completions
 
-  COMPREPLY=()
   if [[ $pos_only = 0 && "${completing_word}" == -* ]]; then
     # optional argument started: use option strings
-    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
-      compgen -W "${current_option_strings[*]}" -- "${completing_word}")
-  elif [[ "${previous_word}" =~ ^[0-9\&]*[\<\>]\>?$ ]]; then
+    COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
+  elif [[ "${previous_word}" == ">" || "${previous_word}" == ">>" ||
+          "${previous_word}" =~ ^[12]">" || "${previous_word}" =~ ^[12]">>" ]]; then
     # handle redirection operators
-    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(compgen -f -- "${completing_word}")
+    COMPREPLY=( $(compgen -f -- "${completing_word}") )
   else
     # use choices & compgen
-    [ -n "${current_action_compgen}" ] &&
-      while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
-        "${current_action_compgen}" "${completing_word}")
-    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
-      compgen -W "${current_action_choices[*]}" -- "${completing_word}")
+    local IFS=$'\n' # items may contain spaces, so delimit using newline
+    COMPREPLY=( $([ -n "${current_action_compgen}" ] \
+                  && "${current_action_compgen}" "${completing_word}") )
+    unset IFS
+    COMPREPLY+=( $(compgen -W "${current_action_choices[*]}" -- "${completing_word}") )
   fi
 
   return 0

package/share/man/man1/ahriman.1

@@ -1,9 +1,9 @@
-.TH AHRIMAN "1" "2026\-08\-18" "ahriman 2.22.1" "ArcH linux ReposItory MANager"
+.TH AHRIMAN "1" "2026\-03\-08" "ahriman 2.20.0" "ArcH linux ReposItory MANager"
 .SH NAME
 ahriman \- ArcH linux ReposItory MANager
 .SH SYNOPSIS
-.B ahriman
-[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--log-handler {console,syslog,journald}] [-q] [--report | --no-report] [-r REPOSITORY] [--unsafe] [-V] [--wait-timeout WAIT_TIMEOUT] {add,aur-search,check,clean,config,config-validate,copy,daemon,help,help-commands-unsafe,help-updates,help-version,init,key-import,package-add,package-archives,package-changes,package-changes-remove,package-copy,package-hold,package-pkgbuild,package-pkgbuild-remove,package-remove,package-rollback,package-status,package-status-remove,package-status-update,package-unhold,package-update,patch-add,patch-list,patch-remove,patch-set-add,rebuild,remove,remove-unknown,repo-backup,repo-check,repo-clean,repo-config,repo-config-validate,repo-create-keyring,repo-create-mirrorlist,repo-daemon,repo-init,repo-rebuild,repo-remove-unknown,repo-report,repo-restore,repo-setup,repo-sign,repo-statistics,repo-status-update,repo-sync,repo-tree,repo-triggers,repo-update,report,run,search,service-clean,service-config,service-config-validate,service-key-import,service-repositories,service-run,service-setup,service-shell,service-tree-migrate,setup,shell,sign,status,status-update,sync,update,user-add,user-list,user-remove,version,web,web-reload} ...
+.B ahriman
+[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--log-handler {console,syslog,journald}] [-q] [--report | --no-report] [-r REPOSITORY] [--unsafe] [-V] [--wait-timeout WAIT_TIMEOUT] {add,aur-search,check,clean,config,config-validate,copy,daemon,help,help-commands-unsafe,help-updates,help-version,init,key-import,package-add,package-changes,package-changes-remove,package-copy,package-remove,package-status,package-status-remove,package-status-update,package-update,patch-add,patch-list,patch-remove,patch-set-add,rebuild,remove,remove-unknown,repo-backup,repo-check,repo-clean,repo-config,repo-config-validate,repo-create-keyring,repo-create-mirrorlist,repo-daemon,repo-init,repo-rebuild,repo-remove-unknown,repo-report,repo-restore,repo-setup,repo-sign,repo-statistics,repo-status-update,repo-sync,repo-tree,repo-triggers,repo-update,report,run,search,service-clean,service-config,service-config-validate,service-key-import,service-repositories,service-run,service-setup,service-shell,service-tree-migrate,setup,shell,sign,status,status-update,sync,update,user-add,user-list,user-remove,version,web,web-reload} ...
 .SH DESCRIPTION
 ArcH linux ReposItory MANager
 
@@ -74,9 +74,6 @@ application version
 \fBahriman\fR \fI\,package\-add\/\fR
 add package
 .TP
-\fBahriman\fR \fI\,package\-archives\/\fR
-list package archive versions
-.TP
 \fBahriman\fR \fI\,package\-changes\/\fR
 get package changes
 .TP
@@ -86,21 +83,9 @@ remove package changes
 \fBahriman\fR \fI\,package\-copy\/\fR
 copy package from another repository
 .TP
-\fBahriman\fR \fI\,package\-hold\/\fR
-hold package
-.TP
-\fBahriman\fR \fI\,package\-pkgbuild\/\fR
-get package pkgbuild
-.TP
-\fBahriman\fR \fI\,package\-pkgbuild\-remove\/\fR
-remove package pkgbuild
-.TP
 \fBahriman\fR \fI\,package\-remove\/\fR
 remove package
 .TP
-\fBahriman\fR \fI\,package\-rollback\/\fR
-rollback package
-.TP
 \fBahriman\fR \fI\,package\-status\/\fR
 get package status
 .TP
@@ -110,9 +95,6 @@ remove package status
 \fBahriman\fR \fI\,package\-status\-update\/\fR
 update package status
 .TP
-\fBahriman\fR \fI\,package\-unhold\/\fR
-unhold package
-.TP
 \fBahriman\fR \fI\,patch\-add\/\fR
 add patch for PKGBUILD function
 .TP
@@ -216,9 +198,9 @@ web server
 reload configuration
 
 .SH COMMAND \fI\,'ahriman aur\-search'\/\fR
-usage: ahriman aur\-search [\-h] [\-e] [\-\-info | \-\-no\-info]
-                          [\-\-sort\-by {description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,submitter,url,url_path,version}]
-                          search [search ...]
+usage: ahriman aur\-search [\-h] [\-e] [\-\-info | \-\-no\-info]
+                          [\-\-sort\-by {description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,submitter,url,url_path,version}]
+                          search [search ...]
 
 search for package in AUR using API
 
@@ -241,7 +223,7 @@ sort field by this field. In case if two packages have the same value of the spe
 by name
 
 .SH COMMAND \fI\,'ahriman help'\/\fR
-usage: ahriman help [\-h] [subcommand]
+usage: ahriman help [\-h] [subcommand]
 
 show help message for application or command and exit
 
@@ -250,7 +232,7 @@ show help message for application or command and exit
 show help message for specific command
 
 .SH COMMAND \fI\,'ahriman help\-commands\-unsafe'\/\fR
-usage: ahriman help\-commands\-unsafe [\-h] [subcommand ...]
+usage: ahriman help\-commands\-unsafe [\-h] [subcommand ...]
 
 list unsafe commands as defined in default args
 
@@ -260,7 +242,7 @@ instead of showing commands, just test command line for unsafe subcommand and re
 otherwise
 
 .SH COMMAND \fI\,'ahriman help\-updates'\/\fR
-usage: ahriman help\-updates [\-h] [\-e]
+usage: ahriman help\-updates [\-h] [\-e]
 
 request AUR for current version and compare with current service version
 
@@ -270,15 +252,15 @@ request AUR for current version and compare with current service version
 return non\-zero exit code if updates available
 
 .SH COMMAND \fI\,'ahriman help\-version'\/\fR
-usage: ahriman help\-version [\-h]
+usage: ahriman help\-version [\-h]
 
 print application and its dependencies versions
 
 .SH COMMAND \fI\,'ahriman package\-add'\/\fR
-usage: ahriman package\-add [\-h] [\-\-changes | \-\-no\-changes] [\-\-dependencies | \-\-no\-dependencies] [\-e]
-                           [\-\-increment | \-\-no\-increment] [\-n] [\-s {auto,archive,aur,directory,local,remote,repository}]
-                           [\-u USERNAME] [\-v VARIABLE] [\-y]
-                           package [package ...]
+usage: ahriman package\-add [\-h] [\-\-changes | \-\-no\-changes] [\-\-dependencies | \-\-no\-dependencies] [\-e]
+                           [\-\-increment | \-\-no\-increment] [\-n] [\-y]
+                           [\-s {auto,archive,aur,directory,local,remote,repository}] [\-u USERNAME] [\-v VARIABLE]
+                           package [package ...]
 
 add existing or new package to the build queue
 
@@ -307,6 +289,10 @@ increment package release (pkgrel) version on duplicate
 \fB\-n\fR, \fB\-\-now\fR
 run update function after
 
+.TP
+\fB\-y\fR, \fB\-\-refresh\fR
+download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
+
 .TP
 \fB\-s\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR, \fB\-\-source\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR
 explicitly specify the package source for this command
@@ -319,30 +305,8 @@ build as user
 \fB\-v\fR \fI\,VARIABLE\/\fR, \fB\-\-variable\fR \fI\,VARIABLE\/\fR
 apply specified makepkg variables to the next build
 
-.TP
-\fB\-y\fR, \fB\-\-refresh\fR
-download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
-
-.SH COMMAND \fI\,'ahriman package\-archives'\/\fR
-usage: ahriman package\-archives [\-h] [\-e] [\-\-info | \-\-no\-info] package
-
-list available archive versions for the package
-
-.TP
-\fBpackage\fR
-package base
-
-.SH OPTIONS \fI\,'ahriman package\-archives'\/\fR
-.TP
-\fB\-e\fR, \fB\-\-exit\-code\fR
-return non\-zero exit status if result is empty
-
-.TP
-\fB\-\-info\fR, \fB\-\-no\-info\fR
-show additional package information
-
 .SH COMMAND \fI\,'ahriman package\-changes'\/\fR
-usage: ahriman package\-changes [\-h] [\-e] package
+usage: ahriman package\-changes [\-h] [\-e] package
 
 retrieve package changes stored in database
 
@@ -356,7 +320,7 @@ package base
 return non\-zero exit status if result is empty
 
 .SH COMMAND \fI\,'ahriman package\-changes\-remove'\/\fR
-usage: ahriman package\-changes\-remove [\-h] package
+usage: ahriman package\-changes\-remove [\-h] package
 
 remove the package changes stored remotely
 
@@ -365,7 +329,7 @@ remove the package changes stored remotely
 package base
 
 .SH COMMAND \fI\,'ahriman package\-copy'\/\fR
-usage: ahriman package\-copy [\-h] [\-e] [\-\-remove] source package [package ...]
+usage: ahriman package\-copy [\-h] [\-e] [\-\-remove] source package [package ...]
 
 copy package and its metadata from another repository
 
@@ -386,40 +350,8 @@ return non\-zero exit status if result is empty
 \fB\-\-remove\fR
 remove package from the source repository after
 
-.SH COMMAND \fI\,'ahriman package\-hold'\/\fR
-usage: ahriman package\-hold [\-h] package [package ...]
-
-hold package from automatic updates
-
-.TP
-\fBpackage\fR
-package base
-
-.SH COMMAND \fI\,'ahriman package\-pkgbuild'\/\fR
-usage: ahriman package\-pkgbuild [\-h] [\-e] package
-
-retrieve package PKGBUILD stored in database
-
-.TP
-\fBpackage\fR
-package base
-
-.SH OPTIONS \fI\,'ahriman package\-pkgbuild'\/\fR
-.TP
-\fB\-e\fR, \fB\-\-exit\-code\fR
-return non\-zero exit status if result is empty
-
-.SH COMMAND \fI\,'ahriman package\-pkgbuild\-remove'\/\fR
-usage: ahriman package\-pkgbuild\-remove [\-h] package
-
-remove the package PKGBUILD stored remotely
-
-.TP
-\fBpackage\fR
-package base
-
 .SH COMMAND \fI\,'ahriman package\-remove'\/\fR
-usage: ahriman package\-remove [\-h] package [package ...]
+usage: ahriman package\-remove [\-h] package [package ...]
 
 remove package from the repository
 
@@ -427,31 +359,9 @@ remove package from the repository
 \fBpackage\fR
 package name or base
 
-.SH COMMAND \fI\,'ahriman package\-rollback'\/\fR
-usage: ahriman package\-rollback [\-h] [\-\-hold | \-\-no\-hold] [\-u USERNAME] package version
-
-rollback package to specified version from archives
-
-.TP
-\fBpackage\fR
-package base
-
-.TP
-\fBversion\fR
-package version
-
-.SH OPTIONS \fI\,'ahriman package\-rollback'\/\fR
-.TP
-\fB\-\-hold\fR, \fB\-\-no\-hold\fR
-hold package afterwards
-
-.TP
-\fB\-u\fR \fI\,USERNAME\/\fR, \fB\-\-username\fR \fI\,USERNAME\/\fR
-build as user
-
 .SH COMMAND \fI\,'ahriman package\-status'\/\fR
-usage: ahriman package\-status [\-h] [\-\-ahriman] [\-e] [\-\-info | \-\-no\-info] [\-s {unknown,pending,building,failed,success}]
-                              [package ...]
+usage: ahriman package\-status [\-h] [\-\-ahriman] [\-e] [\-\-info | \-\-no\-info] [\-s {unknown,pending,building,failed,success}]
+                              [package ...]
 
 request status of the package
 
@@ -477,7 +387,7 @@ show additional package information
 filter packages by status
 
 .SH COMMAND \fI\,'ahriman package\-status\-remove'\/\fR
-usage: ahriman package\-status\-remove [\-h] package [package ...]
+usage: ahriman package\-status\-remove [\-h] package [package ...]
 
 remove the package from the status page
 
@@ -486,7 +396,7 @@ remove the package from the status page
 remove specified packages from status page
 
 .SH COMMAND \fI\,'ahriman package\-status\-update'\/\fR
-usage: ahriman package\-status\-update [\-h] [\-s {unknown,pending,building,failed,success}] [package ...]
+usage: ahriman package\-status\-update [\-h] [\-s {unknown,pending,building,failed,success}] [package ...]
 
 update package status on the status page
 
@@ -499,17 +409,8 @@ set status for specified packages. If no packages supplied, service status will
 \fB\-s\fR \fI\,{unknown,pending,building,failed,success}\/\fR, \fB\-\-status\fR \fI\,{unknown,pending,building,failed,success}\/\fR
 new package build status
 
-.SH COMMAND \fI\,'ahriman package\-unhold'\/\fR
-usage: ahriman package\-unhold [\-h] package [package ...]
-
-remove package hold, allowing automatic updates
-
-.TP
-\fBpackage\fR
-package base
-
 .SH COMMAND \fI\,'ahriman patch\-add'\/\fR
-usage: ahriman patch\-add [\-h] package variable [patch]
+usage: ahriman patch\-add [\-h] package variable [patch]
 
 create or update patched PKGBUILD function or variable
 
@@ -526,7 +427,7 @@ PKGBUILD variable or function name. If variable is a function, it must end with
 path to file which contains function or variable value. If not set, the value will be read from stdin
 
 .SH COMMAND \fI\,'ahriman patch\-list'\/\fR
-usage: ahriman patch\-list [\-h] [\-e] [\-v VARIABLE] package
+usage: ahriman patch\-list [\-h] [\-e] [\-v VARIABLE] package
 
 list available patches for the package
 
@@ -544,7 +445,7 @@ return non\-zero exit status if result is empty
 if set, show only patches for specified PKGBUILD variables
 
 .SH COMMAND \fI\,'ahriman patch\-remove'\/\fR
-usage: ahriman patch\-remove [\-h] [\-v VARIABLE] package
+usage: ahriman patch\-remove [\-h] [\-v VARIABLE] package
 
 remove patches for the package
 
@@ -559,7 +460,7 @@ should be used for single\-function patches in case if you wold like to remove o
 if not set, it will remove all patches related to the package
 
 .SH COMMAND \fI\,'ahriman patch\-set\-add'\/\fR
-usage: ahriman patch\-set\-add [\-h] [\-t TRACK] package
+usage: ahriman patch\-set\-add [\-h] [\-t TRACK] package
 
 create or update source patches
 
@@ -573,7 +474,7 @@ path to directory with changed files for patch addition/update
 files which has to be tracked
 
 .SH COMMAND \fI\,'ahriman repo\-backup'\/\fR
-usage: ahriman repo\-backup [\-h] path
+usage: ahriman repo\-backup [\-h] path
 
 backup repository settings and database
 
@@ -582,9 +483,9 @@ backup repository settings and database
 path of the output archive
 
 .SH COMMAND \fI\,'ahriman repo\-check'\/\fR
-usage: ahriman repo\-check [\-h] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files] [\-e] [\-\-vcs | \-\-no\-vcs]
-                          [\-y]
-                          [package ...]
+usage: ahriman repo\-check [\-h] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files] [\-e] [\-\-vcs | \-\-no\-vcs]
+                          [\-y]
+                          [package ...]
 
 check for packages updates. Same as repo\-update \-\-dry\-run \-\-no\-manual
 
@@ -614,20 +515,20 @@ fetch actual version of VCS packages
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
 .SH COMMAND \fI\,'ahriman repo\-create\-keyring'\/\fR
-usage: ahriman repo\-create\-keyring [\-h]
+usage: ahriman repo\-create\-keyring [\-h]
 
 create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually
 
 .SH COMMAND \fI\,'ahriman repo\-create\-mirrorlist'\/\fR
-usage: ahriman repo\-create\-mirrorlist [\-h]
+usage: ahriman repo\-create\-mirrorlist [\-h]
 
 create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually
 
 .SH COMMAND \fI\,'ahriman repo\-daemon'\/\fR
-usage: ahriman repo\-daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes]
-                           [\-\-check\-files | \-\-no\-check\-files] [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run]
-                           [\-\-increment | \-\-no\-increment] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
-                           [\-\-partitions | \-\-no\-partitions] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
+usage: ahriman repo\-daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes]
+                           [\-\-check\-files | \-\-no\-check\-files] [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run]
+                           [\-\-increment | \-\-no\-increment] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
+                           [\-\-partitions | \-\-no\-partitions] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
 
 start process which periodically will run update process
 
@@ -685,8 +586,8 @@ fetch actual version of VCS packages
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
 .SH COMMAND \fI\,'ahriman repo\-rebuild'\/\fR
-usage: ahriman repo\-rebuild [\-h] [\-\-depends\-on DEPENDS_ON] [\-\-dry\-run] [\-\-from\-database] [\-\-increment | \-\-no\-increment]
-                            [\-e] [\-s {unknown,pending,building,failed,success}] [\-u USERNAME]
+usage: ahriman repo\-rebuild [\-h] [\-\-depends\-on DEPENDS_ON] [\-\-dry\-run] [\-\-from\-database] [\-\-increment | \-\-no\-increment]
+                            [\-e] [\-s {unknown,pending,building,failed,success}] [\-u USERNAME]
 
 force rebuild whole repository
 
@@ -722,7 +623,7 @@ filter packages by status. Requires \-\-from\-database to be set
 build as user
 
 .SH COMMAND \fI\,'ahriman repo\-remove\-unknown'\/\fR
-usage: ahriman repo\-remove\-unknown [\-h] [\-\-dry\-run]
+usage: ahriman repo\-remove\-unknown [\-h] [\-\-dry\-run]
 
 remove packages which are missing in AUR and do not have local PKGBUILDs
 
@@ -732,12 +633,12 @@ remove packages which are missing in AUR and do not have local PKGBUILDs
 just perform check for packages without removal
 
 .SH COMMAND \fI\,'ahriman repo\-report'\/\fR
-usage: ahriman repo\-report [\-h]
+usage: ahriman repo\-report [\-h]
 
 generate repository report according to current settings
 
 .SH COMMAND \fI\,'ahriman repo\-restore'\/\fR
-usage: ahriman repo\-restore [\-h] [\-o OUTPUT] path
+usage: ahriman repo\-restore [\-h] [\-o OUTPUT] path
 
 restore settings and database
 
@@ -751,7 +652,7 @@ path of the input archive
 root path of the extracted files
 
 .SH COMMAND \fI\,'ahriman repo\-sign'\/\fR
-usage: ahriman repo\-sign [\-h] [package ...]
+usage: ahriman repo\-sign [\-h] [package ...]
 
 (re\-)sign packages and repository database according to current settings
 
@@ -760,10 +661,10 @@ usage: ahriman repo\-sign [\-h] [package ...]
 sign only specified packages
 
 .SH COMMAND \fI\,'ahriman repo\-statistics'\/\fR
-usage: ahriman repo\-statistics [\-h] [\-\-chart CHART]
-                               [\-e {build\-log,package\-held,package\-outdated,package\-removed,package\-status\-changed,package\-update\-failed,package\-updated,service\-status\-changed}]
-                               [\-\-from\-date FROM_DATE] [\-\-limit LIMIT] [\-\-offset OFFSET] [\-\-to\-date TO_DATE]
-                               [package]
+usage: ahriman repo\-statistics [\-h] [\-\-chart CHART]
+                               [\-e {package\-outdated,package\-removed,package\-update\-failed,package\-updated}]
+                               [\-\-from\-date FROM_DATE] [\-\-limit LIMIT] [\-\-offset OFFSET] [\-\-to\-date TO_DATE]
+                               [package]
 
 fetch repository statistics
 
@@ -777,7 +678,7 @@ fetch only events for the specified package
 create updates chart and save it to the specified path
 
 .TP
-\fB\-e\fR \fI\,{build\-log,package\-held,package\-outdated,package\-removed,package\-status\-changed,package\-update\-failed,package\-updated,service\-status\-changed}\/\fR, \fB\-\-event\fR \fI\,{build\-log,package\-held,package\-outdated,package\-removed,package\-status\-changed,package\-update\-failed,package\-updated,service\-status\-changed}\/\fR
+\fB\-e\fR \fI\,{package\-outdated,package\-removed,package\-update\-failed,package\-updated}\/\fR, \fB\-\-event\fR \fI\,{package\-outdated,package\-removed,package\-update\-failed,package\-updated}\/\fR
 event type filter
 
 .TP
@@ -797,7 +698,7 @@ skip specified amount of events
 only fetch events which are older than the date
 
 .SH COMMAND \fI\,'ahriman repo\-status\-update'\/\fR
-usage: ahriman repo\-status\-update [\-h] [\-s {unknown,pending,building,failed,success}]
+usage: ahriman repo\-status\-update [\-h] [\-s {unknown,pending,building,failed,success}]
 
 update repository status on the status page
 
@@ -807,12 +708,12 @@ update repository status on the status page
 new status
 
 .SH COMMAND \fI\,'ahriman repo\-sync'\/\fR
-usage: ahriman repo\-sync [\-h]
+usage: ahriman repo\-sync [\-h]
 
 sync repository files to remote server according to current settings
 
 .SH COMMAND \fI\,'ahriman repo\-tree'\/\fR
-usage: ahriman repo\-tree [\-h] [\-p PARTITIONS]
+usage: ahriman repo\-tree [\-h] [\-p PARTITIONS]
 
 dump repository tree based on packages dependencies
 
@@ -822,7 +723,7 @@ dump repository tree based on packages dependencies
 also divide packages by independent partitions
 
 .SH COMMAND \fI\,'ahriman repo\-triggers'\/\fR
-usage: ahriman repo\-triggers [\-h] [trigger ...]
+usage: ahriman repo\-triggers [\-h] [trigger ...]
 
 run triggers on empty build result as configured by settings
 
@@ -831,10 +732,10 @@ run triggers on empty build result as configured by settings
 instead of running all triggers as set by configuration, just process specified ones in order of mention
 
 .SH COMMAND \fI\,'ahriman repo\-update'\/\fR
-usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files]
-                           [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-e] [\-\-increment | \-\-no\-increment]
-                           [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
-                           [package ...]
+usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files]
+                           [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-e] [\-\-increment | \-\-no\-increment]
+                           [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
+                           [package ...]
 
 check for packages updates and run build process if requested
 
@@ -892,8 +793,8 @@ fetch actual version of VCS packages
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
 .SH COMMAND \fI\,'ahriman service\-clean'\/\fR
-usage: ahriman service\-clean [\-h] [\-\-cache | \-\-no\-cache] [\-\-chroot | \-\-no\-chroot] [\-\-manual | \-\-no\-manual]
-                             [\-\-packages | \-\-no\-packages] [\-\-pacman | \-\-no\-pacman]
+usage: ahriman service\-clean [\-h] [\-\-cache | \-\-no\-cache] [\-\-chroot | \-\-no\-chroot] [\-\-manual | \-\-no\-manual]
+                             [\-\-packages | \-\-no\-packages] [\-\-pacman | \-\-no\-pacman]
 
 remove local caches
 
@@ -919,7 +820,7 @@ clear directory with built packages
 clear directory with pacman local database cache
 
 .SH COMMAND \fI\,'ahriman service\-config'\/\fR
-usage: ahriman service\-config [\-h] [\-\-info | \-\-no\-info] [\-\-secure | \-\-no\-secure] [section] [key]
+usage: ahriman service\-config [\-h] [\-\-info | \-\-no\-info] [\-\-secure | \-\-no\-secure] [section] [key]
 
 dump configuration for the specified architecture
 
@@ -941,7 +842,7 @@ show additional information, e.g. configuration files
 hide passwords and secrets from output
 
 .SH COMMAND \fI\,'ahriman service\-config\-validate'\/\fR
-usage: ahriman service\-config\-validate [\-h] [\-e]
+usage: ahriman service\-config\-validate [\-h] [\-e]
 
 validate configuration and print found errors
 
@@ -951,7 +852,7 @@ validate configuration and print found errors
 return non\-zero exit status if configuration is invalid
 
 .SH COMMAND \fI\,'ahriman service\-key\-import'\/\fR
-usage: ahriman service\-key\-import [\-h] [\-\-key\-server KEY_SERVER] key
+usage: ahriman service\-key\-import [\-h] [\-\-key\-server KEY_SERVER] key
 
 import PGP key from public sources to the repository user
 
@@ -965,7 +866,7 @@ PGP key to import from public server
 key server for key import
 
 .SH COMMAND \fI\,'ahriman service\-repositories'\/\fR
-usage: ahriman service\-repositories [\-h] [\-\-id\-only | \-\-no\-id\-only]
+usage: ahriman service\-repositories [\-h] [\-\-id\-only | \-\-no\-id\-only]
 
 list all available repositories
 
@@ -975,7 +876,7 @@ list all available repositories
 show machine readable identifier instead
 
 .SH COMMAND \fI\,'ahriman service\-run'\/\fR
-usage: ahriman service\-run [\-h] command [command ...]
+usage: ahriman service\-run [\-h] command [command ...]
 
 run multiple commands on success run of the previous command
 
@@ -984,13 +885,13 @@ run multiple commands on success run of the previous command
 command to be run (quoted) without ``ahriman``
 
 .SH COMMAND \fI\,'ahriman service\-setup'\/\fR
-usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-from\-configuration FROM_CONFIGURATION]
-                             [\-\-generate\-salt | \-\-no\-generate\-salt] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs]
-                             [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER [\-\-server SERVER]
-                             [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
-                             [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
+usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-from\-configuration FROM_CONFIGURATION]
+                             [\-\-generate\-salt | \-\-no\-generate\-salt] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs]
+                             [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER [\-\-server SERVER]
+                             [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
+                             [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
 
-create initial service configuration as the repository owner
+create initial service configuration, requires root
 
 .SH OPTIONS \fI\,'ahriman service\-setup'\/\fR
 .TP
@@ -1042,7 +943,7 @@ port of the web service
 path to unix socket used for interprocess communications
 
 .SH COMMAND \fI\,'ahriman service\-shell'\/\fR
-usage: ahriman service\-shell [\-h] [\-o OUTPUT] [code]
+usage: ahriman service\-shell [\-h] [\-o OUTPUT] [code]
 
 drop into python shell
 
@@ -1056,13 +957,13 @@ instead of dropping into shell, just execute the specified code
 output commands and result to the file
 
 .SH COMMAND \fI\,'ahriman service\-tree\-migrate'\/\fR
-usage: ahriman service\-tree\-migrate [\-h]
+usage: ahriman service\-tree\-migrate [\-h]
 
 migrate repository tree between versions
 
 .SH COMMAND \fI\,'ahriman user\-add'\/\fR
-usage: ahriman user\-add [\-h] [\-\-key KEY] [\-\-packager PACKAGER] [\-p PASSWORD] [\-R {unauthorized,read,reporter,full}]
-                        username
+usage: ahriman user\-add [\-h] [\-\-key KEY] [\-\-packager PACKAGER] [\-p PASSWORD] [\-R {unauthorized,read,reporter,full}]
+                        username
 
 update user for web services with the given password and role. In case if password was not entered it will be asked interactively
 
@@ -1089,7 +990,7 @@ authorization type.
 user access level
 
 .SH COMMAND \fI\,'ahriman user\-list'\/\fR
-usage: ahriman user\-list [\-h] [\-e] [\-R {unauthorized,read,reporter,full}] [username]
+usage: ahriman user\-list [\-h] [\-e] [\-R {unauthorized,read,reporter,full}] [username]
 
 list users from the user mapping and their roles
 
@@ -1107,7 +1008,7 @@ return non\-zero exit status if result is empty
 filter users by role
 
 .SH COMMAND \fI\,'ahriman user\-remove'\/\fR
-usage: ahriman user\-remove [\-h] username
+usage: ahriman user\-remove [\-h] username
 
 remove user from the user mapping and update the configuration
 
@@ -1116,12 +1017,12 @@ remove user from the user mapping and update the configuration
 username for web service
 
 .SH COMMAND \fI\,'ahriman web'\/\fR
-usage: ahriman web [\-h]
+usage: ahriman web [\-h]
 
 start web server
 
 .SH COMMAND \fI\,'ahriman web\-reload'\/\fR
-usage: ahriman web\-reload [\-h]
+usage: ahriman web\-reload [\-h]
 
 reload web server configuration
 

package/share/zsh/site-functions/_ahriman

@@ -1,92 +1,86 @@
 #compdef ahriman
 
-# AUTOMATICALLY GENERATED by https://github.com/tqdm/shtab
+# AUTOMATICALLY GENERATED by `shtab`
 
 
 _shtab_ahriman_commands() {
   local _commands=(
-    add:'add existing or new package to the build queue'
-    aur-search:'search for package in AUR using API'
-    check:'check for packages updates. Same as repo-update --dry-run --no-manual'
-    clean:'remove local caches'
-    config:'dump configuration for the specified architecture'
-    config-validate:'validate configuration and print found errors'
-    copy:'copy package and its metadata from another repository'
-    daemon:'start process which periodically will run update process'
-    help:'show help message for application or command and exit'
-    help-commands-unsafe:'list unsafe commands as defined in default args'
-    help-updates:'request AUR for current version and compare with current service version'
-    help-version:'print application and its dependencies versions'
-    init:'create initial service configuration as the repository owner'
-    key-import:'import PGP key from public sources to the repository user'
-    package-add:'add existing or new package to the build queue'
-    package-archives:'list available archive versions for the package'
-    package-changes:'retrieve package changes stored in database'
-    package-changes-remove:'remove the package changes stored remotely'
-    package-copy:'copy package and its metadata from another repository'
-    package-hold:'hold package from automatic updates'
-    package-pkgbuild:'retrieve package PKGBUILD stored in database'
-    package-pkgbuild-remove:'remove the package PKGBUILD stored remotely'
-    package-remove:'remove package from the repository'
-    package-rollback:'rollback package to specified version from archives'
-    package-status:'request status of the package'
-    package-status-remove:'remove the package from the status page'
-    package-status-update:'update package status on the status page'
-    package-unhold:'remove package hold, allowing automatic updates'
-    package-update:'add existing or new package to the build queue'
-    patch-add:'create or update patched PKGBUILD function or variable'
-    patch-list:'list available patches for the package'
-    patch-remove:'remove patches for the package'
-    patch-set-add:'create or update source patches'
-    rebuild:'force rebuild whole repository'
-    remove:'remove package from the repository'
-    remove-unknown:'remove packages which are missing in AUR and do not have local PKGBUILDs'
-    repo-backup:'backup repository settings and database'
-    repo-check:'check for packages updates. Same as repo-update --dry-run --no-manual'
-    repo-clean:'remove local caches'
-    repo-config:'dump configuration for the specified architecture'
-    repo-config-validate:'validate configuration and print found errors'
-    repo-create-keyring:'create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually'
-    repo-create-mirrorlist:'create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually'
-    repo-daemon:'start process which periodically will run update process'
-    repo-init:'create initial service configuration as the repository owner'
-    repo-rebuild:'force rebuild whole repository'
-    repo-remove-unknown:'remove packages which are missing in AUR and do not have local PKGBUILDs'
-    repo-report:'generate repository report according to current settings'
-    repo-restore:'restore settings and database'
-    repo-setup:'create initial service configuration as the repository owner'
-    repo-sign:'(re-)sign packages and repository database according to current settings'
-    repo-statistics:'fetch repository statistics'
-    repo-status-update:'update repository status on the status page'
-    repo-sync:'sync repository files to remote server according to current settings'
-    repo-tree:'dump repository tree based on packages dependencies'
-    repo-triggers:'run triggers on empty build result as configured by settings'
-    repo-update:'check for packages updates and run build process if requested'
-    report:'generate repository report according to current settings'
-    run:'run multiple commands on success run of the previous command'
-    search:'search for package in AUR using API'
-    service-clean:'remove local caches'
-    service-config:'dump configuration for the specified architecture'
-    service-config-validate:'validate configuration and print found errors'
-    service-key-import:'import PGP key from public sources to the repository user'
-    service-repositories:'list all available repositories'
-    service-run:'run multiple commands on success run of the previous command'
-    service-setup:'create initial service configuration as the repository owner'
-    service-shell:'drop into python shell'
-    service-tree-migrate:'migrate repository tree between versions'
-    setup:'create initial service configuration as the repository owner'
-    shell:'drop into python shell'
-    sign:'(re-)sign packages and repository database according to current settings'
-    status:'request status of the package'
-    status-update:'update package status on the status page'
-    sync:'sync repository files to remote server according to current settings'
-    update:'check for packages updates and run build process if requested'
-    user-add:'update user for web services with the given password and role. In case if password was not entered it will be asked interactively'
-    user-list:'list users from the user mapping and their roles'
-    user-remove:'remove user from the user mapping and update the configuration'
-    version:'print application and its dependencies versions'
-    web:'start web server'
-    web-reload:'reload web server configuration'
+    "add:add existing or new package to the build queue"
+    "aur-search:search for package in AUR using API"
+    "check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    "clean:remove local caches"
+    "config:dump configuration for the specified architecture"
+    "config-validate:validate configuration and print found errors"
+    "copy:copy package and its metadata from another repository"
+    "daemon:start process which periodically will run update process"
+    "help:show help message for application or command and exit"
+    "help-commands-unsafe:list unsafe commands as defined in default args"
+    "help-updates:request AUR for current version and compare with current service version"
+    "help-version:print application and its dependencies versions"
+    "init:create initial service configuration, requires root"
+    "key-import:import PGP key from public sources to the repository user"
+    "package-add:add existing or new package to the build queue"
+    "package-changes:retrieve package changes stored in database"
+    "package-changes-remove:remove the package changes stored remotely"
+    "package-copy:copy package and its metadata from another repository"
+    "package-remove:remove package from the repository"
+    "package-status:request status of the package"
+    "package-status-remove:remove the package from the status page"
+    "package-status-update:update package status on the status page"
+    "package-update:add existing or new package to the build queue"
+    "patch-add:create or update patched PKGBUILD function or variable"
+    "patch-list:list available patches for the package"
+    "patch-remove:remove patches for the package"
+    "patch-set-add:create or update source patches"
+    "rebuild:force rebuild whole repository"
+    "remove:remove package from the repository"
+    "remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    "repo-backup:backup repository settings and database"
+    "repo-check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    "repo-clean:remove local caches"
+    "repo-config:dump configuration for the specified architecture"
+    "repo-config-validate:validate configuration and print found errors"
+    "repo-create-keyring:create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually"
+    "repo-create-mirrorlist:create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually"
+    "repo-daemon:start process which periodically will run update process"
+    "repo-init:create initial service configuration, requires root"
+    "repo-rebuild:force rebuild whole repository"
+    "repo-remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    "repo-report:generate repository report according to current settings"
+    "repo-restore:restore settings and database"
+    "repo-setup:create initial service configuration, requires root"
+    "repo-sign:(re-)sign packages and repository database according to current settings"
+    "repo-statistics:fetch repository statistics"
+    "repo-status-update:update repository status on the status page"
+    "repo-sync:sync repository files to remote server according to current settings"
+    "repo-tree:dump repository tree based on packages dependencies"
+    "repo-triggers:run triggers on empty build result as configured by settings"
+    "repo-update:check for packages updates and run build process if requested"
+    "report:generate repository report according to current settings"
+    "run:run multiple commands on success run of the previous command"
+    "search:search for package in AUR using API"
+    "service-clean:remove local caches"
+    "service-config:dump configuration for the specified architecture"
+    "service-config-validate:validate configuration and print found errors"
+    "service-key-import:import PGP key from public sources to the repository user"
+    "service-repositories:list all available repositories"
+    "service-run:run multiple commands on success run of the previous command"
+    "service-setup:create initial service configuration, requires root"
+    "service-shell:drop into python shell"
+    "service-tree-migrate:migrate repository tree between versions"
+    "setup:create initial service configuration, requires root"
+    "shell:drop into python shell"
+    "sign:(re-)sign packages and repository database according to current settings"
+    "status:request status of the package"
+    "status-update:update package status on the status page"
+    "sync:sync repository files to remote server according to current settings"
+    "update:check for packages updates and run build process if requested"
+    "user-add:update user for web services with the given password and role. In case if password was not entered it will be asked interactively"
+    "user-list:list users from the user mapping and their roles"
+    "user-remove:remove user from the user mapping and update the configuration"
+    "version:print application and its dependencies versions"
+    "web:start web server"
+    "web-reload:reload web server configuration"
   )
   _describe 'ahriman commands' _commands
 }
@@ -99,7 +93,7 @@ _shtab_ahriman_options=(
   {-l,--lock}"[lock file (default\: ahriman.pid)]:lock:"
   "--log-handler[explicit log handler specification. If none set, the handler will be guessed from environment (default\: None)]:log_handler:(console syslog journald)"
   {-q,--quiet}"[force disable any logging (default\: False)]"
-  {--report,--no-report}"[force enable or disable reporting to web service (default\: True)]"
+  {--report,--no-report}"[force enable or disable reporting to web service (default\: True)]:report:"
   {-r,--repository}"[filter by target repository (default\: None)]:repository:"
   "--unsafe[allow to run ahriman as non-ahriman user. Some actions might be unavailable (default\: False)]"
   "(- : *)"{-V,--version}"[show program\'s version number and exit]"
@@ -111,15 +105,15 @@ _shtab_ahriman_defaults_added=0
 
 _shtab_ahriman_add_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
   {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
   {-u,--username}"[build as user (default\: None)]:username:"
   "*"{-v,--variable}"[apply specified makepkg variables to the next build (default\: None)]:variable:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*):package source (base name, path to local files, remote URL):"
 )
 
@@ -129,7 +123,7 @@ _shtab_ahriman_add_defaults_added=0
 _shtab_ahriman_aur_search_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
   "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name (default\: name)]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
   "(*):search terms, can be specified multiple times, the result will match all terms:"
 )
@@ -139,10 +133,10 @@ _shtab_ahriman_aur_search_defaults_added=0
 
 _shtab_ahriman_check_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -152,11 +146,11 @@ _shtab_ahriman_check_defaults_added=0
 
 _shtab_ahriman_clean_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: False)]"
-  {--chroot,--no-chroot}"[clear build chroot (default\: False)]"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]"
-  {--packages,--no-packages}"[clear directory with built packages (default\: False)]"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -164,8 +158,8 @@ _shtab_ahriman_clean_defaults_added=0
 
 _shtab_ahriman_config_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
   ":filter settings by section (default\: None):"
   ":filter settings by key (default\: None):"
 )
@@ -195,17 +189,17 @@ _shtab_ahriman_copy_defaults_added=0
 _shtab_ahriman_daemon_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
-  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]:partitions:"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
 )
 
@@ -247,10 +241,10 @@ _shtab_ahriman_init_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -273,31 +267,21 @@ _shtab_ahriman_key_import_defaults_added=0
 
 _shtab_ahriman_package_add_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
   {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
   {-u,--username}"[build as user (default\: None)]:username:"
   "*"{-v,--variable}"[apply specified makepkg variables to the next build (default\: None)]:variable:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*):package source (base name, path to local files, remote URL):"
 )
 
 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_add_defaults_added=0
 
-_shtab_ahriman_package_archives_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]"
-  ":package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_archives_defaults_added=0
-
 _shtab_ahriman_package_changes_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -326,31 +310,6 @@ _shtab_ahriman_package_copy_options=(
 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_copy_defaults_added=0
 
-_shtab_ahriman_package_hold_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*):package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_hold_defaults_added=0
-
-_shtab_ahriman_package_pkgbuild_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  ":package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_pkgbuild_defaults_added=0
-
-_shtab_ahriman_package_pkgbuild_remove_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_pkgbuild_remove_defaults_added=0
-
 _shtab_ahriman_package_remove_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "(*):package name or base:"
@@ -359,22 +318,11 @@ _shtab_ahriman_package_remove_options=(
 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_remove_defaults_added=0
 
-_shtab_ahriman_package_rollback_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--hold,--no-hold}"[hold package afterwards (default\: True)]"
-  {-u,--username}"[build as user (default\: None)]:username:"
-  ":package base:"
-  ":package version:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_rollback_defaults_added=0
-
 _shtab_ahriman_package_status_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--ahriman[get service status itself (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
   {-s,--status}"[filter packages by status (default\: None)]:status:(unknown pending building failed success)"
   "(*)::filter status by package base (default\: None):"
 )
@@ -399,25 +347,17 @@ _shtab_ahriman_package_status_update_options=(
 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_status_update_defaults_added=0
 
-_shtab_ahriman_package_unhold_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*):package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_unhold_defaults_added=0
-
 _shtab_ahriman_package_update_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
   {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
   {-u,--username}"[build as user (default\: None)]:username:"
   "*"{-v,--variable}"[apply specified makepkg variables to the next build (default\: None)]:variable:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*):package source (base name, path to local files, remote URL):"
 )
 
@@ -467,7 +407,7 @@ _shtab_ahriman_rebuild_options=(
   "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
   "--dry-run[just perform check for packages without rebuild process itself (default\: False)]"
   "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once. (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
   {-s,--status}"[filter packages by status. Requires --from-database to be set (default\: None)]:status:(unknown pending building failed success)"
   {-u,--username}"[build as user (default\: None)]:username:"
@@ -502,10 +442,10 @@ _shtab_ahriman_repo_backup_defaults_added=0
 
 _shtab_ahriman_repo_check_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -515,11 +455,11 @@ _shtab_ahriman_repo_check_defaults_added=0
 
 _shtab_ahriman_repo_clean_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: False)]"
-  {--chroot,--no-chroot}"[clear build chroot (default\: False)]"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]"
-  {--packages,--no-packages}"[clear directory with built packages (default\: False)]"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -527,8 +467,8 @@ _shtab_ahriman_repo_clean_defaults_added=0
 
 _shtab_ahriman_repo_config_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
   ":filter settings by section (default\: None):"
   ":filter settings by key (default\: None):"
 )
@@ -561,17 +501,17 @@ _shtab_ahriman_repo_create_mirrorlist_defaults_added=0
 _shtab_ahriman_repo_daemon_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
-  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]:partitions:"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
 )
 
@@ -582,10 +522,10 @@ _shtab_ahriman_repo_init_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -602,7 +542,7 @@ _shtab_ahriman_repo_rebuild_options=(
   "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
   "--dry-run[just perform check for packages without rebuild process itself (default\: False)]"
   "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once. (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
   {-s,--status}"[filter packages by status. Requires --from-database to be set (default\: None)]:status:(unknown pending building failed success)"
   {-u,--username}"[build as user (default\: None)]:username:"
@@ -639,10 +579,10 @@ _shtab_ahriman_repo_setup_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -665,7 +605,7 @@ _shtab_ahriman_repo_sign_defaults_added=0
 _shtab_ahriman_repo_statistics_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--chart[create updates chart and save it to the specified path (default\: None)]:chart:"
-  {-e,--event}"[event type filter (default\: package-updated)]:event:(build-log package-held package-outdated package-removed package-status-changed package-update-failed package-updated service-status-changed)"
+  {-e,--event}"[event type filter (default\: package-updated)]:event:(package-outdated package-removed package-update-failed package-updated)"
   "--from-date[only fetch events which are newer than the date (default\: None)]:from_date:"
   "--limit[limit response by specified amount of events (default\: -1)]:limit:"
   "--offset[skip specified amount of events (default\: 0)]:offset:"
@@ -709,17 +649,17 @@ _shtab_ahriman_repo_triggers_defaults_added=0
 
 _shtab_ahriman_repo_update_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -745,7 +685,7 @@ _shtab_ahriman_run_defaults_added=0
 _shtab_ahriman_search_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
   "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name (default\: name)]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
   "(*):search terms, can be specified multiple times, the result will match all terms:"
 )
@@ -755,11 +695,11 @@ _shtab_ahriman_search_defaults_added=0
 
 _shtab_ahriman_service_clean_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: False)]"
-  {--chroot,--no-chroot}"[clear build chroot (default\: False)]"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]"
-  {--packages,--no-packages}"[clear directory with built packages (default\: False)]"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -767,8 +707,8 @@ _shtab_ahriman_service_clean_defaults_added=0
 
 _shtab_ahriman_service_config_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
   ":filter settings by section (default\: None):"
   ":filter settings by key (default\: None):"
 )
@@ -795,7 +735,7 @@ _shtab_ahriman_service_key_import_defaults_added=0
 
 _shtab_ahriman_service_repositories_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--id-only,--no-id-only}"[show machine readable identifier instead (default\: False)]"
+  {--id-only,--no-id-only}"[show machine readable identifier instead (default\: False)]:id_only:"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -813,10 +753,10 @@ _shtab_ahriman_service_setup_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -848,10 +788,10 @@ _shtab_ahriman_setup_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -884,7 +824,7 @@ _shtab_ahriman_status_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--ahriman[get service status itself (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
   {-s,--status}"[filter packages by status (default\: None)]:status:(unknown pending building failed success)"
   "(*)::filter status by package base (default\: None):"
 )
@@ -910,17 +850,17 @@ _shtab_ahriman_sync_defaults_added=0
 
 _shtab_ahriman_update_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -981,7 +921,7 @@ _shtab_ahriman_web_reload_defaults_added=0
 
 
 _shtab_ahriman() {
-  local context state line curcontext="$curcontext" one_or_more='(*)' remainder='(-)*:' default='*::: :->ahriman'
+  local context state line curcontext="$curcontext" one_or_more='(*)' remainder='(-)*' default='*::: :->ahriman'
 
   # Add default positional/remainder specs only if none exist, and only once per session
   if (( ! _shtab_ahriman_defaults_added )); then
@@ -1013,19 +953,13 @@ _shtab_ahriman() {
         init) _arguments -C -s $_shtab_ahriman_init_options ;;
         key-import) _arguments -C -s $_shtab_ahriman_key_import_options ;;
         package-add) _arguments -C -s $_shtab_ahriman_package_add_options ;;
-        package-archives) _arguments -C -s $_shtab_ahriman_package_archives_options ;;
         package-changes) _arguments -C -s $_shtab_ahriman_package_changes_options ;;
         package-changes-remove) _arguments -C -s $_shtab_ahriman_package_changes_remove_options ;;
         package-copy) _arguments -C -s $_shtab_ahriman_package_copy_options ;;
-        package-hold) _arguments -C -s $_shtab_ahriman_package_hold_options ;;
-        package-pkgbuild) _arguments -C -s $_shtab_ahriman_package_pkgbuild_options ;;
-        package-pkgbuild-remove) _arguments -C -s $_shtab_ahriman_package_pkgbuild_remove_options ;;
         package-remove) _arguments -C -s $_shtab_ahriman_package_remove_options ;;
-        package-rollback) _arguments -C -s $_shtab_ahriman_package_rollback_options ;;
         package-status) _arguments -C -s $_shtab_ahriman_package_status_options ;;
         package-status-remove) _arguments -C -s $_shtab_ahriman_package_status_remove_options ;;
         package-status-update) _arguments -C -s $_shtab_ahriman_package_status_update_options ;;
-        package-unhold) _arguments -C -s $_shtab_ahriman_package_unhold_options ;;
         package-update) _arguments -C -s $_shtab_ahriman_package_update_options ;;
         patch-add) _arguments -C -s $_shtab_ahriman_patch_add_options ;;
         patch-list) _arguments -C -s $_shtab_ahriman_patch_list_options ;;

pyproject.toml

@@ -1,31 +1,92 @@
 [build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
+requires = ["flit_core"]
+build-backend = "flit_core.buildapi"
 
 [project]
 name = "ahriman"
-authors = [
-    { name = "ahriman team" },
-]
-dependencies = [
-    "ahriman-core",
-    "ahriman-triggers",
-    "ahriman-web",
-]
+
 description = "ArcH linux ReposItory MANager"
-dynamic = [
-    "version",
-]
-license = { file = "COPYING" }
 readme = "README.md"
-requires-python = ">=3.14"
+
+# Actually we are using features from the latest python, however, ubuntu, which is used for CI doesn't have it
+requires-python = ">=3"
+
+license = {file = "COPYING"}
+authors = [
+    {name = "ahriman team"},
+]
+
+dependencies = [
+    "bcrypt",
+    "filelock",
+    "inflection",
+    "pyelftools",
+    "requests",
+]
+
+dynamic = ["version"]
+
+[project.optional-dependencies]
+journald = [
+    "systemd-python",
+]
+# FIXME technically this dependency is required, but in some cases we do not have access to
+# the libalpm which is required in order to install the package. Thus in case if we do not
+# really need to run the application we can move it to "optional" dependencies
+pacman = [
+    "pyalpm",
+]
+reports = [
+    "Jinja2",
+]
+s3 = [
+    "boto3",
+]
+shell = [
+    "IPython"
+]
+stats = [
+    "matplotlib",
+]
+unixsocket = [
+    "requests-unixsocket2",  # required by unix socket support
+]
+validator = [
+    "cerberus",
+]
+web = [
+    "aiohttp",
+    "aiohttp_cors",
+    "aiohttp_jinja2",
+    "aiohttp_sse",
+]
+web-auth = [
+    "ahriman[web]",
+    "aiohttp_session",
+    "aiohttp_security",
+    "cryptography",
+]
+web-docs = [
+    "ahriman[web]",
+    "aiohttp-apispec",
+    "setuptools",  # required by aiohttp-apispec
+]
+web-metrics = [
+    "ahriman[web]",
+    "aiohttp-openmetrics",
+]
+web-oauth2 = [
+    "ahriman[web-auth]",
+    "aioauth-client",
+]
+
+[project.scripts]
+ahriman = "ahriman.application.ahriman:run"
 
 [project.urls]
-Changelog = "https://github.com/arcan1s/ahriman/releases"
 Documentation = "https://ahriman.readthedocs.io/"
 Repository = "https://github.com/arcan1s/ahriman"
+Changelog = "https://github.com/arcan1s/ahriman/releases"
 
 [dependency-groups]
 check = [
@@ -35,66 +96,38 @@ check = [
     "pylint",
 ]
 docs = [
-    "ahriman-core[s3,validator]",
-    "Sphinx",
-    "argparse-manpage",
-    "pydeps",
-    "shtab",
-    "sphinx-argparse",
-    "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
+     "Sphinx",
+     "argparse-manpage",
+     "pydeps",
+     "shtab",
+     "sphinx-argparse",
+     "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
 ]
 tests = [
-    "coverage",
     "pytest",
     "pytest-aiohttp",
+    "pytest-cov",
     "pytest-helpers-namespace",
     "pytest-mock",
     "pytest-resource-path",
     "pytest-spec",
 ]
 
-[tool.hatch.build.targets.sdist]
+[tool.flit.sdist]
+include = [
+    "AUTHORS",
+    "CONTRIBUTING.md",
+    "SECURITY.md",
+    "package",
+    "frontend",
+    "subpackages.py",
+    "web.png",
+]
 exclude = [
-    "/.github",
-    "/archlinux",
-    "/docker",
-    "/docs",
-    "/recipes",
-    "/tools",
-    "tests",
-    "/.bandit.toml",
-    "/.dockerignore",
-    "/.pylint.toml",
-    "/.pytest.toml",
-    "/.readthedocs.yml",
-    "/conftest.py",
-    "/github-logo.png",
-    "/tox.toml",
-    "/web.png",
+    "package/archlinux",
+    "frontend/node_modules",
+    "frontend/package-lock.json",
 ]
 
-[tool.hatch.build.targets.wheel]
-bypass-selection = true
-
-[tool.hatch.envs.default]
-workspace.members = [
-    { path = "ahriman-core" },
-    { path = "ahriman-triggers" },
-    { path = "ahriman-web" },
-]
-
-[tool.hatch.version]
-path = "ahriman-core/src/ahriman/__init__.py"
-
-[tool.uv.sources]
-ahriman-core = { workspace = true, editable = false }
-ahriman-pytest-plugins = { path = "tools/pytest_plugins", editable = true }
-ahriman-triggers = { workspace = true, editable = false }
-ahriman-web = { workspace = true, editable = false }
-
-[tool.uv.workspace]
-members = [
-    "ahriman-core",
-    "ahriman-triggers",
-    "ahriman-web",
-]
+[tool.flit.external-data]
+directory = "package"

recipes/check/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -25,9 +8,9 @@ services:
       AHRIMAN_OUTPUT: console
       AHRIMAN_PASSWORD: ${AHRIMAN_PASSWORD}
       AHRIMAN_PORT: 8080
-      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | ahriman user-add demo -R full
+      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | sudo -u ahriman ahriman user-add demo -R full
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     configs:
       - source: service
@@ -39,10 +22,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     healthcheck:
       test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
@@ -56,10 +37,6 @@ services:
     ports:
       - 8080:80
 
-    depends_on:
-      backend:
-        condition: service_healthy
-
     configs:
       - source: nginx
         target: /etc/nginx/conf.d/default.conf
@@ -80,7 +57,7 @@ services:
       AHRIMAN_DEBUG: yes
       AHRIMAN_OUTPUT: console
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     volumes:
       - type: volume

recipes/daemon/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -29,10 +12,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     command: repo-daemon
 

recipes/distributed-manual/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -25,9 +8,9 @@ services:
       AHRIMAN_OUTPUT: console
       AHRIMAN_PASSWORD: ${AHRIMAN_PASSWORD}
       AHRIMAN_PORT: 8080
-      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | ahriman user-add demo -R full
+      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | sudo -u ahriman ahriman user-add demo -R full
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     configs:
       - source: service
@@ -39,10 +22,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     healthcheck:
       test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
@@ -56,10 +37,6 @@ services:
     ports:
       - 8080:80
 
-    depends_on:
-      backend:
-        condition: service_healthy
-
     configs:
       - source: nginx
         target: /etc/nginx/conf.d/default.conf

recipes/distributed/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -25,9 +8,9 @@ services:
       AHRIMAN_OUTPUT: console
       AHRIMAN_PASSWORD: ${AHRIMAN_PASSWORD}
       AHRIMAN_PORT: 8080
-      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | ahriman user-add demo -R full
+      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | sudo -u ahriman ahriman user-add demo -R full
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     configs:
       - source: service
@@ -39,10 +22,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     healthcheck:
       test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
@@ -56,10 +37,6 @@ services:
     ports:
       - 8080:80
 
-    depends_on:
-      backend:
-        condition: service_healthy
-
     configs:
       - source: nginx
         target: /etc/nginx/conf.d/default.conf
@@ -85,7 +62,7 @@ services:
       AHRIMAN_OUTPUT: console
       AHRIMAN_PASSWORD: ${AHRIMAN_PASSWORD}
       AHRIMAN_PORT: 8080
-      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | ahriman user-add demo -R full
+      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | sudo -u ahriman ahriman user-add demo -R full
       AHRIMAN_REPOSITORY: ahriman-demo
       AHRIMAN_REPOSITORY_SERVER: http://frontend/repo/$$repo/$$arch
 

recipes/i686/Dockerfile

@@ -2,12 +2,8 @@ FROM arcan1s/ahriman:edge
 
 ENV ARCH32_KEYRING_VERSION="20231126-1.0"
 
-USER root
-
 RUN pacman-key --init
 
 RUN pacman -Sy --noconfirm wget && \
     wget -nv https://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-${ARCH32_KEYRING_VERSION}-any.pkg.tar.zst && \
     pacman -U --noconfirm archlinux32-keyring-${ARCH32_KEYRING_VERSION}-any.pkg.tar.zst
-
-USER ahriman

recipes/i686/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: ahriman-i686
     build: .
@@ -29,9 +12,9 @@ services:
       AHRIMAN_PACMAN_MIRROR: https://de.mirror.archlinux32.org/$$arch/$$repo
       AHRIMAN_PASSWORD: ${AHRIMAN_PASSWORD}
       AHRIMAN_PORT: 8080
-      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | ahriman user-add demo -R full
+      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | sudo -u ahriman ahriman user-add demo -R full
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     configs:
       - source: makepkg
@@ -47,10 +30,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     healthcheck:
       test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
@@ -64,10 +45,6 @@ services:
     ports:
       - 8080:80
 
-    depends_on:
-      backend:
-        condition: service_healthy
-
     configs:
       - source: nginx
         target: /etc/nginx/conf.d/default.conf

recipes/index/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -33,10 +16,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     command: repo-report
 

recipes/multirepo/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -25,10 +8,10 @@ services:
       AHRIMAN_OUTPUT: console
       AHRIMAN_PASSWORD: ${AHRIMAN_PASSWORD}
       AHRIMAN_PORT: 8080
-      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | ahriman user-add demo -R full
+      AHRIMAN_POSTSETUP_COMMAND: (cat /run/secrets/password; echo; cat /run/secrets/password) | sudo -u ahriman ahriman user-add demo -R full
       AHRIMAN_PRESETUP_COMMAND: ahriman --architecture x86_64 --repository another-demo service-setup --build-as-user ahriman --packager 'ahriman bot <ahriman@example.com>'
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     configs:
       - source: service
@@ -40,10 +23,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     healthcheck:
       test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
@@ -57,10 +38,6 @@ services:
     ports:
       - 8080:80
 
-    depends_on:
-      backend:
-        condition: service_healthy
-
     configs:
       - source: nginx
         target: /etc/nginx/conf.d/default.conf

recipes/oauth/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -26,9 +9,9 @@ services:
       AHRIMAN_OAUTH_CLIENT_SECRET: ${AHRIMAN_OAUTH_CLIENT_SECRET}
       AHRIMAN_OUTPUT: console
       AHRIMAN_PORT: 8080
-      AHRIMAN_POSTSETUP_COMMAND: ahriman user-add ${AHRIMAN_OAUTH_USER} -R full -p ""
+      AHRIMAN_POSTSETUP_COMMAND: sudo -u ahriman ahriman user-add ${AHRIMAN_OAUTH_USER} -R full -p ""
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     configs:
       - source: service
@@ -38,10 +21,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     healthcheck:
       test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
@@ -55,10 +36,6 @@ services:
     ports:
       - 8080:80
 
-    depends_on:
-      backend:
-        condition: service_healthy
-
     configs:
       - source: nginx
         target: /etc/nginx/conf.d/default.conf

recipes/pam/compose.yml

@@ -1,21 +1,4 @@
 services:
-  volume-init:
-    image: arcan1s/ahriman:edge
-    user: root
-
-    entrypoint: [
-      "chown",
-    ]
-    command: [
-      "ahriman:ahriman",
-      "/var/lib/ahriman",
-    ]
-
-    volumes:
-      - type: volume
-        source: repository
-        target: /var/lib/ahriman
-
   backend:
     image: arcan1s/ahriman:edge
     privileged: true
@@ -27,7 +10,7 @@ services:
       AHRIMAN_PORT: 8080
       AHRIMAN_PRESETUP_COMMAND: useradd -d / -G wheel -M demo; (cat /run/secrets/password; echo; cat /run/secrets/password) | passwd demo
       AHRIMAN_REPOSITORY: ahriman-demo
-      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman.sock
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
 
     configs:
       - source: service
@@ -39,10 +22,8 @@ services:
       - type: volume
         source: repository
         target: /var/lib/ahriman
-
-    depends_on:
-      volume-init:
-        condition: service_completed_successfully
+        volume:
+          nocopy: true
 
     healthcheck:
       test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
@@ -56,10 +37,6 @@ services:
     ports:
       - 8080:80
 
-    depends_on:
-      backend:
-        condition: service_healthy
-
     configs:
       - source: nginx
         target: /etc/nginx/conf.d/default.conf