feat: notify users about outdated password hashes used

.github/workflows/regress.yml

@@ -1,136 +0,0 @@
-name: Regress
-
-on: workflow_dispatch
-
-jobs:
-  run-regress-tests:
-
-    runs-on: ubuntu-latest
-
-    services:
-      ahriman:
-        image: arcan1s/ahriman:edge
-        env:
-          AHRIMAN_PORT: 8080
-          AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-        options: --privileged --entrypoint entrypoint-web
-        ports:
-          - 8080
-        volumes:
-          - repo:/var/lib/ahriman
-
-    container:
-      image: arcan1s/ahriman:edge
-      env:
-        AHRIMAN_DEBUG: y
-        AHRIMAN_OUTPUT: console
-        AHRIMAN_PORT: 8080
-        AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-      options: --privileged
-      volumes:
-        - repo:/var/lib/ahriman
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - run: pacman -Sy
-
-      - name: Init repository
-        run: entrypoint help
-
-      - name: Print configuration
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            service-config
-
-      - name: Validate configuration
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            service-config-validate
-
-      - name: Create a user
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            user-add \
-              --packager "github actions <actions@github.com>" \
-              --password ahriman \
-              --role full \
-              ahriman
-
-      - name: Fetch users
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            user-list \
-              --exit-code
-          
-      - name: Add package
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-add \
-              --exit-code \
-              --now \
-              --refresh \
-              ahriman
-
-      - name: Update status of the package
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-status-update \
-              --status failed \
-              ahriman
-
-      - name: Request status of the package
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-status \
-              --exit-code \
-              --info \
-              --status failed \
-              ahriman
-          
-      - name: Update packages
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            repo-update \
-              --exit-code \
-          || true
-
-      - name: Add patch
-        run: |
-          echo '${pkgver%%.*}' | \
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            patch-add \
-              ahriman \
-              pkgrel
-          
-      - name: Retrieve patches
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            patch-list \
-              --exit-code \
-              ahriman
-
-      - name: Rebuild packages
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            repo-rebuild \
-              --depends-on python \
-              --exit-code
-          
-      - name: Remove package
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-remove \
-              ahriman

.github/workflows/setup.yml

@@ -15,9 +15,9 @@ jobs:
 
     container:
       image: archlinux:base
-      options: --privileged -w /build
       volumes:
         - ${{ github.workspace }}:/build
+      options: --privileged -w /build
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/tests.yml

@@ -7,8 +7,6 @@ on:
   pull_request:
     branches:
       - master
-  schedule:
-    - cron: 1 0 * * *
 
 jobs:
   run-tests:
@@ -17,9 +15,9 @@ jobs:
 
     container:
       image: archlinux:base
-      options: -w /build
       volumes:
         - ${{ github.workspace }}:/build
+      options: -w /build
 
     steps:
       - uses: actions/checkout@v3

docker/Dockerfile

@@ -1,77 +1,4 @@
-# build image
-FROM archlinux:base AS build
-
-# install environment
-## create build user
-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/$(stat -c "%y" "/var/lib/pacman" | cut -d " " -f 1 | sed "s,-,/,g")/\$repo/os/\$arch" > "/etc/pacman.d/mirrorlist" && \
-    pacman -Sy
-## setup package cache
-RUN runuser -u build -- mkdir "/tmp/pkg" && \
-    echo "PKGDEST=/tmp/pkg" >> "/etc/makepkg.conf" && \
-    echo "[options]" >> "/etc/pacman.conf" && \
-    echo "CacheDir = /tmp/pkg/" >> "/etc/pacman.conf"
-
-## install anc configure sudo
-RUN pacman -S --noconfirm --asdeps sudo && \
-    echo "build ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/build"
-## copy install script
-COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
-## install package dependencies
-RUN pacman -S --noconfirm --asdeps \
-        devtools \
-        git \
-        pyalpm \
-        python-bcrypt  \
-        python-inflection \
-        python-pyelftools \
-        python-requests \
-        && \
-    pacman -S --noconfirm --asdeps \
-        base-devel \
-        python-build \
-        python-flit \
-        python-installer \
-        python-tox \
-        python-wheel \
-        && \
-    pacman -S --noconfirm --asdeps \
-        git \
-        python-aiohttp \
-        python-boto3 \
-        python-cerberus \
-        python-cryptography \
-        python-jinja \
-        python-systemd \
-        rsync \
-        && \
-    runuser -u build -- install-aur-package \
-        python-aioauth-client \
-        python-sphinx-typlog-theme \
-        python-webargs \
-        python-aiohttp-apispec-git \
-        python-aiohttp-cors \
-        python-aiohttp-jinja2 \
-        python-aiohttp-session \
-        python-aiohttp-security \
-        python-requests-unixsocket2
-
-# install ahriman
-## copy tree
-COPY --chown=build . "/home/build/ahriman"
-## create package archive and install it
-RUN cd "/home/build/ahriman" && \
-    tox -e archive && \
-    cp ./dist/*.tar.gz "package/archlinux" && \
-    cd "package/archlinux" && \
-    runuser -u build -- makepkg --noconfirm --skipchecksums && \
-    cd / && rm -r "/home/build/ahriman"
-
-
-# main image
-FROM archlinux:base AS ahriman
+FROM archlinux:base
 
 # image configuration
 ENV AHRIMAN_ARCHITECTURE="x86_64"
@@ -96,47 +23,74 @@ ENV AHRIMAN_VALIDATE_CONFIGURATION="yes"
 ## update pacman.conf with multilib
 RUN echo "[multilib]" >> "/etc/pacman.conf" && \
     echo "Include = /etc/pacman.d/mirrorlist" >> "/etc/pacman.conf"
-## copy built packages from build image and setup repository
-COPY --from=build "/tmp/pkg" "/var/cache/pacman/pkg"
-RUN repo-add "/var/cache/pacman/pkg/core.db.tar.zst" "/var/cache/pacman/pkg/"*.pkg.tar.zst && \
-    repo-add "/var/cache/pacman/pkg/extra.db.tar.zst" && \
-    repo-add "/var/cache/pacman/pkg/multilib.db.tar.zst"
-## set local directory to use as repository and refresh database
-RUN cp "/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist.orig" && \
-    echo "Server = file:///var/cache/pacman/pkg" > "/etc/pacman.d/mirrorlist" && \
-    cp "/etc/pacman.conf" "/etc/pacman.conf.orig" && \
-    sed -i "s/SigLevel *=.*/SigLevel = Optional/g" "/etc/pacman.conf" && \
-    pacman -Sy
-## install package and its optional dependencies
-RUN pacman -S --noconfirm \
-        --assume-installed python-aiohttp-apispec=3.0.0 \
-        ahriman
+## refresh packages, install sudo and install packages for building
+RUN pacman -Syu --noconfirm sudo && \
+    pacman -S --noconfirm --asdeps fakeroot python-tox
+## create build user
+RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build && \
+    echo "build ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/build"
+COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
+## install package dependencies
 RUN pacman -S --noconfirm --asdeps \
-        python-aioauth-client \
-        python-aiohttp-apispec-git \
-        python-aiohttp-security \
-        python-aiohttp-session \
+        devtools \
+        git \
+        pyalpm \
+        python-bcrypt  \
+        python-inflection \
+        python-pyelftools \
+        python-requests \
+        && \
+    pacman -S --noconfirm --asdeps \
+        base-devel \
+        python-build \
+        python-flit \
+        python-installer \
+        python-wheel \
+        && \
+    pacman -S --noconfirm --asdeps \
+        git \
+        python-aiohttp \
         python-boto3 \
         python-cerberus \
         python-cryptography \
+        python-jinja \
         python-systemd \
-        python-requests-unixsocket2 \
         rsync \
-        sudo
+        && \
+    runuser -u build -- install-aur-package \
+        python-aioauth-client \
+        python-sphinx-typlog-theme \
+        python-webargs \
+        python-aiohttp-apispec-git \
+        python-aiohttp-cors \
+        python-aiohttp-jinja2 \
+        python-aiohttp-session \
+        python-aiohttp-security \
+        python-requests-unixsocket2
 
-## clear cache and restore system
-RUN find "/var/cache/pacman/pkg" "/var/lib/pacman/sync" -type "f,l" -delete && \
-    cp "/etc/pacman.d/mirrorlist.orig" "/etc/pacman.d/mirrorlist" && \
-    cp "/etc/pacman.conf.orig" "/etc/pacman.conf"
+## 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"
+
+# install ahriman
+## copy tree
+COPY --chown=build . "/home/build/ahriman"
+## create package archive and install it
+RUN cd "/home/build/ahriman" && \
+    tox -e archive && \
+    cp ./dist/*.tar.gz "package/archlinux" && \
+    cd "package/archlinux" && \
+    runuser -u build -- makepkg --noconfirm --skipchecksums && \
+    runuser -u build -- makepkg --packagelist | grep -v -- -debug- | pacman -U --noconfirm --nodeps - && \
+    cd / && rm -r "/home/build/ahriman"
+
+# cleanup unused
+RUN find "/var/cache/pacman/pkg" -type f -delete
+RUN pacman -Qdtq | pacman -Rscn --noconfirm -
 
 VOLUME ["/var/lib/ahriman"]
 
 # minimal runtime ahriman setup
-## 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"
 ENTRYPOINT ["entrypoint"]
 # default command
 CMD ["repo-update", "--refresh"]

docker/entrypoint-web.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-# Special workaround for running web service in github actions, must not be usually used in real environment,
-# consider running web command explicitly instead
-
-exec entrypoint web "$@"

docker/entrypoint.sh

@@ -57,9 +57,6 @@ ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
 # 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 "$@"
-
 # 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

docker/install-aur-package.sh

@@ -4,12 +4,8 @@ set -e
 
 for PACKAGE in "$@"; do
     BUILD_DIR="$(mktemp -d)"
-    # clone the remote source
     git clone https://aur.archlinux.org/"$PACKAGE".git "$BUILD_DIR"
     cd "$BUILD_DIR"
-    # checkout to the image date
-    git checkout "$(git rev-list -1 --before="$(stat -c "%y" "/var/lib/pacman" | cut -d " " -f 1)" master)"
-    # build and install the package
     makepkg --nocheck --noconfirm --install --rmdeps --syncdeps
     cd /
     rm -r "$BUILD_DIR"

docs/faq/docker.rst

@@ -16,7 +16,7 @@ The default action (in case if no arguments provided) is ``repo-update``. Basica
 
    docker run --privileged -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
-In order to make data available outside of container, you would need to mount local (parent) directory inside container by using ``-v /path/to/local/repo:/var/lib/ahriman`` argument, where ``/path/to/local/repo`` is a path to repository on local machine. In addition, you can pass own configuration overrides by using the same ``-v`` flag, e.g.:
+``--privileged`` flag is required to make mount possible inside container. In order to make data available outside of container, you would need to mount local (parent) directory inside container by using ``-v /path/to/local/repo:/var/lib/ahriman`` argument, where ``/path/to/local/repo`` is a path to repository on local machine. In addition, you can pass own configuration overrides by using the same ``-v`` flag, e.g.:
 
 .. code-block:: shell
 
@@ -30,28 +30,6 @@ The action can be specified during run, e.g.:
 
 For more details please refer to the docker FAQ.
 
-Privileged and non-privileged container
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Examples here suggest using ``--privileged`` flag which is required for the devtools and is involved in two types of operations: tmpfs mount and cgroup manipulation. Whereas it is the easiest way to operate, it might be not really secure. The other way to make devtools working is to grant required capabilities, which can be achieved by using flags:
-
-* ``--cap-add=SYS_ADMIN``, which grants permissions to operate with tmpfs for ``systemd-nspawn``.
-* ``-v /sys/fs/cgroup:/sys/fs/cgroup`` which allows access to cgroup manipulation.
-
-Thus, there are two possible ways to run the container:
-
-.. code-block:: shell
-
-   docker run --privileged arcan1s/ahriman:latest
-
-and
-
-.. code-block:: shell
-
-   docker run --cap-add=SYS_ADMIN -v /sys/fs/cgroup:/sys/fs/cgroup arcan1s/ahriman:latest
-
-but for the simplicity this FAQ will always use ``--privileged`` flag.
-
 Environment variables
 ^^^^^^^^^^^^^^^^^^^^^
 

package/archlinux/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.16.0
+pkgver=2.15.2
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

package/share/ahriman/templates/build-status/package-info-modal.jinja2

@@ -163,7 +163,7 @@
         const variableValueInput = document.createElement("input");
         variableValueInput.classList.add("form-control");
         variableValueInput.readOnly = true;
-        variableValueInput.value = JSON.stringify(variable.value);
+        variableValueInput.value = variable.value;
 
         const variableButtonRemove = document.createElement("button");
         variableButtonRemove.type = "button";

package/share/bash-completion/completions/_ahriman

@@ -1,117 +1,115 @@
 # 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-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')
+_shtab_ahriman_subparsers=('aur-search' 'search' 'help-commands-unsafe' 'help' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-changes' 'package-changes-remove' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-repositories' 'service-run' 'run' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'service-tree-migrate' 'user-add' 'user-list' 'user-remove' 'web')
 
 _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_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
 _shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help')
+_shtab_ahriman_help_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_version_option_strings=('-h' '--help')
 _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_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_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_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_remove_option_strings=('-h' '--help')
 _shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_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_status_update_option_strings=('-h' '--help' '-s' '--status')
 _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_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
 _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_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_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
+_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_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
 _shtab_ahriman_repo_report_option_strings=('-h' '--help')
+_shtab_ahriman_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_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_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_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_service_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_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_service_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_repo_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_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_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_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')
-_shtab_ahriman_service_tree_migrate_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_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_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_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')
 _shtab_ahriman_shell_option_strings=('-h' '--help')
-_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_service_tree_migrate_option_strings=('-h' '--help')
 _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_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')
+_shtab_ahriman_pos_0_choices=('aur-search' 'search' 'help-commands-unsafe' 'help' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-changes' 'package-changes-remove' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-repositories' 'service-run' 'run' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'service-tree-migrate' 'user-add' 'user-list' 'user-remove' 'web')
 _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_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_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_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _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_package_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_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_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _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_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _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_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_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')
@@ -128,21 +126,6 @@ _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
-_shtab_ahriman_add___changes_nargs=0
-_shtab_ahriman_add___no_changes_nargs=0
-_shtab_ahriman_add___dependencies_nargs=0
-_shtab_ahriman_add___no_dependencies_nargs=0
-_shtab_ahriman_add__e_nargs=0
-_shtab_ahriman_add___exit_code_nargs=0
-_shtab_ahriman_add___increment_nargs=0
-_shtab_ahriman_add___no_increment_nargs=0
-_shtab_ahriman_add__n_nargs=0
-_shtab_ahriman_add___now_nargs=0
-_shtab_ahriman_add__y_nargs=0
-_shtab_ahriman_add___refresh_nargs=0
 _shtab_ahriman_aur_search_pos_0_nargs=+
 _shtab_ahriman_aur_search__h_nargs=0
 _shtab_ahriman_aur_search___help_nargs=0
@@ -150,91 +133,26 @@ _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__h_nargs=0
-_shtab_ahriman_check___help_nargs=0
-_shtab_ahriman_check___changes_nargs=0
-_shtab_ahriman_check___no_changes_nargs=0
-_shtab_ahriman_check___check_files_nargs=0
-_shtab_ahriman_check___no_check_files_nargs=0
-_shtab_ahriman_check__e_nargs=0
-_shtab_ahriman_check___exit_code_nargs=0
-_shtab_ahriman_check___vcs_nargs=0
-_shtab_ahriman_check___no_vcs_nargs=0
-_shtab_ahriman_check__y_nargs=0
-_shtab_ahriman_check___refresh_nargs=0
-_shtab_ahriman_clean__h_nargs=0
-_shtab_ahriman_clean___help_nargs=0
-_shtab_ahriman_clean___cache_nargs=0
-_shtab_ahriman_clean___no_cache_nargs=0
-_shtab_ahriman_clean___chroot_nargs=0
-_shtab_ahriman_clean___no_chroot_nargs=0
-_shtab_ahriman_clean___manual_nargs=0
-_shtab_ahriman_clean___no_manual_nargs=0
-_shtab_ahriman_clean___packages_nargs=0
-_shtab_ahriman_clean___no_packages_nargs=0
-_shtab_ahriman_clean___pacman_nargs=0
-_shtab_ahriman_clean___no_pacman_nargs=0
-_shtab_ahriman_config__h_nargs=0
-_shtab_ahriman_config___help_nargs=0
-_shtab_ahriman_config___info_nargs=0
-_shtab_ahriman_config___no_info_nargs=0
-_shtab_ahriman_config___secure_nargs=0
-_shtab_ahriman_config___no_secure_nargs=0
-_shtab_ahriman_config_validate__h_nargs=0
-_shtab_ahriman_config_validate___help_nargs=0
-_shtab_ahriman_config_validate__e_nargs=0
-_shtab_ahriman_config_validate___exit_code_nargs=0
-_shtab_ahriman_copy_pos_1_nargs=+
-_shtab_ahriman_copy__h_nargs=0
-_shtab_ahriman_copy___help_nargs=0
-_shtab_ahriman_copy__e_nargs=0
-_shtab_ahriman_copy___exit_code_nargs=0
-_shtab_ahriman_copy___remove_nargs=0
-_shtab_ahriman_daemon__h_nargs=0
-_shtab_ahriman_daemon___help_nargs=0
-_shtab_ahriman_daemon___aur_nargs=0
-_shtab_ahriman_daemon___no_aur_nargs=0
-_shtab_ahriman_daemon___changes_nargs=0
-_shtab_ahriman_daemon___no_changes_nargs=0
-_shtab_ahriman_daemon___check_files_nargs=0
-_shtab_ahriman_daemon___no_check_files_nargs=0
-_shtab_ahriman_daemon___dependencies_nargs=0
-_shtab_ahriman_daemon___no_dependencies_nargs=0
-_shtab_ahriman_daemon___dry_run_nargs=0
-_shtab_ahriman_daemon___increment_nargs=0
-_shtab_ahriman_daemon___no_increment_nargs=0
-_shtab_ahriman_daemon___local_nargs=0
-_shtab_ahriman_daemon___no_local_nargs=0
-_shtab_ahriman_daemon___manual_nargs=0
-_shtab_ahriman_daemon___no_manual_nargs=0
-_shtab_ahriman_daemon___partitions_nargs=0
-_shtab_ahriman_daemon___no_partitions_nargs=0
-_shtab_ahriman_daemon___vcs_nargs=0
-_shtab_ahriman_daemon___no_vcs_nargs=0
-_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_search_pos_0_nargs=+
+_shtab_ahriman_search__h_nargs=0
+_shtab_ahriman_search___help_nargs=0
+_shtab_ahriman_search__e_nargs=0
+_shtab_ahriman_search___exit_code_nargs=0
+_shtab_ahriman_search___info_nargs=0
+_shtab_ahriman_search___no_info_nargs=0
 _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__h_nargs=0
+_shtab_ahriman_help___help_nargs=0
 _shtab_ahriman_help_updates__h_nargs=0
 _shtab_ahriman_help_updates___help_nargs=0
 _shtab_ahriman_help_updates__e_nargs=0
 _shtab_ahriman_help_updates___exit_code_nargs=0
 _shtab_ahriman_help_version__h_nargs=0
 _shtab_ahriman_help_version___help_nargs=0
-_shtab_ahriman_init__h_nargs=0
-_shtab_ahriman_init___help_nargs=0
-_shtab_ahriman_init___generate_salt_nargs=0
-_shtab_ahriman_init___no_generate_salt_nargs=0
-_shtab_ahriman_init___makeflags_jobs_nargs=0
-_shtab_ahriman_init___no_makeflags_jobs_nargs=0
-_shtab_ahriman_init___multilib_nargs=0
-_shtab_ahriman_init___no_multilib_nargs=0
-_shtab_ahriman_key_import__h_nargs=0
-_shtab_ahriman_key_import___help_nargs=0
+_shtab_ahriman_version__h_nargs=0
+_shtab_ahriman_version___help_nargs=0
 _shtab_ahriman_package_add_pos_0_nargs=+
 _shtab_ahriman_package_add__h_nargs=0
 _shtab_ahriman_package_add___help_nargs=0
@@ -250,35 +168,21 @@ _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_changes__h_nargs=0
-_shtab_ahriman_package_changes___help_nargs=0
-_shtab_ahriman_package_changes__e_nargs=0
-_shtab_ahriman_package_changes___exit_code_nargs=0
-_shtab_ahriman_package_changes_remove__h_nargs=0
-_shtab_ahriman_package_changes_remove___help_nargs=0
-_shtab_ahriman_package_copy_pos_1_nargs=+
-_shtab_ahriman_package_copy__h_nargs=0
-_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_remove_pos_0_nargs=+
-_shtab_ahriman_package_remove__h_nargs=0
-_shtab_ahriman_package_remove___help_nargs=0
-_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
-_shtab_ahriman_package_status__e_nargs=0
-_shtab_ahriman_package_status___exit_code_nargs=0
-_shtab_ahriman_package_status___info_nargs=0
-_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__h_nargs=0
-_shtab_ahriman_package_status_update___help_nargs=0
+_shtab_ahriman_add_pos_0_nargs=+
+_shtab_ahriman_add__h_nargs=0
+_shtab_ahriman_add___help_nargs=0
+_shtab_ahriman_add___changes_nargs=0
+_shtab_ahriman_add___no_changes_nargs=0
+_shtab_ahriman_add___dependencies_nargs=0
+_shtab_ahriman_add___no_dependencies_nargs=0
+_shtab_ahriman_add__e_nargs=0
+_shtab_ahriman_add___exit_code_nargs=0
+_shtab_ahriman_add___increment_nargs=0
+_shtab_ahriman_add___no_increment_nargs=0
+_shtab_ahriman_add__n_nargs=0
+_shtab_ahriman_add___now_nargs=0
+_shtab_ahriman_add__y_nargs=0
+_shtab_ahriman_add___refresh_nargs=0
 _shtab_ahriman_package_update_pos_0_nargs=+
 _shtab_ahriman_package_update__h_nargs=0
 _shtab_ahriman_package_update___help_nargs=0
@@ -294,6 +198,43 @@ _shtab_ahriman_package_update__n_nargs=0
 _shtab_ahriman_package_update___now_nargs=0
 _shtab_ahriman_package_update__y_nargs=0
 _shtab_ahriman_package_update___refresh_nargs=0
+_shtab_ahriman_package_changes__h_nargs=0
+_shtab_ahriman_package_changes___help_nargs=0
+_shtab_ahriman_package_changes__e_nargs=0
+_shtab_ahriman_package_changes___exit_code_nargs=0
+_shtab_ahriman_package_changes_remove__h_nargs=0
+_shtab_ahriman_package_changes_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_remove_pos_0_nargs=+
+_shtab_ahriman_remove__h_nargs=0
+_shtab_ahriman_remove___help_nargs=0
+_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
+_shtab_ahriman_package_status__e_nargs=0
+_shtab_ahriman_package_status___exit_code_nargs=0
+_shtab_ahriman_package_status___info_nargs=0
+_shtab_ahriman_package_status___no_info_nargs=0
+_shtab_ahriman_status_pos_0_nargs=*
+_shtab_ahriman_status__h_nargs=0
+_shtab_ahriman_status___help_nargs=0
+_shtab_ahriman_status___ahriman_nargs=0
+_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_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__h_nargs=0
+_shtab_ahriman_package_status_update___help_nargs=0
+_shtab_ahriman_status_update_pos_0_nargs=*
+_shtab_ahriman_status_update__h_nargs=0
+_shtab_ahriman_status_update___help_nargs=0
 _shtab_ahriman_patch_add__h_nargs=0
 _shtab_ahriman_patch_add___help_nargs=0
 _shtab_ahriman_patch_list__h_nargs=0
@@ -304,20 +245,6 @@ _shtab_ahriman_patch_remove__h_nargs=0
 _shtab_ahriman_patch_remove___help_nargs=0
 _shtab_ahriman_patch_set_add__h_nargs=0
 _shtab_ahriman_patch_set_add___help_nargs=0
-_shtab_ahriman_rebuild__h_nargs=0
-_shtab_ahriman_rebuild___help_nargs=0
-_shtab_ahriman_rebuild___dry_run_nargs=0
-_shtab_ahriman_rebuild___from_database_nargs=0
-_shtab_ahriman_rebuild___increment_nargs=0
-_shtab_ahriman_rebuild___no_increment_nargs=0
-_shtab_ahriman_rebuild__e_nargs=0
-_shtab_ahriman_rebuild___exit_code_nargs=0
-_shtab_ahriman_remove_pos_0_nargs=+
-_shtab_ahriman_remove__h_nargs=0
-_shtab_ahriman_remove___help_nargs=0
-_shtab_ahriman_remove_unknown__h_nargs=0
-_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=*
@@ -333,28 +260,19 @@ _shtab_ahriman_repo_check___vcs_nargs=0
 _shtab_ahriman_repo_check___no_vcs_nargs=0
 _shtab_ahriman_repo_check__y_nargs=0
 _shtab_ahriman_repo_check___refresh_nargs=0
-_shtab_ahriman_repo_clean__h_nargs=0
-_shtab_ahriman_repo_clean___help_nargs=0
-_shtab_ahriman_repo_clean___cache_nargs=0
-_shtab_ahriman_repo_clean___no_cache_nargs=0
-_shtab_ahriman_repo_clean___chroot_nargs=0
-_shtab_ahriman_repo_clean___no_chroot_nargs=0
-_shtab_ahriman_repo_clean___manual_nargs=0
-_shtab_ahriman_repo_clean___no_manual_nargs=0
-_shtab_ahriman_repo_clean___packages_nargs=0
-_shtab_ahriman_repo_clean___no_packages_nargs=0
-_shtab_ahriman_repo_clean___pacman_nargs=0
-_shtab_ahriman_repo_clean___no_pacman_nargs=0
-_shtab_ahriman_repo_config__h_nargs=0
-_shtab_ahriman_repo_config___help_nargs=0
-_shtab_ahriman_repo_config___info_nargs=0
-_shtab_ahriman_repo_config___no_info_nargs=0
-_shtab_ahriman_repo_config___secure_nargs=0
-_shtab_ahriman_repo_config___no_secure_nargs=0
-_shtab_ahriman_repo_config_validate__h_nargs=0
-_shtab_ahriman_repo_config_validate___help_nargs=0
-_shtab_ahriman_repo_config_validate__e_nargs=0
-_shtab_ahriman_repo_config_validate___exit_code_nargs=0
+_shtab_ahriman_check_pos_0_nargs=*
+_shtab_ahriman_check__h_nargs=0
+_shtab_ahriman_check___help_nargs=0
+_shtab_ahriman_check___changes_nargs=0
+_shtab_ahriman_check___no_changes_nargs=0
+_shtab_ahriman_check___check_files_nargs=0
+_shtab_ahriman_check___no_check_files_nargs=0
+_shtab_ahriman_check__e_nargs=0
+_shtab_ahriman_check___exit_code_nargs=0
+_shtab_ahriman_check___vcs_nargs=0
+_shtab_ahriman_check___no_vcs_nargs=0
+_shtab_ahriman_check__y_nargs=0
+_shtab_ahriman_check___refresh_nargs=0
 _shtab_ahriman_repo_create_keyring__h_nargs=0
 _shtab_ahriman_repo_create_keyring___help_nargs=0
 _shtab_ahriman_repo_create_mirrorlist__h_nargs=0
@@ -382,14 +300,29 @@ _shtab_ahriman_repo_daemon___vcs_nargs=0
 _shtab_ahriman_repo_daemon___no_vcs_nargs=0
 _shtab_ahriman_repo_daemon__y_nargs=0
 _shtab_ahriman_repo_daemon___refresh_nargs=0
-_shtab_ahriman_repo_init__h_nargs=0
-_shtab_ahriman_repo_init___help_nargs=0
-_shtab_ahriman_repo_init___generate_salt_nargs=0
-_shtab_ahriman_repo_init___no_generate_salt_nargs=0
-_shtab_ahriman_repo_init___makeflags_jobs_nargs=0
-_shtab_ahriman_repo_init___no_makeflags_jobs_nargs=0
-_shtab_ahriman_repo_init___multilib_nargs=0
-_shtab_ahriman_repo_init___no_multilib_nargs=0
+_shtab_ahriman_daemon__h_nargs=0
+_shtab_ahriman_daemon___help_nargs=0
+_shtab_ahriman_daemon___aur_nargs=0
+_shtab_ahriman_daemon___no_aur_nargs=0
+_shtab_ahriman_daemon___changes_nargs=0
+_shtab_ahriman_daemon___no_changes_nargs=0
+_shtab_ahriman_daemon___check_files_nargs=0
+_shtab_ahriman_daemon___no_check_files_nargs=0
+_shtab_ahriman_daemon___dependencies_nargs=0
+_shtab_ahriman_daemon___no_dependencies_nargs=0
+_shtab_ahriman_daemon___dry_run_nargs=0
+_shtab_ahriman_daemon___increment_nargs=0
+_shtab_ahriman_daemon___no_increment_nargs=0
+_shtab_ahriman_daemon___local_nargs=0
+_shtab_ahriman_daemon___no_local_nargs=0
+_shtab_ahriman_daemon___manual_nargs=0
+_shtab_ahriman_daemon___no_manual_nargs=0
+_shtab_ahriman_daemon___partitions_nargs=0
+_shtab_ahriman_daemon___no_partitions_nargs=0
+_shtab_ahriman_daemon___vcs_nargs=0
+_shtab_ahriman_daemon___no_vcs_nargs=0
+_shtab_ahriman_daemon__y_nargs=0
+_shtab_ahriman_daemon___refresh_nargs=0
 _shtab_ahriman_repo_rebuild__h_nargs=0
 _shtab_ahriman_repo_rebuild___help_nargs=0
 _shtab_ahriman_repo_rebuild___dry_run_nargs=0
@@ -398,30 +331,40 @@ _shtab_ahriman_repo_rebuild___increment_nargs=0
 _shtab_ahriman_repo_rebuild___no_increment_nargs=0
 _shtab_ahriman_repo_rebuild__e_nargs=0
 _shtab_ahriman_repo_rebuild___exit_code_nargs=0
+_shtab_ahriman_rebuild__h_nargs=0
+_shtab_ahriman_rebuild___help_nargs=0
+_shtab_ahriman_rebuild___dry_run_nargs=0
+_shtab_ahriman_rebuild___from_database_nargs=0
+_shtab_ahriman_rebuild___increment_nargs=0
+_shtab_ahriman_rebuild___no_increment_nargs=0
+_shtab_ahriman_rebuild__e_nargs=0
+_shtab_ahriman_rebuild___exit_code_nargs=0
 _shtab_ahriman_repo_remove_unknown__h_nargs=0
 _shtab_ahriman_repo_remove_unknown___help_nargs=0
 _shtab_ahriman_repo_remove_unknown___dry_run_nargs=0
+_shtab_ahriman_remove_unknown__h_nargs=0
+_shtab_ahriman_remove_unknown___help_nargs=0
+_shtab_ahriman_remove_unknown___dry_run_nargs=0
 _shtab_ahriman_repo_report__h_nargs=0
 _shtab_ahriman_repo_report___help_nargs=0
+_shtab_ahriman_report__h_nargs=0
+_shtab_ahriman_report___help_nargs=0
 _shtab_ahriman_repo_restore__h_nargs=0
 _shtab_ahriman_repo_restore___help_nargs=0
-_shtab_ahriman_repo_setup__h_nargs=0
-_shtab_ahriman_repo_setup___help_nargs=0
-_shtab_ahriman_repo_setup___generate_salt_nargs=0
-_shtab_ahriman_repo_setup___no_generate_salt_nargs=0
-_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__h_nargs=0
 _shtab_ahriman_repo_sign___help_nargs=0
+_shtab_ahriman_sign_pos_0_nargs=*
+_shtab_ahriman_sign__h_nargs=0
+_shtab_ahriman_sign___help_nargs=0
 _shtab_ahriman_repo_statistics__h_nargs=0
 _shtab_ahriman_repo_statistics___help_nargs=0
 _shtab_ahriman_repo_status_update__h_nargs=0
 _shtab_ahriman_repo_status_update___help_nargs=0
 _shtab_ahriman_repo_sync__h_nargs=0
 _shtab_ahriman_repo_sync___help_nargs=0
+_shtab_ahriman_sync__h_nargs=0
+_shtab_ahriman_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=*
@@ -451,91 +394,6 @@ _shtab_ahriman_repo_update___vcs_nargs=0
 _shtab_ahriman_repo_update___no_vcs_nargs=0
 _shtab_ahriman_repo_update__y_nargs=0
 _shtab_ahriman_repo_update___refresh_nargs=0
-_shtab_ahriman_report__h_nargs=0
-_shtab_ahriman_report___help_nargs=0
-_shtab_ahriman_run_pos_0_nargs=+
-_shtab_ahriman_run__h_nargs=0
-_shtab_ahriman_run___help_nargs=0
-_shtab_ahriman_search_pos_0_nargs=+
-_shtab_ahriman_search__h_nargs=0
-_shtab_ahriman_search___help_nargs=0
-_shtab_ahriman_search__e_nargs=0
-_shtab_ahriman_search___exit_code_nargs=0
-_shtab_ahriman_search___info_nargs=0
-_shtab_ahriman_search___no_info_nargs=0
-_shtab_ahriman_service_clean__h_nargs=0
-_shtab_ahriman_service_clean___help_nargs=0
-_shtab_ahriman_service_clean___cache_nargs=0
-_shtab_ahriman_service_clean___no_cache_nargs=0
-_shtab_ahriman_service_clean___chroot_nargs=0
-_shtab_ahriman_service_clean___no_chroot_nargs=0
-_shtab_ahriman_service_clean___manual_nargs=0
-_shtab_ahriman_service_clean___no_manual_nargs=0
-_shtab_ahriman_service_clean___packages_nargs=0
-_shtab_ahriman_service_clean___no_packages_nargs=0
-_shtab_ahriman_service_clean___pacman_nargs=0
-_shtab_ahriman_service_clean___no_pacman_nargs=0
-_shtab_ahriman_service_config__h_nargs=0
-_shtab_ahriman_service_config___help_nargs=0
-_shtab_ahriman_service_config___info_nargs=0
-_shtab_ahriman_service_config___no_info_nargs=0
-_shtab_ahriman_service_config___secure_nargs=0
-_shtab_ahriman_service_config___no_secure_nargs=0
-_shtab_ahriman_service_config_validate__h_nargs=0
-_shtab_ahriman_service_config_validate___help_nargs=0
-_shtab_ahriman_service_config_validate__e_nargs=0
-_shtab_ahriman_service_config_validate___exit_code_nargs=0
-_shtab_ahriman_service_key_import__h_nargs=0
-_shtab_ahriman_service_key_import___help_nargs=0
-_shtab_ahriman_service_repositories__h_nargs=0
-_shtab_ahriman_service_repositories___help_nargs=0
-_shtab_ahriman_service_repositories___id_only_nargs=0
-_shtab_ahriman_service_repositories___no_id_only_nargs=0
-_shtab_ahriman_service_run_pos_0_nargs=+
-_shtab_ahriman_service_run__h_nargs=0
-_shtab_ahriman_service_run___help_nargs=0
-_shtab_ahriman_service_setup__h_nargs=0
-_shtab_ahriman_service_setup___help_nargs=0
-_shtab_ahriman_service_setup___generate_salt_nargs=0
-_shtab_ahriman_service_setup___no_generate_salt_nargs=0
-_shtab_ahriman_service_setup___makeflags_jobs_nargs=0
-_shtab_ahriman_service_setup___no_makeflags_jobs_nargs=0
-_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
-_shtab_ahriman_setup___help_nargs=0
-_shtab_ahriman_setup___generate_salt_nargs=0
-_shtab_ahriman_setup___no_generate_salt_nargs=0
-_shtab_ahriman_setup___makeflags_jobs_nargs=0
-_shtab_ahriman_setup___no_makeflags_jobs_nargs=0
-_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_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__h_nargs=0
-_shtab_ahriman_status___help_nargs=0
-_shtab_ahriman_status___ahriman_nargs=0
-_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__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__h_nargs=0
 _shtab_ahriman_update___help_nargs=0
@@ -560,6 +418,136 @@ _shtab_ahriman_update___vcs_nargs=0
 _shtab_ahriman_update___no_vcs_nargs=0
 _shtab_ahriman_update__y_nargs=0
 _shtab_ahriman_update___refresh_nargs=0
+_shtab_ahriman_service_clean__h_nargs=0
+_shtab_ahriman_service_clean___help_nargs=0
+_shtab_ahriman_service_clean___cache_nargs=0
+_shtab_ahriman_service_clean___no_cache_nargs=0
+_shtab_ahriman_service_clean___chroot_nargs=0
+_shtab_ahriman_service_clean___no_chroot_nargs=0
+_shtab_ahriman_service_clean___manual_nargs=0
+_shtab_ahriman_service_clean___no_manual_nargs=0
+_shtab_ahriman_service_clean___packages_nargs=0
+_shtab_ahriman_service_clean___no_packages_nargs=0
+_shtab_ahriman_service_clean___pacman_nargs=0
+_shtab_ahriman_service_clean___no_pacman_nargs=0
+_shtab_ahriman_clean__h_nargs=0
+_shtab_ahriman_clean___help_nargs=0
+_shtab_ahriman_clean___cache_nargs=0
+_shtab_ahriman_clean___no_cache_nargs=0
+_shtab_ahriman_clean___chroot_nargs=0
+_shtab_ahriman_clean___no_chroot_nargs=0
+_shtab_ahriman_clean___manual_nargs=0
+_shtab_ahriman_clean___no_manual_nargs=0
+_shtab_ahriman_clean___packages_nargs=0
+_shtab_ahriman_clean___no_packages_nargs=0
+_shtab_ahriman_clean___pacman_nargs=0
+_shtab_ahriman_clean___no_pacman_nargs=0
+_shtab_ahriman_repo_clean__h_nargs=0
+_shtab_ahriman_repo_clean___help_nargs=0
+_shtab_ahriman_repo_clean___cache_nargs=0
+_shtab_ahriman_repo_clean___no_cache_nargs=0
+_shtab_ahriman_repo_clean___chroot_nargs=0
+_shtab_ahriman_repo_clean___no_chroot_nargs=0
+_shtab_ahriman_repo_clean___manual_nargs=0
+_shtab_ahriman_repo_clean___no_manual_nargs=0
+_shtab_ahriman_repo_clean___packages_nargs=0
+_shtab_ahriman_repo_clean___no_packages_nargs=0
+_shtab_ahriman_repo_clean___pacman_nargs=0
+_shtab_ahriman_repo_clean___no_pacman_nargs=0
+_shtab_ahriman_service_config__h_nargs=0
+_shtab_ahriman_service_config___help_nargs=0
+_shtab_ahriman_service_config___info_nargs=0
+_shtab_ahriman_service_config___no_info_nargs=0
+_shtab_ahriman_service_config___secure_nargs=0
+_shtab_ahriman_service_config___no_secure_nargs=0
+_shtab_ahriman_config__h_nargs=0
+_shtab_ahriman_config___help_nargs=0
+_shtab_ahriman_config___info_nargs=0
+_shtab_ahriman_config___no_info_nargs=0
+_shtab_ahriman_config___secure_nargs=0
+_shtab_ahriman_config___no_secure_nargs=0
+_shtab_ahriman_repo_config__h_nargs=0
+_shtab_ahriman_repo_config___help_nargs=0
+_shtab_ahriman_repo_config___info_nargs=0
+_shtab_ahriman_repo_config___no_info_nargs=0
+_shtab_ahriman_repo_config___secure_nargs=0
+_shtab_ahriman_repo_config___no_secure_nargs=0
+_shtab_ahriman_service_config_validate__h_nargs=0
+_shtab_ahriman_service_config_validate___help_nargs=0
+_shtab_ahriman_service_config_validate__e_nargs=0
+_shtab_ahriman_service_config_validate___exit_code_nargs=0
+_shtab_ahriman_config_validate__h_nargs=0
+_shtab_ahriman_config_validate___help_nargs=0
+_shtab_ahriman_config_validate__e_nargs=0
+_shtab_ahriman_config_validate___exit_code_nargs=0
+_shtab_ahriman_repo_config_validate__h_nargs=0
+_shtab_ahriman_repo_config_validate___help_nargs=0
+_shtab_ahriman_repo_config_validate__e_nargs=0
+_shtab_ahriman_repo_config_validate___exit_code_nargs=0
+_shtab_ahriman_service_key_import__h_nargs=0
+_shtab_ahriman_service_key_import___help_nargs=0
+_shtab_ahriman_key_import__h_nargs=0
+_shtab_ahriman_key_import___help_nargs=0
+_shtab_ahriman_service_repositories__h_nargs=0
+_shtab_ahriman_service_repositories___help_nargs=0
+_shtab_ahriman_service_repositories___id_only_nargs=0
+_shtab_ahriman_service_repositories___no_id_only_nargs=0
+_shtab_ahriman_service_run_pos_0_nargs=+
+_shtab_ahriman_service_run__h_nargs=0
+_shtab_ahriman_service_run___help_nargs=0
+_shtab_ahriman_run_pos_0_nargs=+
+_shtab_ahriman_run__h_nargs=0
+_shtab_ahriman_run___help_nargs=0
+_shtab_ahriman_service_setup__h_nargs=0
+_shtab_ahriman_service_setup___help_nargs=0
+_shtab_ahriman_service_setup___generate_salt_nargs=0
+_shtab_ahriman_service_setup___no_generate_salt_nargs=0
+_shtab_ahriman_service_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_service_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_service_setup___multilib_nargs=0
+_shtab_ahriman_service_setup___no_multilib_nargs=0
+_shtab_ahriman_init__h_nargs=0
+_shtab_ahriman_init___help_nargs=0
+_shtab_ahriman_init___generate_salt_nargs=0
+_shtab_ahriman_init___no_generate_salt_nargs=0
+_shtab_ahriman_init___makeflags_jobs_nargs=0
+_shtab_ahriman_init___no_makeflags_jobs_nargs=0
+_shtab_ahriman_init___multilib_nargs=0
+_shtab_ahriman_init___no_multilib_nargs=0
+_shtab_ahriman_repo_init__h_nargs=0
+_shtab_ahriman_repo_init___help_nargs=0
+_shtab_ahriman_repo_init___generate_salt_nargs=0
+_shtab_ahriman_repo_init___no_generate_salt_nargs=0
+_shtab_ahriman_repo_init___makeflags_jobs_nargs=0
+_shtab_ahriman_repo_init___no_makeflags_jobs_nargs=0
+_shtab_ahriman_repo_init___multilib_nargs=0
+_shtab_ahriman_repo_init___no_multilib_nargs=0
+_shtab_ahriman_repo_setup__h_nargs=0
+_shtab_ahriman_repo_setup___help_nargs=0
+_shtab_ahriman_repo_setup___generate_salt_nargs=0
+_shtab_ahriman_repo_setup___no_generate_salt_nargs=0
+_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_setup__h_nargs=0
+_shtab_ahriman_setup___help_nargs=0
+_shtab_ahriman_setup___generate_salt_nargs=0
+_shtab_ahriman_setup___no_generate_salt_nargs=0
+_shtab_ahriman_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_setup___multilib_nargs=0
+_shtab_ahriman_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_shell__h_nargs=0
+_shtab_ahriman_shell___help_nargs=0
+_shtab_ahriman_shell__v_nargs=0
+_shtab_ahriman_shell___verbose_nargs=0
+_shtab_ahriman_service_tree_migrate__h_nargs=0
+_shtab_ahriman_service_tree_migrate___help_nargs=0
 _shtab_ahriman_user_add__h_nargs=0
 _shtab_ahriman_user_add___help_nargs=0
 _shtab_ahriman_user_list__h_nargs=0
@@ -568,8 +556,6 @@ _shtab_ahriman_user_list__e_nargs=0
 _shtab_ahriman_user_list___exit_code_nargs=0
 _shtab_ahriman_user_remove__h_nargs=0
 _shtab_ahriman_user_remove___help_nargs=0
-_shtab_ahriman_version__h_nargs=0
-_shtab_ahriman_version___help_nargs=0
 _shtab_ahriman_web__h_nargs=0
 _shtab_ahriman_web___help_nargs=0
 

package/share/man/man1/ahriman.1

@@ -1,9 +1,9 @@
-.TH AHRIMAN "1" "2024\-12\-01" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2024\-09\-26" "ahriman" "Generated Python Manual"
 .SH NAME
 ahriman
 .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-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} ...
+[-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] {aur-search,search,help-commands-unsafe,help,help-updates,help-version,version,package-add,add,package-update,package-changes,package-changes-remove,package-remove,remove,package-status,status,package-status-remove,package-status-update,status-update,patch-add,patch-list,patch-remove,patch-set-add,repo-backup,repo-check,check,repo-create-keyring,repo-create-mirrorlist,repo-daemon,daemon,repo-rebuild,rebuild,repo-remove-unknown,remove-unknown,repo-report,report,repo-restore,repo-sign,sign,repo-statistics,repo-status-update,repo-sync,sync,repo-tree,repo-triggers,repo-update,update,service-clean,clean,repo-clean,service-config,config,repo-config,service-config-validate,config-validate,repo-config-validate,service-key-import,key-import,service-repositories,service-run,run,service-setup,init,repo-init,repo-setup,setup,service-shell,shell,service-tree-migrate,user-add,user-list,user-remove,web} ...
 .SH DESCRIPTION
 ArcH linux ReposItory MANager
 
@@ -59,12 +59,12 @@ COMMAND
 \fBahriman\fR \fI\,aur\-search\/\fR
 search for package
 .TP
-\fBahriman\fR \fI\,help\/\fR
-show help message
-.TP
 \fBahriman\fR \fI\,help\-commands\-unsafe\/\fR
 list unsafe commands
 .TP
+\fBahriman\fR \fI\,help\/\fR
+show help message
+.TP
 \fBahriman\fR \fI\,help\-updates\/\fR
 check for service updates
 .TP
@@ -80,9 +80,6 @@ get package changes
 \fBahriman\fR \fI\,package\-changes\-remove\/\fR
 remove package changes
 .TP
-\fBahriman\fR \fI\,package\-copy\/\fR
-copy package from another repository
-.TP
 \fBahriman\fR \fI\,package\-remove\/\fR
 remove package
 .TP
@@ -219,15 +216,6 @@ show additional package information
 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
 
-.SH COMMAND \fI\,'ahriman help'\/\fR
-usage: ahriman help [\-h] [subcommand]
-
-show help message for application or command and exit
-
-.TP
-\fBsubcommand\fR
-show help message for specific command
-
 .SH COMMAND \fI\,'ahriman help\-commands\-unsafe'\/\fR
 usage: ahriman help\-commands\-unsafe [\-h] [subcommand ...]
 
@@ -238,6 +226,15 @@ list unsafe commands as defined in default args
 instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1
 otherwise
 
+.SH COMMAND \fI\,'ahriman help'\/\fR
+usage: ahriman help [\-h] [subcommand]
+
+show help message for application or command and exit
+
+.TP
+\fBsubcommand\fR
+show help message for specific command
+
 .SH COMMAND \fI\,'ahriman help\-updates'\/\fR
 usage: ahriman help\-updates [\-h] [\-e]
 
@@ -325,28 +322,6 @@ remove the package changes stored remotely
 \fBpackage\fR
 package base
 
-.SH COMMAND \fI\,'ahriman package\-copy'\/\fR
-usage: ahriman package\-copy [\-h] [\-e] [\-\-remove] source package [package ...]
-
-copy package and its metadata from another repository
-
-.TP
-\fBsource\fR
-source repository name
-
-.TP
-\fBpackage\fR
-package base
-
-.SH OPTIONS \fI\,'ahriman package\-copy'\/\fR
-.TP
-\fB\-e\fR, \fB\-\-exit\-code\fR
-return non\-zero exit status if result is empty
-
-.TP
-\fB\-\-remove\fR
-remove package from the source repository after
-
 .SH COMMAND \fI\,'ahriman package\-remove'\/\fR
 usage: ahriman package\-remove [\-h] package [package ...]
 

package/share/zsh/site-functions/_ahriman

@@ -11,7 +11,6 @@ _shtab_ahriman_commands() {
     "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"
@@ -22,7 +21,6 @@ _shtab_ahriman_commands() {
     "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"
@@ -153,14 +151,6 @@ _shtab_ahriman_config_validate_options=(
   {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
 )
 
-_shtab_ahriman_copy_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  "--remove[remove package from the source repository after (default\: False)]"
-  ":source repository name:"
-  "(*):package base:"
-)
-
 _shtab_ahriman_daemon_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
@@ -244,14 +234,6 @@ _shtab_ahriman_package_changes_remove_options=(
   ":package base:"
 )
 
-_shtab_ahriman_package_copy_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  "--remove[remove package from the source repository after (default\: False)]"
-  ":source repository name:"
-  "(*):package base:"
-)
-
 _shtab_ahriman_package_remove_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "(*):package name or base:"
@@ -702,7 +684,6 @@ _shtab_ahriman() {
         clean) _arguments -C -s $_shtab_ahriman_clean_options ;;
         config) _arguments -C -s $_shtab_ahriman_config_options ;;
         config-validate) _arguments -C -s $_shtab_ahriman_config_validate_options ;;
-        copy) _arguments -C -s $_shtab_ahriman_copy_options ;;
         daemon) _arguments -C -s $_shtab_ahriman_daemon_options ;;
         help) _arguments -C -s $_shtab_ahriman_help_options ;;
         help-commands-unsafe) _arguments -C -s $_shtab_ahriman_help_commands_unsafe_options ;;
@@ -713,7 +694,6 @@ _shtab_ahriman() {
         package-add) _arguments -C -s $_shtab_ahriman_package_add_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-remove) _arguments -C -s $_shtab_ahriman_package_remove_options ;;
         package-status) _arguments -C -s $_shtab_ahriman_package_status_options ;;
         package-status-remove) _arguments -C -s $_shtab_ahriman_package_status_remove_options ;;

src/ahriman/__init__.py

@@ -17,4 +17,4 @@
 # 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.16.0"
+__version__ = "2.15.2"

src/ahriman/application/handlers/patch.py

@@ -198,7 +198,8 @@ class Patch(Handler):
         else:
             patch = patch_path.read_text(encoding="utf8")
         # remove spaces around the patch and parse to correct type
-        return PkgbuildPatch.parse(variable, patch.strip())
+        parsed = PkgbuildPatch.parse(patch.strip())
+        return PkgbuildPatch(variable, parsed)
 
     @staticmethod
     def patch_set_create(application: Application, package_base: str, patch: PkgbuildPatch) -> None:

src/ahriman/application/handlers/status_update.py

@@ -54,7 +54,7 @@ class StatusUpdate(Handler):
             case Action.Update if args.package:
                 # update packages statuses
                 for package in args.package:
-                    client.package_status_update(package, args.status)
+                    client.package_update(package, args.status)
             case Action.Update:
                 # update service status
                 client.status_update(args.status)

src/ahriman/core/alpm/pkgbuild_parser.py

@@ -226,7 +226,7 @@ class PkgbuildParser(shlex.shlex):
                         pass
                     case PkgbuildToken.ArrayEnds:
                         break
-                    case comment if comment.startswith(PkgbuildToken.Comment):
+                    case PkgbuildToken.Comment:
                         self.instream.readline()
                         continue
 
@@ -267,7 +267,7 @@ class PkgbuildParser(shlex.shlex):
                     counter -= 1
                     if counter == 0:
                         break
-                case comment if comment.startswith(PkgbuildToken.Comment):
+                case PkgbuildToken.Comment:
                     self.instream.readline()
 
         if not 0 < start_position < end_position:
@@ -303,7 +303,7 @@ class PkgbuildParser(shlex.shlex):
             yield PkgbuildPatch(key, value)
             return
 
-        if token.startswith(PkgbuildToken.Comment):
+        if token == PkgbuildToken.Comment:
             self.instream.readline()
             return
 

src/ahriman/core/database/operations/patch_operations.py

@@ -83,7 +83,7 @@ class PatchOperations(Operations):
         """
         def run(connection: Connection) -> list[tuple[str, PkgbuildPatch]]:
             return [
-                (row["package_base"], PkgbuildPatch.parse(row["variable"], row["patch"]))
+                (row["package_base"], PkgbuildPatch(row["variable"], row["patch"]))
                 for row in connection.execute(
                     """select * from patches where :package_base is null or package_base = :package_base""",
                     {"package_base": package_base})

src/ahriman/models/pkgbuild_patch.py

@@ -17,7 +17,6 @@
 # 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 json
 import shlex
 
 from dataclasses import dataclass, fields
@@ -43,6 +42,8 @@ class PkgbuildPatch:
     key: str | None
     value: str | list[str]
 
+    quote = shlex.quote
+
     def __post_init__(self) -> None:
         """
         remove empty key
@@ -78,11 +79,11 @@ class PkgbuildPatch:
             variable(str): variable in bash form, i.e. KEY=VALUE
 
         Returns:
-            Self: patch object
+            Self: package properties
         """
         key, *value_parts = variable.split("=", maxsplit=1)
         raw_value = next(iter(value_parts), "")  # extract raw value
-        return cls.parse(key, raw_value)
+        return cls(key, cls.parse(raw_value))
 
     @classmethod
     def from_json(cls, dump: dict[str, Any]) -> Self:
@@ -99,57 +100,21 @@ class PkgbuildPatch:
         known_fields = [pair.name for pair in fields(cls)]
         return cls(**filter_json(dump, known_fields))
 
-    @classmethod
-    def parse(cls, key: str | None, source: str | list[str]) -> Self:
+    @staticmethod
+    def parse(source: str) -> str | list[str]:
         """
         parse string value to the PKGBUILD patch value. This method simply takes string, tries to identify it as array
-        or just string and return the respective value. Functions are returned as is. Shell arrays and single values
-        are returned without quotes. If source is ``list``, then value is returned as is
+        or just string and return the respective value. Functions should be processed correctly, however, not guaranteed
 
         Args:
-            key(str | None): variable key
-            source(str): source value string to parse
+            source(str): source string to parse
 
         Returns:
-            Self: parsed patch object
+            str | list[str]: parsed value either string or list of strings
         """
-        def value() -> str | list[str]:
-            match source:
-                case function if key is not None and key.endswith("()"):
-                    # the key looks like a function, no further processing should be applied here
-                    return function
-                case list():
-                    # do not try to perform operations on the list, just return as is
-                    return source
-                case shell_array if shell_array.startswith("(") and shell_array.endswith(")"):
-                    # the source value looks like shell array, remove brackets and parse with shlex
-                    return shlex.split(shell_array[1:-1])
-                case json_array if json_array.startswith("[") and json_array.endswith("]"):
-                    # json (aka python) array, parse with json parser instead
-                    parsed: list[str] = json.loads(json_array)
-                    return parsed
-                case variable:
-                    return cls.unquote(variable)
-
-        return cls(key, value())
-
-    @staticmethod
-    def quote(source: str) -> str:
-        """
-        like :func:`shlex.quote()`, but better. The difference in this method from the library one is that it uses
-        double quotes on top level instead of single quotes to allow shell variable substitution
-
-        Args:
-            source(str): source value string to quote
-
-        Returns:
-            str: quoted string
-        """
-        if "$" in source:
-            # copy from library method with double quotes instead
-            return f"""\"{source.replace("\"", "'\"'")}\""""
-        # otherwise just return normal call
-        return shlex.quote(source)
+        if source.startswith("(") and source.endswith(")"):
+            return shlex.split(source[1:-1])  # arrays for poor
+        return PkgbuildPatch.unquote(source)
 
     @staticmethod
     def unquote(source: str) -> str:
@@ -194,14 +159,14 @@ class PkgbuildPatch:
             str: serialized key-value pair, print-friendly
         """
         if isinstance(self.value, list):  # list like
-            value = " ".join(map(self.quote, self.value))
+            value = " ".join(map(PkgbuildPatch.quote, self.value))
             return f"""{self.key}=({value})"""
         if self.is_plain_diff:  # no additional logic for plain diffs
             return self.value
         # we suppose that function values are only supported in string-like values
         if self.is_function:
             return f"{self.key} {self.value}"  # no quoting enabled here
-        return f"""{self.key}={self.quote(self.value)}"""
+        return f"""{self.key}={PkgbuildPatch.quote(self.value)}"""
 
     def substitute(self, variables: dict[str, str]) -> str | list[str]:
         """

src/ahriman/models/user.py

@@ -32,7 +32,6 @@ class User:
     authorized web user model
 
     Attributes:
-        SUPPORTED_ALGOS(set[str]): (class attribute) list of the supported hashing algorithms
         username(str): username
         password(str): hashed user password with salt
         access(UserAccess): user role
@@ -69,8 +68,6 @@ class User:
     packager_id: str | None = None
     key: str | None = None
 
-    SUPPORTED_ALGOS = {"$2$", "$2a$", "$2x$", "$2y$", "$2b$"}
-
     def __post_init__(self) -> None:
         """
         remove empty fields
@@ -78,19 +75,6 @@ class User:
         object.__setattr__(self, "packager_id", self.packager_id or None)
         object.__setattr__(self, "key", self.key or None)
 
-    @property
-    def algo(self) -> str | None:
-        """
-        extract algorithm used for the hashing password
-
-        Returns:
-            str | None: first part of password hash (e.g. ``$2$``) if available or ``None`` otherwise
-        """
-        if not self.password:
-            return None
-        algo = next(segment for segment in self.password.split("$") if segment)
-        return f"${algo}$"
-
     @staticmethod
     def generate_password(length: int) -> str:
         """
@@ -114,12 +98,9 @@ class User:
 
         Returns:
             bool: ``True`` in case if password matches, ``False`` otherwise
-
-        Raises:
-            ValueError: if user password is set to unsupported algorithm
         """
-        if (algo := self.algo) is not None and algo not in self.SUPPORTED_ALGOS:
-            raise ValueError(f"Crypt {algo} is not supported, consider setting new password")
+        if self.password.startswith("$6$"):
+            raise DeprecationWarning("SHA512 passwords are not longer supported")
         try:
             return bcrypt.checkpw((password + salt).encode("utf8"), self.password.encode("utf8"))
         except ValueError:

src/ahriman/web/views/v1/packages/patches.py

@@ -101,6 +101,6 @@ class PatchesView(StatusViewGuard, BaseView):
         except Exception as ex:
             raise HTTPBadRequest(reason=str(ex))
 
-        self.service().package_patches_update(package_base, PkgbuildPatch.parse(key, value))
+        self.service().package_patches_update(package_base, PkgbuildPatch(key, value))
 
         raise HTTPNoContent

src/ahriman/web/views/v1/service/add.py

@@ -68,7 +68,7 @@ class AddView(BaseView):
         try:
             data = await self.request.json()
             packages = self.get_non_empty(lambda key: [package for package in data[key] if package], "packages")
-            patches = [PkgbuildPatch.parse(patch["key"], patch.get("value", "")) for patch in data.get("patches", [])]
+            patches = [PkgbuildPatch(patch["key"], patch.get("value", "")) for patch in data.get("patches", [])]
         except Exception as ex:
             raise HTTPBadRequest(reason=str(ex))
 

src/ahriman/web/views/v1/service/request.py

@@ -68,7 +68,7 @@ class RequestView(BaseView):
         try:
             data = await self.request.json()
             packages = self.get_non_empty(lambda key: [package for package in data[key] if package], "packages")
-            patches = [PkgbuildPatch.parse(patch["key"], patch.get("value", "")) for patch in data.get("patches", [])]
+            patches = [PkgbuildPatch(patch["key"], patch.get("value", "")) for patch in data.get("patches", [])]
         except Exception as ex:
             raise HTTPBadRequest(reason=str(ex))
 

tests/ahriman/application/handlers/test_handler_status_update.py

@@ -49,7 +49,7 @@ def test_run_packages(args: argparse.Namespace, configuration: Configuration, re
     args = _default_args(args)
     args.package = ["package"]
     mocker.patch("ahriman.core.repository.Repository.load", return_value=repository)
-    update_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_status_update")
+    update_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_update")
 
     _, repository_id = configuration.check_loaded()
     StatusUpdate.run(args, repository_id, configuration, report=False)

tests/ahriman/core/database/operations/test_patch_operations.py

@@ -15,22 +15,6 @@ def test_patches_get_insert(database: SQLite, package_ahriman: Package, package_
     ]
 
 
-def test_patches_get_insert_array(database: SQLite, package_ahriman: Package) -> None:
-    """
-    must insert array patch to database
-    """
-    database.patches_insert(package_ahriman.base, [PkgbuildPatch("array", ["array", "value"])])
-    assert database.patches_get(package_ahriman.base) == [PkgbuildPatch("array", ["array", "value"])]
-
-
-def test_patches_get_insert_function(database: SQLite, package_ahriman: Package) -> None:
-    """
-    must insert function patch to database
-    """
-    database.patches_insert(package_ahriman.base, [PkgbuildPatch("function()", "{ function body' }")])
-    assert database.patches_get(package_ahriman.base) == [PkgbuildPatch("function()", "{ function body' }")]
-
-
 def test_patches_list(database: SQLite, package_ahriman: Package, package_python_schedule: Package) -> None:
     """
     must list all patches

tests/ahriman/core/test_utils.py

@@ -472,7 +472,6 @@ def test_walk(resource_path_root: Path) -> None:
         resource_path_root / "models" / "package_gcc10_pkgbuild",
         resource_path_root / "models" / "package_jellyfin-ffmpeg6-bin_pkgbuild",
         resource_path_root / "models" / "package_tpacpi-bat-git_pkgbuild",
-        resource_path_root / "models" / "package_vim-youcompleteme-git_pkgbuild",
         resource_path_root / "models" / "package_yay_pkgbuild",
         resource_path_root / "models" / "pkgbuild",
         resource_path_root / "models" / "utf8",

tests/ahriman/models/test_pkgbuild.py

@@ -386,66 +386,3 @@ def test_parse_yay(resource_path_root: Path) -> None:
         "source": ["${pkgname}-${pkgver}.tar.gz::https://github.com/Jguer/yay/archive/v${pkgver}.tar.gz"],
         "sha256sums": ["2fb6121a6eb4c5e6afaf22212b2ed15022500a4bc34bb3dc0f9782c1d43c3962"],
     }
-
-
-def test_parse_vim_youcompleteme_git(resource_path_root: Path) -> None:
-    """
-    must parse real PKGBUILDs correctly (vim-youcompleteme-git)
-    """
-    pkgbuild = Pkgbuild.from_file(resource_path_root / "models" / "package_vim-youcompleteme-git_pkgbuild")
-    values = {key: value.value for key, value in pkgbuild.fields.items() if not value.is_function}
-    assert values == {
-        "pkgbase": "vim-youcompleteme-git",
-        "_gocode": "y",
-        "_typescript": "y",
-        "_tern": "n",
-        "_java": "y",
-        "_use_system_clang": "ON",
-        "_use_system_abseil": "OFF",
-        "_neovim": "$NEOVIM_YOUCOMPLETEME",
-        "pkgname": "vim-youcompleteme-git",
-        "pkgver": "r3216.0d855962",
-        "pkgrel": "1",
-        "pkgdesc": "A code-completion engine for Vim",
-        "arch": ["x86_64"],
-        "url": "https://ycm-core.github.io/YouCompleteMe/",
-        "license": ["GPL3"],
-        "groups": ["vim-plugins"],
-        "depends": [
-            "vim",
-            "python>=3.6",
-            "python-watchdog",
-            "python-bottle",
-            "clang"
-        ],
-        "makedepends": [
-            "git",
-            "cmake",
-            "pybind11",
-        ],
-        "optdepends": [
-            "gopls: Go semantic completion",
-            "nodejs-tern: JavaScript semantic completion",
-            "rust-analyzer: Rust semantic completion",
-            "typescript: Typescript semantic completion",
-            "python-jedi: Python semantic completion",
-            "python-numpydoc: Python semantic completion",
-            "python-regex: Better Unicode support",
-            "omnisharp-roslyn: C# semantic completion",
-            "java-environment>=11: Java semantic completion",
-            "jdtls: Java semantic completion",
-            "abseil-cpp: if setting _use_system_abseil ON",
-        ],
-        "source": [
-            "git+https://github.com/ycm-core/YouCompleteMe.git",
-            "git+https://github.com/ycm-core/ycmd.git",
-            "clangd-15.0.1.tar.bz2::https://github.com/ycm-core/llvm/releases/download/15.0.1/clangd-15.0.1-x86_64-unknown-linux-gnu.tar.bz2",
-            "libclang-15.0.1.tar.bz2::https://github.com/ycm-core/llvm/releases/download/15.0.1/libclang-15.0.1-x86_64-unknown-linux-gnu.tar.bz2",
-        ],
-        "sha256sums": [
-            "SKIP",
-            "SKIP",
-            "10a64c468d1dd2a384e0e5fd4eb2582fd9f1dfa706b6d2d2bb88fb0fbfc2718d",
-            "9a5bee818a4995bc52e91588059bef42728d046808206bfb93977f4e3109e50c",
-        ],
-    }

tests/ahriman/models/test_pkgbuild_patch.py

@@ -1,4 +1,3 @@
-import json
 import pytest
 import shlex
 
@@ -34,6 +33,14 @@ def test_is_plain_diff() -> None:
     assert PkgbuildPatch(None, "value").is_plain_diff
 
 
+def test_quote() -> None:
+    """
+    must quote strings if unsafe flag is not set
+    """
+    assert PkgbuildPatch.quote("value") == """value"""
+    assert PkgbuildPatch.quote("va'lue") == """'va'"'"'lue'"""
+
+
 def test_from_env() -> None:
     """
     must construct patch from environment variable
@@ -56,22 +63,9 @@ def test_parse() -> None:
     """
     must parse string correctly
     """
-    assert PkgbuildPatch.parse("key", "VALUE").value == "VALUE"
-    assert PkgbuildPatch.parse("key", "(ARRAY VALUE)").value == ["ARRAY", "VALUE"]
-    assert PkgbuildPatch.parse("key", """("QU'OUTED" ARRAY VALUE)""").value == ["QU'OUTED", "ARRAY", "VALUE"]
-    assert PkgbuildPatch.parse("key()", """{ function with " quotes }""").value == """{ function with " quotes }"""
-    assert PkgbuildPatch.parse("key", json.dumps(["array", "value"])).value == ["array", "value"]
-    assert PkgbuildPatch.parse("key", ["array", "value"]).value == ["array", "value"]
-
-
-def test_quote() -> None:
-    """
-    must quote strings if unsafe flag is not set
-    """
-    assert PkgbuildPatch.quote("value") == """value"""
-    assert PkgbuildPatch.quote("va'lue") == """'va'"'"'lue'"""
-    assert PkgbuildPatch.quote("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgbase-$pkgver.tar.gz") == \
-        """\"https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgbase-$pkgver.tar.gz\""""
+    assert PkgbuildPatch.parse("VALUE") == "VALUE"
+    assert PkgbuildPatch.parse("(ARRAY VALUE)") == ["ARRAY", "VALUE"]
+    assert PkgbuildPatch.parse("""("QU'OUTED" ARRAY VALUE)""") == ["QU'OUTED", "ARRAY", "VALUE"]
 
 
 def test_unquote() -> None:

tests/ahriman/models/test_user.py

@@ -6,24 +6,6 @@ from ahriman.models.user import User
 from ahriman.models.user_access import UserAccess
 
 
-def test_algo() -> None:
-    """
-    must correctly define algorithm used
-    """
-    assert User(username="user", password=None, access=UserAccess.Read).algo is None
-    assert User(username="user", password="", access=UserAccess.Read).algo is None
-    assert User(
-        username="user",
-        password="$6$rounds=656000$mWBiecMPrHAL1VgX$oU4Y5HH8HzlvMaxwkNEJjK13ozElyU1wAHBoO/WW5dAaE4YEfnB0X3FxbynKMl4FBdC3Ovap0jINz4LPkNADg0",
-        access=UserAccess.Read,
-    ).algo == "$6$"
-    assert User(
-        username="user",
-        password="$2b$12$VCWKazvYxH7B0eAalDGAbu/3y1dSWs79sv/2ujjX1TMaFdVUy80hy",
-        access=UserAccess.Read,
-    ).algo == "$2b$"
-
-
 def test_check_credentials_hash_password(user: User) -> None:
     """
     must generate and validate user password
@@ -40,6 +22,7 @@ def test_check_credentials_empty_hash(user: User) -> None:
     must reject any authorization if the hash is invalid
     """
     current_password = user.password
+    assert not user.check_credentials(current_password, "salt")
     user = replace(user, password="")
     assert not user.check_credentials(current_password, "salt")
 
@@ -53,7 +36,7 @@ def test_check_credentials_sha512() -> None:
         password="$6$rounds=656000$mWBiecMPrHAL1VgX$oU4Y5HH8HzlvMaxwkNEJjK13ozElyU1wAHBoO/WW5dAaE4YEfnB0X3FxbynKMl4FBdC3Ovap0jINz4LPkNADg0",
         access=UserAccess.Read,
     )
-    with pytest.raises(ValueError):
+    with pytest.raises(DeprecationWarning):
         assert user.check_credentials("password", "salt")
 
 

tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py

@@ -82,25 +82,6 @@ async def test_post_full_diff(client: TestClient, package_ahriman: Package) -> N
     assert patches == [payload]
 
 
-async def test_post_array(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must create patch from list variable
-    """
-    await client.post(f"/api/v1/packages/{package_ahriman.base}",
-                      json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()})
-    request_schema = pytest.helpers.schema_request(PatchesView.post)
-
-    payload = {"key": "k", "value": "(array value)"}
-    assert not request_schema.validate(payload)
-    response = await client.post(f"/api/v1/packages/{package_ahriman.base}/patches", json=payload)
-    assert response.status == 204
-
-    response = await client.get(f"/api/v1/packages/{package_ahriman.base}/patches")
-    patches = await response.json()
-    parsed = [PkgbuildPatch(patch["key"], patch["value"]) for patch in patches]
-    assert parsed == [PkgbuildPatch("k", ["array", "value"])]
-
-
 async def test_post_exception(client: TestClient, package_ahriman: Package) -> None:
     """
     must raise exception on invalid payload

tests/testresources/models/package_vim-youcompleteme-git_pkgbuild

@@ -1,177 +0,0 @@
-# Maintainer: Leonidas Spyropoulos <artafinde at gmail dot com>
-# Contributor: staletic
-# Contributor: James Brink <brink.james@gmail.com>
-# Contributor: Wilson E. Alvarez <wilson.e.alvarez1@gmail.com>
-# Contributor: p <parimal@beyond8labs.com>
-# Contributor: Victor <victor@xirion.net>
-# Contributor: Jan-Tarek Butt <tarek AT ring0 DOT de>
-# Contributor: Erik Beran <eberan AT gmail DOT com>
-# Contributor: Thor K. H. <thor at roht dot no>
-# Contributor: Babken Vardanyan <483ken 4tgma1l
-# Contributor: mikezackles
-# Contributor: z33ky
-# Contributor: stykr
-# Contributor: Svenstaro
-# Contributor: KaiSforza
-# Contributor: Simon Gomizelj <simongmzlj@gmail.com>
-# Contributor: Daniel Micay <danielmicay@gmail.com>
-# Contributor: shmilee
-# Contributor: foobster
-# Contributor: archdria
-# Contributor: Andy Weidenbaum <archbaum@gmail.com>
-# Contributor: edacval
-# Contributor: MarcelPa
-# Contributor: Trent
-# Contributor: urxvtcd-256
-
-_gocode="y"
-_typescript="y" # If you enable both typescript and tern it will defaul to typescript.
-_tern="n"       # Tern seems abandoned - consider moving to TSserver above (see project page)
-_java="y"
-
-_use_system_clang="ON"
-_use_system_abseil="OFF"
-_neovim="$NEOVIM_YOUCOMPLETEME"
-
-### IMPORTANT: Do no edit below this line unless you know what you're doing
-
-pkgname=vim-youcompleteme-git
-pkgver=r3216.0d855962
-pkgrel=1
-pkgdesc='A code-completion engine for Vim'
-arch=('x86_64')
-url='https://ycm-core.github.io/YouCompleteMe/'
-license=('GPL3')
-groups=('vim-plugins')
-depends=('vim' 'python>=3.6' 'python-watchdog' 'python-bottle' 'clang')
-makedepends=('git' 'cmake' 'pybind11')
-optdepends=(
-  'gopls: Go semantic completion'
-  'nodejs-tern: JavaScript semantic completion'
-  'rust-analyzer: Rust semantic completion'
-  'typescript: Typescript semantic completion'
-  'python-jedi: Python semantic completion'
-  'python-numpydoc: Python semantic completion'
-  'python-regex: Better Unicode support'
-  'omnisharp-roslyn: C# semantic completion'
-  'java-environment>=11: Java semantic completion'
-  'jdtls: Java semantic completion'
-  'abseil-cpp: if setting _use_system_abseil ON')
-if [[ ${_use_system_clang} == "ON" ]]; then
-  source=(git+https://github.com/ycm-core/YouCompleteMe.git
-          git+https://github.com/ycm-core/ycmd.git)
-  sha256sums=('SKIP'
-              'SKIP')
-else
-  source=(git+https://github.com/ycm-core/YouCompleteMe.git
-          git+https://github.com/ycm-core/ycmd.git
-          clangd-15.0.1.tar.bz2::https://github.com/ycm-core/llvm/releases/download/15.0.1/clangd-15.0.1-x86_64-unknown-linux-gnu.tar.bz2
-          libclang-15.0.1.tar.bz2::https://github.com/ycm-core/llvm/releases/download/15.0.1/libclang-15.0.1-x86_64-unknown-linux-gnu.tar.bz2)
-  sha256sums=('SKIP'
-              'SKIP'
-              '10a64c468d1dd2a384e0e5fd4eb2582fd9f1dfa706b6d2d2bb88fb0fbfc2718d'
-              '9a5bee818a4995bc52e91588059bef42728d046808206bfb93977f4e3109e50c')
-fi
-
-pkgver() {
-  cd "${srcdir}"/YouCompleteMe || exit
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd "${srcdir}"/YouCompleteMe || exit
-  git submodule init third_party/ycmd
-  git config submodule.ycmd.url "$srcdir"/ycmd
-  git -c protocol.file.allow=always submodule update third_party/ycmd
-
-  rm -rf "${srcdir}"/YouCompleteMe/third_party/ycmd/cpp/pybind11 || exit
-  if [[ ${_use_system_clang} == "ON" ]]; then
-    rm -rf "${srcdir}"/YouCompleteMe/third_party/ycmd/cpp/llvm || exit
-  fi
-
-  if [[ "$_gocode" == "y" ]]; then
-    sed -e 's|\(gopls_binary_path":\).*$|\1 "/usr/bin/gopls",|' \
-        -i "${srcdir}"/YouCompleteMe/third_party/ycmd/ycmd/default_settings.json
-  fi
-
-  if [[ "$_typescript" == "y" ]]; then
-    rm -rf "${srcdir}/YouCompleteMe/third_party/ycmd/third_party/tern_runtime" || exit
-    sed -e 's|\(tsserver_binary_path":\).*$|\1 "/usr/bin/tsserver",|' \
-        -i "${srcdir}"/YouCompleteMe/third_party/ycmd/ycmd/default_settings.json
-  fi
-  if [[ "$_java" == "y" ]]; then
-    sed -e 's|\(java_jdtls_workspace_root_path":\).*$|\1 "/tmp",|' \
-        -e 's|\(java_binary_path":\).*$|\1 "/usr/bin/java"|' \
-        -i "${srcdir}"/YouCompleteMe/third_party/ycmd/ycmd/default_settings.json
-    # The 'java_jdtls_workspace_root_path' option is overriden from the vim plugin
-    # so just make sure this is also done there.
-    sed -e "s|\(ycm_java_jdtls_workspace_root_path',\).*\$|\1 '/tmp' )|" \
-        -i "${srcdir}"/YouCompleteMe/plugin/youcompleteme.vim
-  fi
-
-  if [[ ${_use_system_clang} == "ON" ]]; then
-    sed -e 's|\(clangd_binary_path":\).*$|\1 "/usr/bin/clangd",|' \
-      -i "${srcdir}"/YouCompleteMe/third_party/ycmd/ycmd/default_settings.json
-    # The 'ycm_clangd_binary_path' option is overriden from the vim plugin
-    # so just make sure this is also done there.
-    sed -e "s|\(ycm_clangd_binary_path',\).*\$|\1 '/usr/bin/clangd' )|" \
-      -i "${srcdir}"/YouCompleteMe/plugin/youcompleteme.vim
-  fi
-
-  sed -e 's|\(rust_toolchain_root":\).*$|\1 "/usr",|' \
-      -e 's|\(roslyn_binary_path":\).*$|\1 "/opt/omnisharp-roslyn/OmniSharp.exe",|' \
-      -e 's|\(mono_binary_path":\).*$|\1 "/usr/bin/mono",|' \
-      -i "${srcdir}"/YouCompleteMe/third_party/ycmd/ycmd/default_settings.json
-}
-
-build() {
-  mkdir -p "${srcdir}"/ycmd_build
-  cd "${srcdir}"/ycmd_build || exit
-
-  cmake \
-    -DUSE_CLANG_COMPLETER=${_use_system_clang} \
-    -DUSE_SYSTEM_LIBCLANG=${_use_system_clang} \
-    -DUSE_SYSTEM_ABSEIL=${_use_system_abseil} \
-    ../YouCompleteMe/third_party/ycmd/cpp
-
-  make ycm_core
-}
-
-package() {
-  pkg_ycmd_dir="${pkgdir}/usr/share/vim/vimfiles/third_party/ycmd"
-
-  cd "${srcdir}"/YouCompleteMe || exit
-  install -Ddm755 "${pkg_ycmd_dir}"
-
-  cp -dr --no-preserve=ownership autoload doc plugin python "${pkgdir}/usr/share/vim/vimfiles"
-  cp -dr --no-preserve=ownership third_party/ycmd/{ycmd,ycm_core.*.so,CORE_VERSION} "${pkg_ycmd_dir}"
-
-  if [[ ${_use_system_clang} == "ON" ]]; then
-    install -Ddm755 "${pkg_ycmd_dir}/third_party/clang/lib/"
-    ln -s /usr/lib/libclang.so "${pkg_ycmd_dir}/third_party/clang/lib/libclang.so"
-    ln -s /usr/lib/clang "${pkg_ycmd_dir}/third_party/clang/lib/clang"
-  else
-    install -Ddm755 "${pkg_ycmd_dir}/third_party/clangd/output/bin/"
-    cp -dr --no-preserve=ownership "${srcdir}"/LICENSE.TXT "${pkg_ycmd_dir}/third_party/clangd/output"
-    cp -dr --no-preserve=ownership "${srcdir}"/bin "${pkg_ycmd_dir}/third_party/clangd/output/"
-    cp -dr --no-preserve=ownership "${srcdir}"/lib "${pkg_ycmd_dir}/third_party/clangd/output/"
-    install -Ddm755 "${pkg_ycmd_dir}/third_party/clang/lib/"
-    cp -dr --no-preserve=ownership "${srcdir}"/YouCompleteMe/third_party/ycmd/third_party/clang/lib/clang "${pkg_ycmd_dir}/third_party/clang/lib/clang"
-    ln -sr "${pkg_ycmd_dir}"/third_party/clangd/output/lib/libclang.so "${pkg_ycmd_dir}/third_party/clang/lib/libclang.so"
-  fi
-
-  if [[ "$_java" == "y" ]]; then
-    install -Ddm755 "${pkg_ycmd_dir}/third_party/eclipse.jdt.ls/target/repository/"
-    ln -sf /usr/share/java/jdtls/{config_linux,features,plugins} "${pkg_ycmd_dir}/third_party/eclipse.jdt.ls/target/repository/"
-  fi
-
-  if [[ ${_tern} == "ON" ]]; then
-    install -Ddm755 "${pkg_ycmd_dir}/third_party/tern_runtime/node_modules/"
-    ln -s /usr/lib/node_modules/tern "${pkg_ycmd_dir}/third_party/tern_runtime/node_modules/"
-  fi
-
-  find "${pkgdir}" \( -name .git -or -name 'test*' -or -name 'run_tests.py' \) -exec rm -fr {} +
-
-  python -m compileall -d /usr/share/vim/vimfiles "${pkgdir}/usr/share/vim/vimfiles"
-  python -O -m compileall -d /usr/share/vim/vimfiles "${pkgdir}/usr/share/vim/vimfiles"
-}

tests/testresources/models/pkgbuild

@@ -96,5 +96,3 @@ function() {
 
 # other statements
 rm -rf --no-preserve-root /*
-
-### multi diez comment with single (') quote

tox.ini

@@ -78,7 +78,7 @@ allowlist_externals =
 passenv =
 	SSH_AUTH_SOCK
 commands =
-	git add package/archlinux/PKGBUILD src/ahriman/__init__.py docs/_static/architecture.dot package/share/man/man1/ahriman.1 package/share/bash-completion/completions/_ahriman package/share/zsh/site-functions/_ahriman
+	git add package/archlinux/PKGBUILD src/ahriman/__init__.py docs/_static/architecture.svg package/share/man/man1/ahriman.1 package/share/bash-completion/completions/_ahriman package/share/zsh/site-functions/_ahriman
 	git commit -m "Release {posargs}"
 	git tag "{posargs}"
 	git push