wip: diff soname

Normally the default in Arch is that all home directories are private.
However, this may have been changed locally. To make sure we never
expose secrets, lets use a umask of 0077 when writing the config.

Additionally add some temporary fixup code to migrate the file and
directory permissions of already existing paths.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>

.gitlab-ci.yml

@@ -8,7 +8,7 @@ build:
   stage: build
   needs: []
   script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoctor
+    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoc
     - make PREFIX=/usr
     - make PREFIX=/usr DESTDIR=build install
 
@@ -16,6 +16,6 @@ check:
   stage: test
   needs: []
   script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoctor shellcheck
+    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoc shellcheck
     - make check || true
     - SHELLCHECK_OPTS="-S error" make check

Makefile

@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 
-V=1.1.1
+V=20230307
 BUILDTOOLVER ?= $(V)
 
 PREFIX = /usr/local
@@ -16,7 +16,6 @@ LIBRARY_SRC = $(call rwildcard,src/lib,*.sh)
 LIBRARY = $(addprefix $(BUILDDIR)/,$(patsubst src/%,%,$(patsubst %.in,%,$(LIBRARY_SRC))))
 MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
 PACMAN_CONFIGS=$(wildcard config/pacman/*)
-GIT_CONFIGS = $(wildcard config/git/*)
 SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
 MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))
 
@@ -33,16 +32,12 @@ COMMITPKG_LINKS = \
 	gnome-unstablepkg
 
 ARCHBUILD_LINKS = \
-	core-testing-x86_64-build \
-	core-testing-x86_64_v3-build \
-	core-staging-x86_64-build \
-	core-staging-x86_64_v3-build \
 	extra-x86_64-build \
 	extra-x86_64_v3-build \
-	extra-testing-x86_64-build \
+	testing-x86_64-build \
-	extra-testing-x86_64_v3-build \
+	testing-x86_64_v3-build \
-	extra-staging-x86_64-build \
+	staging-x86_64-build \
-	extra-staging-x86_64_v3-build \
+	staging-x86_64_v3-build \
 	multilib-build \
 	multilib-testing-build \
 	multilib-staging-build \
@@ -92,18 +87,15 @@ $(eval $(call buildInScript,build/bin,src/,.in,755))
 $(eval $(call buildInScript,build/lib,src/lib/,,644))
 $(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,.in,444)))
 
-$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/man/include/footer.asciidoc
+$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/asciidoc.conf doc/man/include/footer.asciidoc
 	$(GEN_MSG)
 	@mkdir -p $(BUILDDIR)/doc/man
-	@asciidoctor --backend=manpage --destination-dir=$(BUILDDIR)/doc/man --attribute pkgdatadir=$(DATADIR) $<
+	@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(DATADIR) $<
 
 conf:
-	@install -d $(BUILDDIR)/makepkg.conf.d
+	@install -d $(BUILDDIR)/makepkg.conf.d $(BUILDDIR)/pacman.conf.d
 	@cp -a $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
-	@install -d $(BUILDDIR)/pacman.conf.d
 	@cp -a $(PACMAN_CONFIGS) $(BUILDDIR)/pacman.conf.d
-	@install -d $(BUILDDIR)/git.conf.d
-	@cp -a $(GIT_CONFIGS) $(BUILDDIR)/git.conf.d
 
 clean:
 	rm -rf $(BUILDDIR)
@@ -116,7 +108,6 @@ install: all
 	install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
 	install -dm0755 $(DESTDIR)$(DATADIR)/lib
 	cp -ra $(BUILDDIR)/lib/* $(DESTDIR)$(DATADIR)/lib
-	cp -a $(BUILDDIR)/git.conf.d -t $(DESTDIR)$(DATADIR)
 	for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
 	for conf in $(notdir $(PACMAN_CONFIGS)); do install -Dm0644 $(BUILDDIR)/pacman.conf.d/$$conf $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
 	for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/setarch-aliases.d; done
@@ -124,7 +115,6 @@ install: all
 	for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	install -Dm0644 $(BUILDDIR)/contrib/completion/bash/devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
-	for f in $(notdir $(BINPROGS)); do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$f; done
 	install -Dm0644 $(BUILDDIR)/contrib/completion/zsh/_devtools $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	for manfile in $(MANS); do \
 		install -Dm644 $$manfile -t $(DESTDIR)$(MANDIR)/man$${manfile##*.}; \
@@ -133,15 +123,12 @@ install: all
 uninstall:
 	for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	for f in $(notdir $(LIBRARY)); do rm -f $(DESTDIR)$(DATADIR)/lib/$$f; done
-	rm -rf $(DESTDIR)$(DATADIR)/lib
-	rm -rf $(DESTDIR)$(DATADIR)/git.conf.d
 	for conf in $(notdir $(MAKEPKG_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
 	for conf in $(notdir $(PACMAN_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
 	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(DATADIR)/setarch-aliases.d/$$f; done
 	for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
-	for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	for manfile in $(notdir $(MANS)); do rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile}; done;
@@ -149,25 +136,22 @@ uninstall:
 		$(DESTDIR)$(DATADIR)/setarch-aliases.d \
 		$(DESTDIR)$(DATADIR)/makepkg.conf.d \
 		$(DESTDIR)$(DATADIR)/pacman.conf.d \
+		$(DESTDIR)$(DATADIR)/lib \
 		$(DESTDIR)$(DATADIR)
 
+TODAY=$(shell date +"%Y%m%d")
 tag:
-	git cliff --strip=all --unreleased
+	@sed -E "s|^V=[0-9]{8}|V=$(TODAY)|" -i Makefile
-	@echo "current version: v$(V)"
+	@git commit --gpg-sign --message "Version $(TODAY)" Makefile
-	@read -r -p "tag version: v" VERSION && \
+	@git tag --sign --message "Version $(TODAY)" $(TODAY)
-	sed -E "s|^V=.+|V=$$VERSION|" -i Makefile && \
-	git commit --gpg-sign --message "chore(release): version v$$VERSION" Makefile && \
-	git tag --sign --message "Version v$$VERSION" v$$VERSION
-
-release: dist
-	git push --tags origin master
-	git cliff --version >/dev/null
-	GITLAB_HOST=gitlab.archlinux.org glab release create v$(V) devtools-$(V).tar.gz* --milestone v$(V) --notes-file <(git cliff --strip=all --latest)
 
 dist:
-	git archive --format=tar --prefix=devtools-$(V)/ v$(V) | gzip > devtools-$(V).tar.gz
+	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip > devtools-$(V).tar.gz
 	gpg --detach-sign --use-agent devtools-$(V).tar.gz
 
+upload:
+	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/
+
 check: $(BINPROGS_SRC) $(LIBRARY_SRC) contrib/completion/bash/devtools.in config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
 	shellcheck $^
 

README.md

@@ -23,34 +23,6 @@ will automatically build the project and proxy all calls to the local build dire
 ./test/bin/pkgctl --help
 ```
 
-### Commit messages
-
-All commits must follow [conventional commits](https://www.conventionalcommits.org).
-
-The following groups are allowed:
-
-- chore
-- feat
-- fix
-- doc
-- perf
-- test
-
-To override the scope for the changelog entry use the `Component:` trailer.
-
-Example:
-
-```
-feat(db): yay mega cool feature
-
-Very long and useful description.
-
-Fixes #1
-Fixes #2
-
-Component: pkgctl db remove
-```
-
 ## Releasing
 
 1. bump the version in the Makefile
@@ -62,40 +34,31 @@ Component: pkgctl db remove
 
 ## Dependencies
 
-### Runtime Dependencies
+### Runtime
 
 - arch-install-scripts
 - awk
 - bash
 - binutils
 - coreutils
-- curl
 - diffutils
-- fakeroot
 - findutils
 - grep
 - jq
-- ncurses
 - openssh
 - parallel
 - rsync
 - sed
-- systemd
 - util-linux
+
 - bzr
 - git
 - mercurial
 - subversion
 
-### Optional Dependencies
+### Development
 
-- bat (pretty printing)
+- asciidoc
-- nvchecker (version checking)
-- pacman-contrib (--update-checksums options for pkgctl build)
-
-### Development Dependencies
-
-- asciidoctor
 - make
 - shellcheck
 

cliff.toml

@@ -1,45 +0,0 @@
-[changelog]
-header = "# Changelog\n\n"
-body = """
-{%- if version -%}
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{%- else -%}
-    ## [unreleased]
-{%- endif %}
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | upper_first }}
-    {% for commit in commits | sort(attribute="message") %}
-		- {% set component = commit.footers | filter(attribute="token", value="Component") | map(attribute="value") | join(sep=", ") %}
-		{%- if component %}{{ component }}: {% elif commit.scope %}{{ commit.scope }}: {% endif %}
-		{{- commit.message | upper_first }}
-		{%- if commit.breaking %} (breaking){% endif %}
-		{%- set fixes = commit.footers | filter(attribute="token", value="Fixes") %}
-		{%- for fix in fixes %}{% if fix.separator|trim == '#' %}{{ fix.separator }}{{ fix.value }}{% endif %}{% endfor %}
-    {%- endfor %}
-{% endfor %}
-
-"""
-footer = ""
-
-# remove the leading and trailing whitespaces from the template
-trim = true
-
-[git]
-# allow only conventional commits
-# https://www.conventionalcommits.org
-conventional_commits = true
-# regex for parsing and grouping commits
-commit_parsers = [
-    { message = "^chore\\(release\\): version", skip = true},
-    { message = "^feat", group = "Features"},
-    { message = "^fix", group = "Bug Fixes"},
-    { message = "^doc", group = "Documentation"},
-    { message = "^perf", group = "Performance"},
-    { message = "^test", group = "Testing"},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { body = ".*security", group = "Security"},
-]
-# filter out the commits that are not matched by commit parsers
-filter_commits = false
-# regex for matching git tags
-tag_pattern = "^v[0-9]+\\.[0-9]+\\.[0-9]+.*"

config/git/template/hooks/applypatch-msg

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/commit-msg

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-applypatch

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-checkout

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-commit

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-merge

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-applypatch

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-commit

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-merge-commit

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-push

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-rebase

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/prepare-commit-msg

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/info/exclude

@@ -1,28 +0,0 @@
-/pkg
-/src
-/*/
-!/keys/
-
-/*.log
-/*.tar.*
-/*.tar
-/*.tgz
-/*.zst
-/*.gz
-/*.xz
-/*.bz2
-/*.zip
-/*.xpi
-/*.jar
-/*.whl
-/*.war
-/*.deb
-/*.ttf
-/*.dat
-/*.iso
-/*.asc
-/*.sig
-/*.signature
-/*.sign
-/*.SHA256SUMS
-/*.sha256

config/makepkg/x86_64.conf

@@ -25,7 +25,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::breezy'
+VCSCLIENTS=('bzr::bzr'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'
@@ -41,14 +41,12 @@ CHOST="x86_64-pc-linux-gnu"
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection \
+        -fstack-clash-protection -fcf-protection"
-        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-         -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS="-Cforce-frame-pointers=yes"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags

config/makepkg/x86_64_v3.conf

@@ -25,7 +25,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::breezy'
+VCSCLIENTS=('bzr::bzr'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'
@@ -41,14 +41,12 @@ CHOST="x86_64-pc-linux-gnu"
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
 CFLAGS="-march=x86-64-v3 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection \
+        -fstack-clash-protection -fcf-protection"
-        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-         -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS="-Cforce-frame-pointers=yes"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags

config/pacman/core-staging-x86_64_v3.conf

@@ -1,95 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = x86_64_v3 x86_64
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/core-staging.conf

@@ -1,95 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/core-testing-x86_64_v3.conf

@@ -1,89 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = x86_64_v3 x86_64
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/extra-testing.conf

@@ -1,89 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/extra-x86_64_v3.conf

@@ -70,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
+#[testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-#[extra-testing]
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/extra.conf

@@ -70,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
+#[testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-#[extra-testing]
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/gnome-unstable.conf

@@ -73,16 +73,19 @@ LocalFileSigLevel = Optional
 [gnome-unstable]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/kde-unstable.conf

@@ -73,16 +73,19 @@ LocalFileSigLevel = Optional
 [kde-unstable]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/multilib-staging.conf

@@ -70,24 +70,27 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-staging]
+[staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 [multilib-staging]

config/pacman/multilib-testing.conf

@@ -70,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

config/pacman/multilib.conf

@@ -70,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
+#[testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-#[extra-testing]
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

config/pacman/staging-x86_64_v3.conf

@@ -70,24 +70,27 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-staging]
+[staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

config/pacman/staging.conf

@@ -70,24 +70,27 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-staging]
+[staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

config/pacman/testing-x86_64_v3.conf

@@ -70,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/testing.conf

@@ -70,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

contrib/completion/bash/devtools.in

@@ -2,538 +2,89 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
+_devtools_compgen() {
-# shellcheck source=src/lib/valid-build-install.sh
+  local i r
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-build-install.sh
+  COMPREPLY=($(compgen -W '$*' -- "$cur"))
-# shellcheck source=src/lib/valid-tags.sh
+  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
+    for r in "${!COMPREPLY[@]}"; do
-# shellcheck source=src/lib/valid-repos.sh
+      if [[ ${COMP_WORDS[i]} = "${COMPREPLY[r]}" ]]; then
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
+        unset 'COMPREPLY[r]'; break
-# shellcheck source=src/lib/valid-inspect.sh
+      fi
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
+    done
-# shellcheck source=src/lib/valid-search.sh
+  done
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
+}
 
-_binary_arch=${DEVTOOLS_VALID_ARCHES[*]:0:-1}
+_pkgrepo_pkg() {
-_colors=(never always auto)
+  _devtools_compgen "$(
+      command pacman "-$1"
+  )"
+}
 
+_pkgrepo() {
+  local cur prev
+  COMPREPLY=()
+  cur=$(_get_cword)
+  prev=${COMP_WORDS[COMP_CWORD-1]}
 
-_makechrootpkg_args=(
+  _pkgrepo_pkg Slq
-	-h
+  true
-	-c
+} &&
-	-d
+complete -F _pkgrepo pkgrepo
-	-D
+
-	-u
+_makechrootpkg() {
-	-r
+  local cur
-	-I
+  COMPREPLY=()
-	-l
+  _get_comp_words_by_ref cur
-	-n
+
-	-T
+  case $cur in
-	-U
+    -*)
-	-x
+       COMPREPLY=( $( compgen -W '-I -c -h -l -r -u' -- "$cur" ) )
-)
+       ;;
-_makechrootpkg_args_d_opts() { _filedir -d; }
+    *)
-_makechrootpkg_args_D_opts() { _filedir -d; }
+      _filedir
-_makechrootpkg_args_r_opts() { _filedir -d; }
+      return 0
-_makechrootpkg_args_I_opts() { _filedir '*.pkg.tar.*'; }
+      ;;
-_makechrootpkg_args_l_opts() { _filedir -d; }
+  esac
-_makechrootpkg_args_U_opts() { :; }
+
-_makechrootpkg_args_x_opts() { _devtools_completions_inspect; }
+  true
-_makechrootpkg() { __devtools_complete _makechrootpkg; }
+} &&
 complete -F _makechrootpkg makechrootpkg
 
+_mkarchroot() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
 
-_makerepropkg_args=(
+  case $cur in
-	-h
+    -*)
-	-d
+       COMPREPLY=( $( compgen -W '-C -M -c -h' -- "$cur" ) )
-	-n
+       ;;
-	-c
+    *)
-	-M
+      _filedir
-)
+      return 0
-_makerepropkg_args_c_opts() { _filedir -d; }
+      ;;
-_makerepropkg_args_M_opts() { _filedir '*.conf'; }
+  esac
-_makerepropkg_opts() { _filedir '*.pkg.tar.*'; }
-_makerepropkg() { __devtools_complete _makerepropkg; }
-complete -F _makerepropkg makerepropkg
 
-
+  true
-_mkarchroot_args=(
+} &&
-	-U
-	-C
-	-M
-	-c
-	-h
-)
-_mkarchroot_args_U_opts() { _filedir '*.pkg.tar.*'; }
-_mkarchroot_args_C_opts() { _filedir '*.conf'; }
-_mkarchroot_args_M_opts() { _filedir '*.conf'; }
-_mkarchroot_args_c_opts() { _filedir -d; }
-_mkarchroot_opts() {
-	local args
-	args=$(__pkgctl_word_count_after_subcommand)
-	if (( args == 0 )); then
-		_filedir -d
-	elif (( args >= 1 )); then
-		_devtools_completions_all_packages
-	fi
-}
-_mkarchroot() { __devtools_complete _mkarchroot; }
 complete -F _mkarchroot mkarchroot
 
-
+_arch-nspawn() {
-_arch_nspawn_args=(
+  local cur
-	-C
+  COMPREPLY=()
-	-M
+  _get_comp_words_by_ref cur
-	-c
+
-	-f
+  case $cur in
-	-s
+    -*)
-	-h
+       COMPREPLY=( $( compgen -W '-C -M -c -h' -- "$cur" ) )
-)
+       ;;
-_arch_nspawn_args_C_opts() { _filedir '*.conf'; }
+    *)
-_arch_nspawn_args_M_opts() { _filedir '*.conf'; }
+      _filedir
-_arch_nspawn_args_c_opts() { _filedir -d; }
+      return 0
-_arch_nspawn_args_f_opts() { _filedir; }
+      ;;
-_arch_nspawn_opts() {
+  esac
-	local args
+
-	args=$(__pkgctl_word_count_after_subcommand)
+  true
-	if (( args == 0 )); then
+} &&
-		_filedir -d
+complete -F _arch-nspawn arch-nspawn
-	fi
+# ex:et ts=2 sw=2 ft=sh
-}
-_arch_nspawn() { __devtools_complete _arch_nspawn; }
-complete -F _arch_nspawn arch-nspawn
-
-
-_sogrep_args=(
-	-v --verbose
-	-r --refresh
-	-h --help
-)
-_sogrep_opts() {
-	local args
-	args=$(__pkgctl_word_count_after_subcommand)
-	if (( args == 0 )); then
-		_devtools_completions_repo all
-	fi
-}
-_sogrep() { __devtools_complete _sogrep; }
-complete -F _sogrep sogrep
-
-
-_offload_build_args=(
-	-r --repo
-	-a --arch
-	-s --server
-	-h --help
-)
-_offload_build_args__repo_opts() { _devtools_completions_build_repo; }
-_offload_build_args_r_opts() { _offload_build_args__repo_opts; }
-_offload_build_args__arch_opts() { _devtools_completions_arch; }
-_offload_build_args_a_opts() { _offload_build_args__arch_opts; }
-_offload_build_args__server_opts() { :; }
-_offload_build_args_s_opts() { _offload_build_args__server_opts; }
-_offload_build() { __devtools_complete _offload_build; }
-complete -F _offload_build offload-build
-
-
-_pkgctl_cmds=(
-	aur
-	auth
-	build
-	db
-	diff
-	release
-	repo
-	search
-	version
-)
-_pkgctl_args=(
-	-V --version
-	-h --help
-)
-
-
-_pkgctl_auth_cmds=(
-	login
-	status
-)
-
-
-_pkgctl_auth_login_args=(
-	-g --gen-access-token
-	-h --help
-)
-
-
-_pkgctl_auth_status_args=(
-	-t --show-token
-	-h --help
-)
-
-
-_pkgctl_build_args=(
-	--arch
-	--repo
-
-	-s --staging
-	-t --testing
-	-o --offload
-	-c --clean
-	-w --worker
-	--inspect
-	-I --install-to-chroot
-	-i --install-to-host
-
-	--pkgver
-	--pkgrel
-	--rebuild
-	--update-checksums
-	-e --edit
-
-	-r --release
-	-m --message
-	-u --db-update
-
-	-h --help
-)
-_pkgctl_build_args__arch_opts() { _devtools_completions_arch; }
-_pkgctl_build_args__repo_opts() { _devtools_completions_repo; }
-_pkgctl_build_args__worker_opts() { :; }
-_pkgctl_build_args_w_opts() { _pkgctl_build_args__worker_opts; }
-_pkgctl_build_args__inspect_opts() { _devtools_completions_inspect; }
-_pkgctl_build_args__pkgver_opts() { :; }
-_pkgctl_build_args__pkgrel_opts() { :; }
-_pkgctl_build_args__install_to_host_opts() { _pkgctl_build_completions_install_mode; }
-_pkgctl_build_args_i_opts() { _pkgctl_build_args__install_to_host_opts; }
-_pkgctl_build_args__install_to_chroot_opts() { _makechrootpkg_args_I_opts; }
-_pkgctl_build_args_I_opts() { _pkgctl_build_args__install_to_chroot_opts; }
-_pkgctl_build_args__message_opts() { :; }
-_pkgctl_build_args_m_opts() { _pkgctl_build_args__message_opts; }
-_pkgctl_build_opts() { _filedir -d; }
-_pkgctl_build_completions_install_mode() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BUILD_INSTALL[*]}" -- "$cur")
-}
-
-
-_pkgctl_db_cmds=(
-	move
-	remove
-	update
-)
-
-
-_pkgctl_db_move_args=(
-	-h --help
-)
-_pkgctl_db_move_opts() {
-	local subcommand args
-	subcommand=(db move)
-	args=$(__pkgctl_word_count_after_subcommand "${subcommand[@]}")
-
-	if (( args == 0 )); then
-		_devtools_completions_repo
-	elif (( args == 1 )); then
-		_devtools_completions_repo
-	elif (( args >= 2 )); then
-		_devtools_completions_all_packages
-	fi
-}
-
-
-_pkgctl_db_remove_args=(
-	-a --arch
-	-h --help
-)
-_pkgctl_db_remove_opts() {
-	local subcommand args
-	subcommand=(db remove)
-	args=$(__pkgctl_word_count_after_subcommand "${subcommand[@]}")
-
-	if (( args == 0 )); then
-		_devtools_completions_repo
-	elif (( args >= 1 )); then
-		_devtools_completions_all_packages
-	fi
-}
-
-
-_pkgctl_db_update_args=(
-	-h --help
-)
-
-
-_pkgctl_release_args=(
-	-m --message
-	-r --repo
-	-s --staging
-	-t --testing
-	-u --db-update
-	-h --help
-)
-_pkgctl_release_args__message_opts() { :; }
-_pkgctl_release_args_m_opts() { _pkgctl_release_args__message_opts; }
-_pkgctl_release_args__repo_opts() { _devtools_completions_repo; }
-_pkgctl_release_args_r_opts() { _pkgctl_release_args__repo_opts; }
-_pkgctl_release_opts() { _filedir -d; }
-
-_pkgctl_aur_cmds=(
-	drop-from-repo
-)
-
-_pkgctl_aur_drop_from_repo_args=(
-	--no-disown
-	-f --force
-	-h --help
-)
-_pkgctl_aur_drop_from_repo_opts() { _filedir -d; }
-
-
-_pkgctl_repo_cmds=(
-	clone
-	configure
-	create
-	switch
-	web
-)
-
-
-_pkgctl_repo_clone_args=(
-	-m --maintainer
-	--protocol
-	--switch
-	-u --unprivileged
-	--universe
-	-j --jobs
-	-h --help
-)
-_pkgctl_repo_clone_args__maintainer_opts() { :; }
-_pkgctl_repo_clone_args_m_opts() { _pkgctl_repo_clone_args__maintainer_opts; }
-_pkgctl_repo_clone_args__protocol_opts() { _devtools_completions_protocol; }
-_pkgctl_repo_clone_args__switch_opts() { :; }
-_pkgctl_repo_clone_args__jobs_opts() { :; }
-_pkgctl_repo_clone_args_j_opts() { _pkgctl_repo_clone_args__jobs_opts; }
-_pkgctl_repo_clone_opts() { _devtools_completions_all_packages; }
-
-
-_pkgctl_repo_configure_args=(
-	--protocol
-	-j --jobs
-	-h --help
-)
-_pkgctl_repo_configure_args__protocol_opts() { _devtools_completions_protocol; }
-_pkgctl_repo_configure_args__jobs_opts() { :; }
-_pkgctl_repo_configure_args_j_opts() { _pkgctl_repo_clone_args__jobs_opts; }
-_pkgctl_repo_configure_opts() { _filedir -d; }
-
-
-_pkgctl_repo_create_args=(
-	-c --clone
-	-h --help
-)
-
-_pkgctl_repo_switch_args=(
-	--discard-changes
-	-f --force
-	-h --help
-)
-_pkgctl_repo_switch_opts() {
-	local subcommand args
-	subcommand=(repo switch)
-	args=$(__pkgctl_word_count_after_subcommand "${subcommand[@]}")
-
-	if (( args == 0 )); then
-		:
-	elif (( args >= 1 )); then
-		_filedir -d;
-	fi
-}
-
-_pkgctl_version_cmds=(
-	check
-	upgrade
-)
-
-_pkgctl_version_check_args=(
-	-v --verbose
-	-h --help
-)
-
-_pkgctl_version_check_opts() { _filedir -d; }
-
-_pkgctl_version_upgrade_args=(
-	-v --verbose
-	-h --help
-)
-
-_pkgctl_version_upgrade_opts() { _filedir -d; }
-
-_pkgctl_repo_web_args=(
-	--print
-	-h --help
-)
-_pkgctl_repo_web_opts() { _filedir -d; }
-
-
-_pkgctl_search_args=(
-	--no-default-filter
-	--json
-	-F --format
-	-N --no-line-number
-	-h --help
-)
-_pkgctl_search_opts() { :; }
-_pkgctl_search_args__format_opts() { _devtools_completions_search_format; }
-_pkgctl_search_args_F_opts() { _devtools_completions_search_format; }
-
-
-_pkgctl_diff_args=(
-	-l --list
-	-d --diffoscope
-	-p --pkginfo
-	-b --buildinfo
-	-m --makepkg-config
-	-u -U --unified
-	-y --side-by-side
-	--color
-	-W --width
-	-P --pool
-	-v --verbose
-	-h --help
-)
-_pkgctl_diff_args__makepkg_config_opts() { _filedir '*.conf'; }
-_pkgctl_diff_args_m_opts() { _pkgctl_diff_args__makepkg_config_opts; }
-_pkgctl_diff_args__width_opts() { :; }
-_pkgctl_diff_args_W_opts() { _pkgctl_diff_args__width_opts; }
-_pkgctl_diff_args__color_opts() { _devtools_completions_color; }
-_pkgctl_diff_args__pool_opts() { _filedir -d; }
-_pkgctl_diff_args_P_opts() { _pkgctl_diff_args__pool_opts; }
-_pkgctl_diff_opts() { _devtools_completions_all_packages; }
-
-
-_pkgctl_version_args=(
-	-h --help
-)
-
-
-_devtools_completions_color() {
-	mapfile -t COMPREPLY < <(compgen -W "${_colors[*]}" -- "$cur")
-}
-_devtools_completions_arch() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ARCHES[*]}" -- "$cur")
-}
-_devtools_completions_repo() {
-	local optional=${1:-}
-	mapfile -t COMPREPLY < <(compgen -W "${optional} ${DEVTOOLS_VALID_REPOS[*]}" -- "$cur")
-}
-_devtools_completions_build_repo() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BUILDREPOS[*]}" -- "$cur")
-}
-_devtools_completions_all_packages() {
-	mapfile -t COMPREPLY < <(compgen -W "$(pacman -Sql)" -- "$cur")
-}
-_devtools_completions_protocol() {
-	mapfile -t COMPREPLY < <(compgen -W "https" -- "$cur")
-}
-_devtools_completions_inspect() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_INSPECT_MODES[*]}" -- "$cur")
-}
-_devtools_completions_search_format() {
-	mapfile -t COMPREPLY < <(compgen -W "${valid_search_output_format[*]}" -- "$cur")
-}
-
-__devtools_complete() {
-	local service=$1
-	local cur prev
-
-	# Don't break words at : and =
-	COMP_WORDBREAKS=${COMP_WORDBREAKS//[:=]}
-
-	cur=$(_get_cword)
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	__pkgctl_handle_subcommands "${service}"
-	return 0
-}
-
-__pkgctl_has_func() {
-	declare -f -- "${1}" &>/dev/null
-}
-
-__pkgctl_has_array() {
-	declare -p -- "${1}" &>/dev/null
-}
-
-__pkgctl_is_subcommand() {
-	__pkgctl_has_array "${1}"_args || \
-		__pkgctl_has_array "${1}"_cmds
-}
-
-__pkgctl_words_after_subcommand() {
-	local subcommand=("$@")
-	local subcommand_idx=0
-	local word prev_word
-	for ((i = 1; i < ${#COMP_WORDS[@]}; ++i)); do
-		word=${COMP_WORDS[i]}
-		prev_word=${COMP_WORDS[i-1]}
-		# skip options and the current typing
-		if [[ ${word} == -* ]] || [[ ${word} == "${cur}" ]]; then
-			continue
-		fi
-		# skip until we resolved the passed subcommand
-		if (( subcommand_idx < ${#subcommand[@]} )); then
-			if [[ $word == "${subcommand[$subcommand_idx]}" ]]; then
-				subcommand_idx=$(( subcommand_idx + 1 ))
-			fi
-			continue
-		fi
-		# skip previous options as they belong to the argument
-		if [[ ${prev_word} == -* ]] && __pkgctl_has_func "${service_name}_args${prev_word//-/_}_opts"; then
-			continue
-		fi
-		printf "%s\n" "${word}"
-	done
-}
-__pkgctl_word_count_after_subcommand() {
-	local subcommand=("$@")
-	mapfile -t words < <(__pkgctl_words_after_subcommand "${subcommand[@]}")
-	echo "${#words[@]}"
-}
-
-__pkgctl_handle_subcommands() {
-	local service_name=${1}
-	local index=${2:-0}
-	local word ref
-
-	# recurse into nested subcommands
-	for ((i = index + 1; i < ${#COMP_WORDS[@]}; ++i)); do
-		word=${COMP_WORDS[i]}
-		if [[ ${word} == -* ]] || [[ ${word} == "${cur}" ]]; then
-			continue
-		fi
-		if __pkgctl_is_subcommand "${service_name}_${word}"; then
-			__pkgctl_handle_subcommands "${service_name}_${word}" "${i}"
-			return
-		fi
-	done
-
-	# dynamic argument options
-	if [[ $prev == -* ]] && word=${prev//-/_} && __pkgctl_has_func "${service_name}_args${word}_opts"; then
-		"${service_name}_args${word}_opts"
-	# dynamic subcommand options
-	elif [[ $cur != -* ]] && __pkgctl_has_func "${service_name}_opts"; then
-		"${service_name}_opts"
-	# subcommand argument array
-	elif ( ! __pkgctl_has_array "${service_name}"_cmds || [[ $cur == -* ]] ) && __pkgctl_has_array "${service_name}_args"; then
-		declare -n ref="${service_name}_args"
-		mapfile -t COMPREPLY < <(compgen -W "${ref[*]}" -- "$cur")
-	# subcommand array
-	elif __pkgctl_has_array "${service_name}"_cmds; then
-		declare -n ref="${service_name}_cmds"
-		mapfile -t COMPREPLY < <(compgen -W "${ref[*]}" -- "$cur")
-	fi
-}
-
-
-_pkgctl() { __devtools_complete _pkgctl; }
-complete -F _pkgctl pkgctl
-# ex:noet ts=4 sw=4 ft=sh

contrib/completion/zsh/_devtools.in

@@ -3,18 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/valid-build-install.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-build-install.sh
 # shellcheck source=src/lib/valid-tags.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
 # shellcheck source=src/lib/valid-repos.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
-# shellcheck source=src/lib/valid-inspect.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
-# shellcheck source=src/lib/valid-search.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
 
-_binary_arch=${DEVTOOLS_VALID_ARCHES[*]:0:-1}
+_binary_arch=${_arch[*]:0:-1}
 _colors=(never always auto)
 
 _archbuild_args=(
@@ -42,20 +36,16 @@ _pkgctl_auth_status_args=(
 
 _pkgctl_build_args=(
 	"--arch=[Specify architectures to build for (disables auto-detection)]:arch:($_arch[*])"
-	"--repo=[Specify a target repository (disables auto-detection)]:repo:($DEVTOOLS_VALID_REPOS[*])"
+	"--repo=[Specify a target repository (disables auto-detection)]:repo:($_repos[*])"
 	'(-s --staging)'{-s,--staging}'[Build against the staging counterpart of the auto-detected repo]'
 	'(-t --testing)'{-t,--testing}'[Build against the testing counterpart of the auto-detected repo]'
 	'(-o --offload)'{-o,--offload}'[Build on a remote server and transfer artifacts afterwards]'
 	'(-c --clean)'{-c,--clean}'[Recreate the chroot before building]'
-	"--inspect[Spawn an interactive shell to inspect the chroot (never, always, failure)]:inspect:($DEVTOOLS_VALID_INSPECT_MODES[*])"
+	'(-I --install)'{-I,--install}'[Install a package into the working copy of the chroot]:target:_files -g "*.pkg.tar.*(.)"'
-	'*'{-I,--install-to-chroot}'[Install a package to the working copy of the chroot]:target:_files -g "*.pkg.tar.*(.)"'
-	'*'{-i,--install-to-host}"[Install the built packages to the host system]:mode:($DEVTOOLS_VALID_BUILD_INSTALL[*])"
-	'(-w --worker)'{-w,--worker}'[Name of the worker slot, useful for concurrent builds (disables auto-detection)]:slot:'
 	'--nocheck[Do not run the check() function in the PKGBUILD]'
 	'--pkgver=[Set pkgver, reset pkgrel and update checksums]:pkgver:'
 	'--pkgrel=[Set pkgrel to a given value]:pkgrel:'
 	'--rebuild[Increment the pkgrel variable]'
-	'--update-checksums[Force computation and update of the checksums (disables auto-detection)]'
 	'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
 	'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
 	'(-m --message=)'{-m,--message=}"[Use the given <msg> as the commit message]:message:"
@@ -73,15 +63,15 @@ _pkgctl_db_cmds=(
 
 _pkgctl_db_move_args=(
 	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:src-repo:($DEVTOOLS_VALID_REPOS[*])"
+	"1:src-repo:($_repos[*])"
-	"2:target-repo:($DEVTOOLS_VALID_REPOS[*])"
+	"2:target-repo:($_repos[*])"
 	'*:pkgbase:_devtools_completions_all_packages'
 )
 
 _pkgctl_db_remove_args=(
 	'(-a --arch=)'{-a,--arch=}"[Override the architecture (disables auto-detection)]:arch:($_arch[*])"
 	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:repo:($DEVTOOLS_VALID_REPOS[*])"
+	"1:repo:($_repos[*])"
 	'*:pkgbase:_devtools_completions_all_packages'
 )
 
@@ -91,7 +81,7 @@ _pkgctl_db_update_args=(
 
 _pkgctl_release_args=(
 	'(-m --message=)'{-m,--message=}"[Use the given <msg> as the commit message]:message:"
-	'(-r --repo=)'{-r,--repo=}"[Specify a target repository for new packages]:repo:($DEVTOOLS_VALID_REPOS[*])"
+	'(-r --repo=)'{-r,--repo=}"[Specify a target repository (disables auto-detection)]:repo:($_repos[*])"
 	'(-s --staging)'{-s,--staging}'[Release to the staging counterpart of the auto-detected repo]'
 	'(-t --testing)'{-t,--testing}'[Release to the testing counterpart of the auto-detected repo]'
 	'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database after uploading]'
@@ -99,47 +89,22 @@ _pkgctl_release_args=(
 	'*:git_dir:_files -/'
 )
 
-_pkgctl_aur_cmds=(
-	"pkgctl aur command"
-	"drop-from-repo[Drop a package from the official repository to the AUR]"
-)
-
-_pkgctl_aur_drop_from_repo_args=(
-	'(-f --force)'{-f,--force}'[Force push to the AUR overwriting the remote repository]'
-	'--no-disown[Do not disown the package on the AUR]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
 _pkgctl_repo_cmds=(
 	"pkgctl repo command"
 	"clone[Clone a package repository]"
 	"configure[Configure a clone according to distro specs]"
 	"create[Create a new GitLab package repository]"
-	"switch[Switch a package repository to a specified version]"
 	"web[Open the packaging repository's website]"
 )
 
-_pkgctl_repo_switch_args=(
-	'(-f --force --discard-changes)'{-f,--force,--discard-changes}'[Discard changes if index or working tree is dirty]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:version'
-	'*:git_dir:_files -/'
-)
-
 _pkgctl_repo_clone_args=(
 	'(-m --maintainer=)'{-m,--maintainer=}'[Clone all packages of the named maintainer]:maintainer:'
-	'--protocol[Clone the repository over https]:proto:(https)'
-	'--switch=[Switch the current working tree to a specified version]'
 	'--universe[Clone all existing packages, useful for cache warming]'
-	'(-j --jobs)'{-j,--jobs}'[Run up to N jobs in parallel (default: number of processing units)]:jobs:'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:packages:_devtools_completions_all_packages'
 )
 
 _pkgctl_repo_configure_args=(
-	'--protocol[Configure remote url to use https]:proto:(https)'
-	'(-j --jobs)'{-j,--jobs}'[Run up to N jobs in parallel (default: number of processing units)]:jobs:'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:git_dir:_files -/'
 )
@@ -151,25 +116,15 @@ _pkgctl_repo_create_args=(
 )
 
 _pkgctl_repo_web_args=(
-	'--print[Print the url instead of opening it with xdg-open]'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:git_dir:_files -/'
 )
 
-_pkgctl_search_args=(
-	'--no-default-filter[Do not apply default filter (like -path:keys/pgp/*.asc)]'
-	'--json[Enable printing results in JSON]'
-	'(-F --format)'{-F,--format}"[Controls the formatting of the results]:format:($valid_search_output_format[*])"
-	'(-N --no-line-number)'{-N,--no-line-number}"[Don't show line numbers when formatting results]"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:query'
-)
-
 _arch_nspawn_args=(
 	'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
 	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
-	'*-c[Set pacman cache]:pacman_cache:_files -/'
+	'-c[Set pacman cache]:pacman_cache:_files -/'
-	'*-f[Copy file from the host to the chroot]:copy_file:_files'
+	'-f[Copy file from the host to the chroot]:copy_file:_files'
 	'-s[Do not run setarch]'
 	'-h[Display usage]'
 	'1:chroot_dir:_files -/'
@@ -177,14 +132,14 @@ _arch_nspawn_args=(
 
 _archrelease_args=(
 	'-f[Force release without checks]'
-	"*:arch:($DEVTOOLS_VALID_TAGS[*])"
+	"*:arch:($_tags[*])"
 )
 
 _commitpkg_args=(
 	'-f[Force release without checks]'
 	'-s[Target repo server]'
 	'-l[Set bandwidth limit]:limit'
-	"-a[Release to a specific architecture only]:arch:($DEVTOOLS_VALID_ARCHES[*])"
+	"-a[Release to a specific architecture only]:arch:($_arch[*])"
 	'1:commit_msg'
 )
 
@@ -211,16 +166,15 @@ _finddeps_args=(
 _makechrootpkg_args=(
 	'-h[Display usage]'
 	'-c[Clean the chroot before building]'
-	'*-d[Bind directory into build chroot as read-write]:bind_dir_rw:_files -/'
+	'-d[Bind directory into build chroot as read-write]:bind_dir_rw:_files -/'
-	'*-D[Bind directory into build chroot as read-only]:bind_dir_ro:_files -/'
+	'-D[Bind directory into build chroot as read-only]:bind_dir_ro:_files -/'
 	'-u[Update the working copy of the chroot before building]'
 	'-r[The chroot dir to use]:chroot_dir:_files -/'
-	'*-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
+	'-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
 	'-l[The directory to use as the working copy]:copy_dir:_files -/'
 	'-n[Run namcap on the package]'
 	'-T[Build in a temporary directory]'
 	'-U[Run makepkg as a specified user]:makepkg_user'
-	"-x[Spawn an interactive shell to inspect the chroot (never, always, failure)]:inspect:($DEVTOOLS_VALID_INSPECT_MODES[*])"
 )
 
 _mkarchroot_args=(
@@ -244,12 +198,12 @@ _sogrep_args=(
 	'(-v --verbose)'{-v,--verbose}'[Show matched links in addition to pkgname]'
 	'(-r --refresh)'{-r,--refresh}'[Refresh the links databases]'
 	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:repo:(all $DEVTOOLS_VALID_REPOS[*])'
+	'1:repo:(all $_repos[*])'
 	'2:libname'
 )
 
 _offload_build_args=(
-	'(-r --repo)'{-r,--repo}'[Build against a specific repository]:repo:($DEVTOOLS_VALID_BUILDREPOS[*])'
+	'(-r --repo)'{-r,--repo}'[Build against a specific repository]:repo:($_build_repos[*])'
 	'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${_binary_arch[*]})'
 	'(-s --server)'{-s,--server}'[Offload to a specific Build server]:server:'
 	'(-h --help)'{-h,--help}'[Display usage]'
@@ -257,7 +211,6 @@ _offload_build_args=(
 
 _makerepropkg_args=(
 	'-d[Run diffoscope if the package is unreproducible]'
-	'-n[Do not run the check() function in the PKGBUILD]'
 	'-c[Set pacman cache]:pacman_cache:_files -/'
 	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
 	'-h[Display usage]'
@@ -272,38 +225,12 @@ _devtools_completions_all_packages() {
 
 _pkgctl_cmds=(
 	"pkgctl command"
-	"aur[Interact with the Arch User Repository (AUR)]"
 	"auth[Authenticate with services like GitLab]"
 	"build[Build packages inside a clean chroot]"
-	"db[Pacman database modification for package update, move etc]"
+	"db[Pacman database modification for packge update, move etc]"
 	"diff[Compare package files using different modes]"
 	"release[Release step to commit, tag and upload build artifacts]"
 	"repo[Manage Git packaging repositories and their configuration]"
-	"search[Search for an expression across the GitLab packaging group]"
-	"version[Check and manage package versions against upstream]"
-)
-
-_pkgctl_args=(
-	'(-V --version)'{-V,--version}'[Show pkgctl version information]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_version_cmds=(
-	"pkgctl version command"
-	"check[Compares local package versions against upstream versions]"
-	"upgrade[Adjust the PKGBUILD to match the latest upstream version]"
-)
-
-_pkgctl_version_check_args=(
-	'(-v --verbose)'{-v,--verbose}'[Display results including up-to-date versions]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_version_upgrade_args=(
-	'(-v --verbose)'{-v,--verbose}'[Display results including up-to-date versions]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
 )
 
 _pkgctl_diff_args=("${_diffpkg_args[@]}")
@@ -316,16 +243,11 @@ _handle_subcommands() {
 			'*::arg:->args'
 		case $state in
 			cmds)
-				if [[ "${line[-1]}" == -* ]] && typeset -p ${service_name}_args &> /dev/null; then
+				local service_cmds=${service_name}_cmds[@]
-					local argname="${service_name}_args[@]"
+				_values "${(P)service_cmds}"
-					_arguments -s "${(P)argname}"
-				else
-					local service_cmds=${service_name}_cmds[@]
-					_values "${(P)service_cmds}"
-				fi
 				;;
 			args)
-				local service_sub=${service_name}_${line[1]//-/_}
+				local service_sub=${service_name}_$line[1]
 				if typeset -p ${service_sub}_args &> /dev/null; then
 					local cmd_args=${service_sub}_args[@]
 					_arguments -s "${(P)cmd_args}"

doc/asciidoc.conf

@@ -0,0 +1,37 @@
+## linkman: macro
+# Inspired by/borrowed from the GIT source tree at Documentation/asciidoc.conf
+#
+# Usage: linkman:command[manpage-section]
+#
+# Note, {0} is the manpage section, while {target} is the command.
+#
+# Show man link as: <command>(<section>); if section is defined, else just show
+# the command.
+
+[macros]
+(?su)[\\]?(?P<name>linkman):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+
+[attributes]
+asterisk=&#42;
+plus=&#43;
+caret=&#94;
+startsb=&#91;
+endsb=&#93;
+backslash=&#92;
+tilde=&#126;
+apostrophe=&#39;
+backtick=&#96;
+litdd=&#45;&#45;
+
+ifdef::backend-docbook[]
+[linkman-inlinemacro]
+{0%{target}}
+{0#<citerefentry>}
+{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
+{0#</citerefentry>}
+endif::backend-docbook[]
+
+ifdef::backend-xhtml11[]
+[linkman-inlinemacro]
+<a href="{target}.{0}.html">{target}{0?({0})}</a>
+endif::backend-xhtml11[]

doc/man/archbuild.1.asciidoc

@@ -43,6 +43,6 @@ Options
 See Also
 --------
 
-devtools(7)
+linkman:devtools[7]
 
 include::include/footer.asciidoc[]

doc/man/checkpkg.1.asciidoc

@@ -38,6 +38,6 @@ Options
 See Also
 --------
 
-find-libprovides(1)
+linkman:find-libprovides[1]
 
 include::include/footer.asciidoc[]

doc/man/devtools.7.asciidoc

@@ -21,47 +21,47 @@ Programs
 The list below gives a short overview; see the respective documentation
 for details.
 
-pkgctl(1)
+linkman:pkgctl[1]
 	Unified command-line frontend for devtools
 
-archbuild(1)
+linkman:archbuild[1]
 	Build an Arch Linux package inside a clean chroot
 
-arch-nspawn(1)
+linkman:arch-nspawn[1]
 	Run a command or OS in a light-weight namespace container
 
-checkpkg(1)
+linkman:checkpkg[1]
 	Compare the current build package with the repository version
 
-diffpkg(1)
+linkman:diffpkg[1]
 	Compare package files using different modes
 
-export-pkgbuild-keys(1)
+linkman:export-pkgbuild-keys[1]
 	Export valid source signing keys from a PKGBUILD
 
-find-libdeps(1)
+linkman:find-libdeps[1]
 	Find soname dependencies for a package
 
-find-libprovides(1)
+linkman:find-libprovides[1]
 	Find soname's which are provided by a package
 
-lddd(1)
+linkman:lddd[1]
 	Find broken library links on your system
 
-mkarchroot(1)
+linkman:mkarchroot[1]
 	Creates an arch chroot in a specified location with a specified set of
 	packages
 
-makechrootpkg(1)
+linkman:makechrootpkg[1]
 	Build a PKGBUILD in a given chroot environment
 
-makerepropkg(1)
+linkman:makerepropkg[1]
 	Rebuild a package to see if it is reproducible
 
-offload-build(1)
+linkman:offload-build[1]
 	Build a PKGBUILD on a remote server using makechrootpkg
 
-sogrep(1)
+linkman:sogrep[1]
 	Find packages using a linked to a given shared library
 
 include::include/footer.asciidoc[]

doc/man/diffpkg.1.asciidoc

@@ -1,5 +1,5 @@
 diffpkg(1)
-==========
+===========
 
 Name
 ----

doc/man/lddd.1.asciidoc

@@ -20,6 +20,6 @@ collected data is written to a temporary directory created by mktemp.
 See Also
 --------
 
-ldd(1)
+linkman:ldd[1]
 
 include::include/footer.asciidoc[]

doc/man/makechrootpkg.1.asciidoc

@@ -73,8 +73,4 @@ Options
 *-U*::
 	Run makepkg as a specified user
 
-*-x* <when>::
-	Inspect chroot after build, possible modes are 'never' (default), 'always' or 'failure'
-
-
 include::include/footer.asciidoc[]

doc/man/makerepropkg.1.asciidoc

@@ -1,5 +1,5 @@
 makerepropkg(1)
-===============
+================
 
 Name
 ----
@@ -16,7 +16,7 @@ Given the path to a built pacman package(s), attempt to rebuild it using the
 PKGBUILD in the current directory. The package will be built in an environment
 as closely matching the environment of the initial package as possible, by
 building up a chroot to match the information exposed in the package's
-BUILDINFO(5) manifest. On success, the resulting package will be
+linkman:BUILDINFO[5] manifest. On success, the resulting package will be
 compared to the input package, and makerepropkg will report whether the
 artifacts are identical.
 
@@ -42,9 +42,6 @@ Options
 *-d*::
 	If packages are not reproducible, compare them using diffoscope.
 
-*-n*::
-	Do not run the check() function in the PKGBUILD.
-
 *-c*::
 	Set the pacman cache directory.
 

doc/man/mkarchroot.1.asciidoc

@@ -1,5 +1,5 @@
 mkarchroot(1)
-=============
+==============
 
 Name
 ----
@@ -44,6 +44,6 @@ Options
 See Also
 --------
 
-pacman(1)
+linkman:pacman[1]
 
 include::include/footer.asciidoc[]

doc/man/pkgctl-aur-drop-from-repo.1.asciidoc

@@ -1,41 +0,0 @@
-pkgctl-aur-drop-from-repo(1)
-============================
-
-Name
-----
-pkgctl-aur-drop-from-repo - Drop a package from the official repository to the AUR
-
-Synopsis
---------
-pkgctl aur drop-from-repo [OPTIONS] [PATH]...
-
-Description
------------
-
-Drops a specified package from the official repositories to the Arch User
-Repository.
-
-This command requires a local Git clone of the package repository. It
-reconfigures the repository for AUR compatibility and pushes it to the
-AUR. Afterwards, the package is removed from the official repository.
-
-By default, the package is automatically disowned in the AUR.
-
-Options
--------
-
-*--no-disown*::
-	Do not disown the package on the AUR
-
-*-f, --force*::
-	Force push to the AUR overwriting the remote repository
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-db-remove(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-aur.1.asciidoc

@@ -1,37 +0,0 @@
-pkgctl-aur(1)
-=============
-
-Name
-----
-pkgctl-aur - Interact with the Arch User Repository (AUR)
-
-Synopsis
---------
-pkgctl aur [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Provides a suite of tools designed for managing and interacting with the Arch
-User Repository (AUR). It simplifies various tasks related to AUR, including
-importing repositories, managing packages, and transitioning packages between
-the official repositories and the AUR.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl aur drop-from-repo::
-	Drop a package from the official repository to the AUR
-
-See Also
---------
-
-pkgctl-aur-drop-from-repo(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-auth-login.1.asciidoc

@@ -1,40 +0,0 @@
-pkgctl-auth-login(1)
-====================
-
-Name
-----
-pkgctl-auth-login - Authenticate with the GitLab instance
-
-Synopsis
---------
-pkgctl auth login [OPTIONS]
-
-Description
------------
-
-Interactively authenticate with the GitLab instance.
-
-The minimum required scopes for the token are: 'api', 'write_repository'.
-
-The GitLab API token can either be stored in a plaintext file in
-'$XDG_CONFIG_HOME/devtools/gitlab.conf', or supplied via the
-'DEVTOOLS_GITLAB_TOKEN' environment variable using any command (gpg, vault,
-password manager) by declaring a shell alias:
-
-    $ alias pkgctl='DEVTOOLS_GITLAB_TOKEN="$(command to obtain token)" pkgctl'
-
-Options
--------
-
-*-g, --gen-access-token*::
-	Open the URL to generate a new personal access token
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-auth-status(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-auth-status.1.asciidoc

@@ -1,32 +0,0 @@
-pkgctl-auth-status(1)
-=====================
-
-Name
-----
-pkgctl-auth-status - View authentication status
-
-Synopsis
---------
-pkgctl auth status [OPTIONS]
-
-Description
------------
-
-Verifies and displays information about your authentication state of
-services like the GitLab instance and reports issues if any.
-
-Options
--------
-
-*-t, --show-token*::
-	Display the auth token
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-auth-login(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-auth.1.asciidoc

@@ -1,38 +0,0 @@
-pkgctl-auth(1)
-==============
-
-Name
-----
-pkgctl-auth - Authenticate with serivces like GitLab.
-
-Synopsis
---------
-pkgctl auth [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Manage the authorization for the GitLab instance and show its current status.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl auth login::
-	Authenticate with the GitLab instance
-
-pkgctl auth status::
-	View authentication status
-
-See Also
---------
-
-pkgctl-auth-login(1)
-pkgctl-auth-status(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-build.1.asciidoc

@@ -21,10 +21,7 @@ Build Options
 	Specify architectures to build for (disables auto-detection)
 
 *--repo* 'REPO'::
-	Specify target repository for new packages not in any official repo.
+	Specify a target repository (disables auto-detection)
-	Fallback to `'extra'` when building packages that are not present in any
-	official repository yet. Using this option is disallowed if the package is
-	already released, as it would circumvent the auto-detection safeguard.
 
 *-s, --staging*::
 	Build against the staging counterpart of the auto-detected repo
@@ -38,30 +35,12 @@ Build Options
 *-c, --clean*::
 	Recreate the chroot before building
 
-*--inspect* 'WHEN'::
+*-I, --install* 'FILE'::
-	Spawn an interactive shell to inspect the chroot after building. Useful to ease the debugging of a package build. +
+	Install a package into the working copy of the chroot
-	Possible values for 'WHEN' are `'never'`, `'always'` or `'failure'`
-
-*-w, --worker* 'SLOT'::
-	Name of the worker slot, useful for concurrent builds. By default the slot
-	is automatically assigned to the current tty pts number. In case the caller
-	is not a tty, choose a random slot between 1 and number of available
-	processing units.
 
 *--nocheck*::
 	Do not run the check() function in the PKGBUILD
 
-Install Options
----------------
-
-*-I, --install-to-chroot* 'FILE'::
-	Install a package to the working copy of the chroot
-
-*-i, --install-to-host* 'MODE'::
-	Install the built packages to the host system. Useful when one wants to verify that the package works as intended.
-	* When 'MODE' is 'all', this installs all built packages
-	* When 'MODE' is 'auto', this installs all built packages which are currently installed
-
 PKGBUILD Options
 ----------------
 
@@ -74,13 +53,6 @@ PKGBUILD Options
 *--rebuild*::
 	Increment the current pkgrel variable
 
-*--update-checksums*::
-	Force computation and update of the checksums by disabling auto-detection. +
-	Should only be used in special circumstances, like when adding new patch
-	files to the source array. During regular packaging operations, checksums
-	are either automatically updated when upgrading a package using `--pkgver`
-	or should remain immutable during rebuilds.
-
 *-e, --edit*::
 	Edit the PKGBUILD before building
 
@@ -88,9 +60,7 @@ Release Options
 ---------------
 
 *-r, --release*::
-	Automatically commit, tag and release after building +
+	Automatically commit, tag and release after building
-	Specifying this option is required when using any of the following options
-	in this section
 
 *-m, --message* 'MSG'::
 	Use the given <msg> as the commit message
@@ -107,7 +77,7 @@ Options
 See Also
 --------
 
-pkgctl-release(1)
+linkman:pkgctl-release[1]
-pkgctl-db-update(1)
+linkman:pkgctl-db-update[1]
 
 include::include/footer.asciidoc[]

doc/man/pkgctl-db-move.1.asciidoc

@@ -3,16 +3,17 @@ pkgctl-db-move(1)
 
 Name
 ----
-pkgctl-db-move - Move packages between binary repositories.
+pkgctl-db-update - Update the binary repository as final release step
 
 Synopsis
 --------
-pkgctl db move [OPTIONS] [SOURCE_REPO] [TARGET_REPO] [PKGBASE]...
+pkgctl db update [OPTIONS]
 
 Description
 -----------
 
-Move packages between binary repositories i.e. from 'extra-testing' to 'extra'.
+Update the pacman database as final release step for packages that
+have been transfered and staged on 'repos.archlinux.org'.
 
 Options
 -------

doc/man/pkgctl-db-update.1.asciidoc

@@ -1,19 +1,18 @@
-pkgctl-db-update(1)
+pkgctl-db-move(1)
-===================
+=================
 
 Name
 ----
-pkgctl-db-update - Update the binary repository as final release step
+pkgctl-db-move - Move packages between binary repositories
 
 Synopsis
 --------
-pkgctl db update [OPTIONS]
+pkgctl db move [OPTIONS] [SOURCE_REPO] [TARGET_REPO] [PKGBASE]...
 
 Description
 -----------
 
-Update the pacman database as final release step for packages that
+Move packages between pacman repositories.
-have been transfered and staged on 'repos.archlinux.org'.
 
 Options
 -------

doc/man/pkgctl-release.1.asciidoc

@@ -27,9 +27,7 @@ Options
 	Use the given <msg> as the commit message
 
 *-r, --repo* 'REPO'::
-	Specify target repository for new packages not in any official repo.
+	Specify a target repository (disables auto-detection)
-	Using this option is disallowed if the package is already released, as it
-	would circumvent the auto-detection safeguard.
 
 *-s, --staging*::
 	Build against the staging counterpart of the auto-detected repo
@@ -46,6 +44,6 @@ Options
 See Also
 --------
 
-pkgctl-db-update(1)
+linkman:pkgctl-db-update[1]
 
 include::include/footer.asciidoc[]

doc/man/pkgctl-repo-clone.1.asciidoc

@@ -1,5 +1,5 @@
 pkgctl-repo-clone(1)
-====================
+======================
 
 Name
 ----
@@ -25,28 +25,15 @@ Options
 *-m, --maintainer* 'NAME'::
 	Clone all packages of the named maintainer
 
-*--protocol* 'https'::
-	Clone the repository over https
-
 *--universe*::
 	Clone all existing packages, useful for cache warming
 
-*--switch* 'VERSION'::
-	Switch to a specified version. The working tree and the index are updated to
-	match the version.
-
-*-j, --jobs* 'N'::
-	Run up to N jobs in parallel. By default the number of jobs is equal to the
-	number of available processing units. For sequential processing this option
-	needs to be passed with 1.
-
 *-h, --help*::
 	Show a help text
 
 See Also
 --------
 
-pkgctl-repo-configure(1)
+linkman:pkgctl-repo-configure[1]
-pkgctl-repo-switch(1)
 
 include::include/footer.asciidoc[]

doc/man/pkgctl-repo-configure.1.asciidoc

@@ -22,19 +22,9 @@ The remote protocol is automatically determined from the author email
 address by choosing SSH for all official packager identities and
 read-only HTTPS otherwise.
 
-Git default excludes and hooks are applied to the configured repo.
-
 Options
 -------
 
-*--protocol* 'https'::
-	Configure remote url to use https
-
-*-j, --jobs* 'N'::
-	Run up to N jobs in parallel. By default the number of jobs is equal to the
-	number of available processing units. For sequential processing this option
-	needs to be passed with 1.
-
 *-h, --help*::
 	Show a help text
 

doc/man/pkgctl-repo-create.1.asciidoc

@@ -1,5 +1,5 @@
 pkgctl-repo-create(1)
-=====================
+======================
 
 Name
 ----
@@ -33,8 +33,8 @@ Options
 See Also
 --------
 
-pkgctl-auth(1)
+linkman:pkgctl-auth[1]
-pkgctl-repo-clone(1)
+linkman:pkgctl-repo-clone[1]
-pkgctl-repo-configure(1)
+linkman:pkgctl-repo-configure[1]
 
 include::include/footer.asciidoc[]

doc/man/pkgctl-repo-switch.1.asciidoc

@@ -1,36 +0,0 @@
-pkgctl-repo-switch(1)
-=====================
-
-Name
-----
-pkgctl-repo-switch - Switch a package repository to a specified version
-
-Synopsis
---------
-pkgctl repo switch [OPTIONS] [VERSION] [PKGBASE]...
-
-Description
------------
-
-Switch a package source repository to a specified version, tag or branch.
-The working tree and the index are updated to match the specified ref.
-
-If a version identifier is specified in the pacman version format, that
-identifier is automatically translated to the Git tag name accordingly.
-
-The current working directory is used if no PKGBASE is specified.
-
-Options
--------
-
-*--discard-changes*::
-	Proceed even if the index or the working tree differs from HEAD. Both the
-	index and working tree are restored to match the switching target.
-
-*-f, --force*::
-	An alias for '--discard-changes'.
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo-web.1.asciidoc

@@ -18,9 +18,6 @@ no arguments, open the package cloned in the current working directory.
 Options
 -------
 
-*--print*::
-	Print the url instead of opening it with xdg-open
-
 *-h, --help*::
 	Show a help text
 

doc/man/pkgctl-repo.1.asciidoc

@@ -1,5 +1,5 @@
 pkgctl-repo(1)
-==============
+================
 
 Name
 ----
@@ -41,19 +41,15 @@ pkgctl repo configure::
 pkgctl repo create::
 	Create a new GitLab package repository
 
-pkgctl repo switch::
-	Switch a package repository to a specified version
-
 pkgctl repo web::
 	Open the packaging repository's website
 
 See Also
 --------
 
-pkgctl-repo-clone(1)
+linkman:pkgctl-repo-clone[1]
-pkgctl-repo-configure(1)
+linkman:pkgctl-repo-configure[1]
-pkgctl-repo-create(1)
+linkman:pkgctl-repo-create[1]
-pkgctl-repo-switch(1)
+linkman:pkgctl-repo-web[1]
-pkgctl-repo-web(1)
 
 include::include/footer.asciidoc[]

doc/man/pkgctl-search.1.asciidoc

@@ -1,71 +0,0 @@
-pkgctl-search(1)
-================
-
-Name
-----
-pkgctl-search - Search for an expression across the GitLab packaging group
-
-Synopsis
---------
-pkgctl search [OPTIONS] QUERY
-
-Description
------------
-
-Search for an expression across the GitLab packaging group.
-
-To use a filter, include it in your query. You may use wildcards (*) to
-use glob matching.
-
-Available filters for the blobs scope: path, extension
-
-Every usage of the search command must be authenticated. Consult the
-`'pkgctl auth'` command to authenticate with GitLab or view the authentication
-status.
-
-Search Tips
------------
-
-	Syntax  Description    Example
-	───────────────────────────────────────
-	"       Exact search   "gem sidekiq"
-	~       Fuzzy search   J~ Doe
-	|       Or             display | banner
-	+       And            display +banner
-	-       Exclude        display -banner
-	*       Partial        bug error 50*
-	\       Escape         \*md
-	#       Issue ID       #23456
-	!       Merge request  !23456
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Filter Options
---------------
-
-*--no-default-filter*::
-	Do not apply default filter (like -path:keys/pgp/*.asc)
-
-Output Options
---------------
-
-*--json*::
-	Enable printing in JSON; Shorthand for `'--format json'`
-
-*-F, --format* 'FORMAT'::
-	Controls the formatting of the results; `FORMAT` is `'pretty'`, `'plain'`,
-	or `'json'` (default `pretty`)
-
-*-N, --no-line-number*::
-	Don't show line numbers when formatting results
-
-See Also
---------
-
-pkgctl-auth(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-version-check.1.asciidoc

@@ -1,66 +0,0 @@
-pkgctl-version-check(1)
-=======================
-
-Name
-----
-pkgctl-version-check - Compares local package versions against upstream
-
-Synopsis
---------
-pkgctl version check [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Compares the versions of packages in the local packaging repository against
-their latest upstream versions.
-
-Upon execution, it generates a grouped list that provides detailed insights
-into each package's status. For each package, it displays the current local
-version alongside the latest version available upstream.
-
-Outputs a summary of up-to-date packages, out-of-date packages, and any check
-failures.
-
-This simplifies the maintenance of PKGBUILD files, reducing the manual effort
-required to track version changes from upstream sources.
-
-Configuration
--------------
-
-Uses nvchecker(1) and a `.nvchecker.toml` file located alongside the
-PKGBUILD. Refer to the configuration section in pkgctl-version(1).
-
-Options
--------
-
-*-v, --verbose*::
-	Display results including up-to-date versions
-
-*-h, --help*::
-	Show a help text
-
-Exit Codes
-----------
-
-On exit, return one of the following codes:
-
-*0*::
-	Normal exit condition, all checked versions are up-to-date
-
-*1*::
-	Unknown cause of failure
-
-*2*::
-	Normal exit condition, but there are out-of-date versions
-
-*3*::
-	Failed to run some version checks
-
-See Also
---------
-
-pkgctl-version(1)
-nvchecker(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-version-upgrade.1.asciidoc

@@ -1,50 +0,0 @@
-pkgctl-version-upgrade(1)
-=========================
-
-Name
-----
-pkgctl-version-upgrade - Adjust the PKGBUILD to match the latest upstream version
-
-Synopsis
---------
-pkgctl version upgrade [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Streamlines the process of keeping PKGBUILD files up-to-date with the latest
-upstream versions.
-
-Upon execution, it automatically adjusts the PKGBUILD file, ensuring that the
-pkgver field is set to match the latest version available from the upstream
-source. In addition to updating the pkgver, this command also resets the pkgrel
-to 1.
-
-Outputs a summary of upgraded packages, up-to-date packages, and any check
-failures.
-
-This simplifies the maintenance of PKGBUILD files, reducing the manual effort
-required to track and implement version changes from upstream sources.
-
-Configuration
--------------
-
-Uses nvchecker(1) and a `.nvchecker.toml` file located alongside the
-PKGBUILD. Refer to the configuration section in pkgctl-version(1).
-
-Options
--------
-
-*-v, --verbose*::
-	Display results including up-to-date versions
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-version(1)
-nvchecker(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-version.1.asciidoc

@@ -1,60 +0,0 @@
-pkgctl-version(1)
-=================
-
-Name
-----
-pkgctl-version - Check and manage package versions against upstream
-
-
-Synopsis
---------
-pkgctl version [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Commands related to package versions, including checks for outdated packages.
-
-Uses nvchecker(1) and a `.nvchecker.toml` file located alongside the
-PKGBUILD.
-
-Configuration
--------------
-
-The `.nvchecker.toml` file must contain a section that matches the
-package's pkgbase. The pkgbase section within the `.nvchecker.toml` file
-specifies the source and method for checking the latest version of the
-corresponding package.
-
-For detailed information on the various configuration options available for the
-`.nvchecker.toml` file, refer to the configuration files section in
-nvchecker(1). This documentation provides insights into the possible
-options that can be utilized to customize the version checking process.
-
-To supply GitHub or GitLab tokens to nvchecker, a `keyfile.toml` should be
-placed in the `$XDG_CONFIG_HOME`/nvchecker` directory. This keyfile is
-used for providing the necessary authentication tokens required for
-accessing the GitHub or GitLab API.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl version check::
-	Compares local package versions against upstream
-
-pkgctl version upgrade::
-	Adjust the PKGBUILD to match the latest upstream version
-
-See Also
---------
-
-pkgctl-version-check(1)
-pkgctl-version-upgrade(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl.1.asciidoc

@@ -14,21 +14,9 @@ Description
 
 TODO
 
-Options
--------
-
-*-V, --version*::
-	Show pkgctl version information
-
-*-h, --help*::
-	Show a help text
-
 Subcommands
 -----------
 
-pkgctl aur::
-	Interact with the Arch User Repository
-
 pkgctl auth::
 	Authenticate with services like GitLab
 
@@ -36,7 +24,7 @@ pkgctl build::
 	Build packages inside a clean chroot
 
 pkgctl db::
-	Pacman database modification for package update, move etc
+	Pacman database modification for packge update, move etc
 
 pkgctl diff::
 	Compare package files using different modes
@@ -47,23 +35,14 @@ pkgctl release::
 pkgctl repo::
 	Manage Git packaging repositories and their configuration
 
-pkgctl search::
-	Search for an expression across the GitLab packaging group
-
-pkgctl version::
-	Check and manage package versions against upstream
-
 See Also
 --------
 
-pkgctl-aur(1)
+linkman:pkgctl-auth[1]
-pkgctl-auth(1)
+linkman:pkgctl-build[1]
-pkgctl-build(1)
+linkman:pkgctl-db[1]
-pkgctl-db(1)
+linkman:pkgctl-diff[1]
-pkgctl-diff(1)
+linkman:pkgctl-release[1]
-pkgctl-release(1)
+linkman:pkgctl-repo[1]
-pkgctl-repo(1)
-pkgctl-search(1)
-pkgctl-version(1)
 
 include::include/footer.asciidoc[]

src/arch-nspawn.in

@@ -16,6 +16,7 @@ umask 0022
 working_dir=''
 
 files=()
+mount_args=()
 
 usage() {
 	echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
@@ -31,9 +32,6 @@ usage() {
 	exit 1
 }
 
-# save all args for check_root
-orig_args=("$@")
-
 while getopts 'hC:M:c:f:s' arg; do
 	case "$arg" in
 		C) pac_conf="$OPTARG" ;;
@@ -48,23 +46,13 @@ done
 shift $((OPTIND - 1))
 
 (( $# < 1 )) && die 'You must specify a directory.'
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
 working_dir=$(readlink -f "$1")
 shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-nspawn_args=(
-	--quiet
-	--directory="$working_dir"
-	--setenv="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin"
-	--register=no
-	--slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")"
-	--machine="arch-nspawn-$$"
-	--as-pid2
-)
-
 if (( ${#cache_dirs[@]} == 0 )); then
 	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
@@ -92,10 +80,10 @@ while read -r line; do
 	done
 done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
 
-nspawn_args+=(--bind="${cache_dirs[0]//:/\\:}")
+mount_args+=("--bind=${cache_dirs[0]//:/\\:}")
 
 for cache_dir in "${cache_dirs[@]:1}"; do
-	nspawn_args+=(--bind-ro="${cache_dir//:/\\:}")
+	mount_args+=("--bind-ro=${cache_dir//:/\\:}")
 done
 
 # {{{ functions
@@ -138,4 +126,9 @@ else
 	set_arch="${CARCH}"
 fi
 
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn "${nspawn_args[@]}" "$@"
+exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
+	-D "$working_dir" \
+	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
+	--register=no --keep-unit --as-pid2 \
+	"${mount_args[@]}" \
+	"$@"

src/archbuild.in

@@ -50,7 +50,7 @@ pacman_config="@pkgdatadir@/pacman.conf.d/${repo}.conf"
 if [[ -f @pkgdatadir@/pacman.conf.d/${repo}-${arch}.conf ]]; then
     pacman_config="@pkgdatadir@/pacman.conf.d/${repo}-${arch}.conf"
 fi
-makepkg_config="@pkgdatadir@/makepkg.conf.d/${arch}.conf"
+makepkg_config="@pkgdatadir@/makepkg.conf.d${arch}.conf"
 if [[ -f @pkgdatadir@/makepkg.conf.d/${repo}-${arch}.conf ]]; then
     makepkg_config="@pkgdatadir@/makepkg.conf.d/${repo}-${arch}.conf"
 fi
@@ -74,7 +74,7 @@ while getopts 'hcr:' arg; do
 	esac
 done
 
-check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME "${BASH_SOURCE[0]}" "$@"
+check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
 
 # Pass all arguments after -- right to makepkg
 makechrootpkg_args+=("${@:$OPTIND}")

src/archrelease.in

@@ -35,7 +35,7 @@ fi
 # validate repo is really repo-arch
 if [[ -z $FORCE ]]; then
 	for tag in "$@"; do
-		if ! in_array "$tag" "${DEVTOOLS_VALID_TAGS[@]}"; then
+		if ! in_array "$tag" "${_tags[@]}"; then
 			die "archrelease: Invalid tag: '%s' (use -f to force release)" "$tag"
 		fi
 	done
@@ -89,6 +89,7 @@ if git tag --verify "$gittag" &> /dev/null; then
 	exit 0
 fi
 
-msg "Releasing package"
+stat_busy "Releasing package"
 git tag --sign --message="Package release ${pkgver}" "$gittag" || abort
 git push --tags --set-upstream origin main || abort
+stat_done

src/commitpkg.in

@@ -5,13 +5,9 @@
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 # shellcheck source=src/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/util/srcinfo.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/srcinfo.sh
 
 source /usr/share/makepkg/util/util.sh
 
-set -eo pipefail
-
 
 check_pkgbuild_validity() {
 	# shellcheck source=contrib/makepkg/PKGBUILD.proto
@@ -74,12 +70,6 @@ if ! repo_spec=$(git config --local devtools.version) || [[ ${repo_spec} != "${G
 	exit 1
 fi
 
-if ! repo_variant=$(git config --local devtools.variant) || [[ ${repo_variant} != canonical ]]; then
-	error "cannot release from a repository with none canonical specs (%s), try:" "${repo_variant:-development}"
-	msg2 'pkgctl repo configure'
-	exit 1
-fi
-
 if [[ "$(git symbolic-ref --short HEAD)" != main ]]; then
 	die 'must be run from the main branch'
 fi
@@ -121,7 +111,7 @@ if (( ${#validpgpkeys[@]} != 0 )); then
 fi
 
 # find files which should be under source control
-needsversioning=(PKGBUILD)
+needsversioning=()
 for s in "${source[@]}"; do
 	[[ $s != *://* ]] && needsversioning+=("$s")
 done
@@ -139,10 +129,6 @@ done
 # assert that they really are controlled by git
 if (( ${#needsversioning[*]} )); then
 	for file in "${needsversioning[@]}"; do
-		# skip none existing files
-		if [[ ! -f "${file}" ]]; then
-			continue
-		fi
 		if ! git ls-files --error-unmatch "$file"; then
 			die "%s is not under version control" "$file"
 		fi
@@ -187,12 +173,7 @@ done
 # check for PKGBUILD standards
 check_pkgbuild_validity
 
-# auto generate .SRCINFO
+if [[ -n $(git status --short --untracked-files=no) ]]; then
-# shellcheck disable=SC2119
-write_srcinfo_file
-git add --force .SRCINFO
-
-if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
 	stat_busy 'Staging files'
 	for f in $(git ls-files --modified); do
 		git add "$f"
@@ -213,14 +194,14 @@ if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
 		echo "$msgtemplate" > "$msgfile"
 		if [[ -n $GIT_EDITOR ]]; then
 			$GIT_EDITOR "$msgfile" || die
-		elif giteditor=$(git config --get core.editor); then
-			$giteditor "$msgfile" || die
 		elif [[ -n $VISUAL ]]; then
 			$VISUAL "$msgfile" || die
 		elif [[ -n $EDITOR ]]; then
 			$EDITOR "$msgfile" || die
+		elif giteditor=$(git config --get core.editor); then
+			$giteditor "$msgfile" || die
 		else
-			die "No usable editor found (tried \$GIT_EDITOR, git config [core.editor], \$VISUAL, \$EDITOR)."
+			die "No usable editor found (tried \$GIT_EDITOR, \$VISUAL, \$EDITOR, git config [core.editor])."
 		fi
 		[[ -s $msgfile ]] || die
 		stat_busy 'Committing changes'

src/diffpkg.in

@@ -5,6 +5,8 @@
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 # shellcheck source=src/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+# shellcheck source=src/lib/util/util.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/util.sh
 
 
 usage() {
@@ -26,6 +28,8 @@ usage() {
 
 		OPTIONS
 		    -M, --makepkg-config Set an alternate makepkg configuration file
+		    -M, --pacman-config  Set an alternate pacman configuration file
+		    --dbpath             Set an alternate pacman database path
 		    -P, --pool=DIR       Search diff target in pool dir (default '/srv/ftp/pool')
 		    -v, --verbose        Provide more detailed/unfiltered output
 		    -h, --help           Show this help text
@@ -37,12 +41,14 @@ usage() {
 		    -y, --side-by-side   Output in two columns
 		    -W, --width=NUM      Output at most NUM (default 'auto') print columns
 		                         NUM can be 'auto', 'columns' or a number
+		    --summary            Print a summary or warning message on disparity
 
 		MODES
 		    -l, --list           Activate content list diff mode (default)
 		    -d, --diffoscope     Activate diffoscope diff mode
 		    -p, --pkginfo        Activate .PKGINFO diff mode
 		    -b, --buildinfo      Activate .BUILDINFO diff mode
+		    -s, --soname         Activate library SONAME diff mode
 _EOF_
 }
 
@@ -54,11 +60,13 @@ TARLIST=0
 DIFFOSCOPE=0
 PKGINFO=0
 BUILDINFO=0
+SONAME=0
+SUMMARY=0
 
 DIFFMODE=--side-by-side
 DIFFCOLOR=--color=auto
 DIFFWIDTH=--width=auto
-DIFFOPTIONS=(--expand-tabs)
+DIFFOPTIONS=(--expand-tabs --suppress-common-lines)
 
 # option checking
 while (( $# )); do
@@ -88,10 +96,18 @@ while (( $# )); do
 			BUILDINFO=1
 			shift
 			;;
+		-s|--soname)
+			SONAME=1
+			shift
+			;;
 		-v|--verbose)
 			VERBOSE=1
 			shift
 			;;
+		--summary)
+			SUMMARY=1
+			shift
+			;;
 		-u|-U|--unified)
 			DIFFMODE=--unified
 			shift
@@ -135,7 +151,7 @@ while (( $# )); do
 			shift
 			break
 			;;
-		-*|--*)
+		-*)
 			die "invalid argument: %s" "$1"
 			;;
 		*)
@@ -158,6 +174,9 @@ fi
 if [[ $DIFFWIDTH != --width=auto ]]; then
 	DIFFOPTIONS+=("${DIFFWIDTH}")
 fi
+if [[ $DIFFCOLOR == --color=auto ]] && is_tty; then
+	DIFFCOLOR="--color=always"
+fi
 DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
 
 if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
@@ -215,8 +234,7 @@ diff_pkgs() {
 	[[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
 	[[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"
 
-	local -a diffoptions
+	DIFFOPTIONS+=(--label "${oldpkg}" --label "${newpkg}")
-	diffoptions=("${DIFFOPTIONS[@]}" --label "${oldpkg}" --label "${newpkg}")
 
 	if (( TARLIST )); then
 		tar_list "$oldpkg" > "$TMPDIR/old"
@@ -233,23 +251,31 @@ diff_pkgs() {
 		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
 	fi
 
-	if (( TARLIST || PKGINFO || BUILDINFO )); then
+	if (( SONAME )); then
+		find-libprovides "$oldpkg" 2>/dev/null | sort > "$TMPDIR/old"
+		find-libprovides "$newpkg" 2>/dev/null | sort > "$TMPDIR/new"
+	fi
+
+	if (( TARLIST || PKGINFO || BUILDINFO || SONAME )); then
 		# Resolve dynamic auto width one we know the content to diff
 		if [[ $DIFFWIDTH == --width=auto ]]; then
 			AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
-			diffoptions+=("--width=${AUTOLENGTH}")
+			DIFFOPTIONS+=("--width=${AUTOLENGTH}")
 		fi
 
-		# Print a header for side-by-side view as it lacks labels
+		if ! output=$(diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"); then
-		if [[ $DIFFMODE == --side-by-side ]]; then
+			# Print a header for side-by-side view as it lacks labels
-			printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
+			if [[ $DIFFMODE == --side-by-side ]]; then
+				printf -- "%s--- %s\n+++ %s%s\n" "${BOLD}" "${oldpkg}" "${newpkg}" "${ALL_OFF}"
+			fi
+			printf "%s\n" "${output}"
+			return 1
 		fi
-
-		diff "${diffoptions[@]}" "$TMPDIR/old" "$TMPDIR/new"
 	fi
 
 	if (( DIFFOSCOPE )); then
 		diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
+		return $?
 	fi
 }
 
@@ -278,13 +304,14 @@ fetch_pkg() {
 		fi
 		# Search via pacman database if no pool file exists
 		if [[ ! -f ${pkgurl} ]]; then
-			pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
+			pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm -- "$pkg") ||
 				die "Couldn't download previous package for %s." "$pkg"
+			# TODO: check and download via Swdd so we also do signatures checks before processing
 		fi
 	fi
 
 	pkg=${pkgurl##*/}
-	pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
+	pkgdest=$(mktemp -t -d -- "${pkg}-XXXXXX")/${pkg}
 
 	if [[ $pkgurl = file://* || ( $pkgurl = /* && -f $pkgurl ) ]]; then
 		ln -sf "${pkgurl#file://}" "$pkgdest"
@@ -314,6 +341,7 @@ if (( $# < 2 )); then
 		CARCH='any'
 	fi
 
+	ret=0
 	for _pkgname in "${pkgname[@]}"; do
 		comparepkg=$_pkgname
 		pkgurl=
@@ -331,10 +359,13 @@ if (( $# < 2 )); then
 		oldpkg=$(fetch_pkg "$comparepkg") || exit 1
 
 		diff_pkgs "$oldpkg" "$pkgfile"
+		ret+=$?
 	done
+	exit $ret
 else
 	file1=$(fetch_pkg "$1") || exit 1
 	file2=$(fetch_pkg "$2") || exit 1
 
 	diff_pkgs "$file1" "$file2"
+	exit $?
 fi

src/lib/api/archweb.sh

@@ -1,57 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_API_ARCHWEB_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_API_ARCHWEB_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-set -e
-set -o pipefail
-
-
-archweb_query_all_packages() {
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-
-	stat_busy "Query all released packages"
-	mapfile -t pkgbases < <(
-		curl --location --show-error --no-progress-meter --fail --retry 3 --retry-delay 3 \
-			"${PKGBASE_MAINTAINER_URL}" 2> "${WORKDIR}/error" \
-			| jq --raw-output --exit-status 'keys[]' 2> "${WORKDIR}/error"
-	)
-	if ! wait $!; then
-		stat_failed
-		print_workdir_error
-		return 1
-	fi
-	stat_done
-
-	printf "%s\n" "${pkgbases[@]}"
-	return 0
-}
-
-
-archweb_query_maintainer_packages() {
-	local maintainer=$1
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-
-	stat_busy "Query maintainer packages"
-	mapfile -t pkgbases < <(
-		curl --location --show-error --no-progress-meter --fail --retry 3 --retry-delay 3 \
-			"${PKGBASE_MAINTAINER_URL}" 2> "${WORKDIR}/error" \
-			| jq --raw-output --exit-status '. as $parent | keys[] | select(. as $key | $parent[$key] | index("'"${maintainer}"'"))' 2> "${WORKDIR}/error"
-	)
-	if ! wait $!; then
-		stat_failed
-		print_workdir_error
-		return 1
-	fi
-	stat_done
-
-	printf "%s\n" "${pkgbases[@]}"
-	return 0
-}

src/lib/api/gitlab.sh

@@ -13,63 +13,13 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
 
 set -e
 
-graphql_api_call() {
-	local outfile=$1
-	local request=$2
-	local node_type=$3
-	local data=$4
-	local hasNextPage cursor
-
-	# empty token
-	if [[ -z "${GITLAB_TOKEN}" ]]; then
-		msg_error "  api call failed: No token provided"
-		return 1
-	fi
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	api_workdir=$(mktemp --tmpdir="${WORKDIR}" --directory pkgctl-gitlab-api.XXXXXXXXXX)
-
-	# normalize graphql data and prepare query
-	data="${data//\"/\\\"}"
-	data='{
-		"query": "'"${data}"'"
-	}'
-	data="${data//$'\t'/ }"
-	data="${data//$'\n'/}"
-
-	cursor=""
-	hasNextPage=true
-	while [[ ${hasNextPage} == true ]]; do
-		data=$(sed -E 's|after: \\"[a-zA-Z0-9]*\\"|after: \\"'"${cursor}"'\\"|' <<< "${data}")
-		result="${api_workdir}/result.${cursor}"
-
-		if ! curl --request "${request}" \
-				--url "https://${GITLAB_HOST}/api/graphql" \
-				--header "Authorization: Bearer ${GITLAB_TOKEN}" \
-				--header "Content-Type: application/json" \
-				--data "${data}" \
-				--output "${result}" \
-				--silent; then
-			msg_error "  api call failed: $(cat "${outfile}")"
-			return 1
-		fi
-
-		hasNextPage=$(jq --raw-output ".data | .${node_type} | .pageInfo | .hasNextPage" < "${result}")
-		cursor=$(jq --raw-output ".data | .${node_type} | .pageInfo | .endCursor" < "${result}")
-
-		cp "${result}" "${api_workdir}/tmp"
-		jq ".data.${node_type}.nodes" "${api_workdir}/tmp" > "${result}"
-	done
-
-	jq --slurp add "${api_workdir}"/result.* > "${outfile}"
-	return 0
-}
 
 gitlab_api_call() {
 	local outfile=$1
 	local request=$2
 	local endpoint=$3
 	local data=${4:-}
+	local error
 
 	# empty token
 	if [[ -z "${GITLAB_TOKEN}" ]]; then
@@ -88,113 +38,27 @@ gitlab_api_call() {
 		return 1
 	fi
 
-	if ! gitlab_check_api_errors "${outfile}"; then
-		return 1
-	fi
-
-	return 0
-}
-
-gitlab_api_call_paged() {
-	local outfile=$1
-	local status_file=$2
-	local request=$3
-	local endpoint=$4
-	local data=${5:-}
-	local result header
-
-	# empty token
-	if [[ -z "${GITLAB_TOKEN}" ]]; then
-		msg_error "  api call failed: No token provided"
-		return 1
-	fi
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	api_workdir=$(mktemp --tmpdir="${WORKDIR}" --directory pkgctl-gitlab-api.XXXXXXXXXX)
-	tmp_file=$(mktemp --tmpdir="${api_workdir}" spinner.tmp.XXXXXXXXXX)
-
-	local next_page=1
-	local total_pages=1
-
-	while [[ -n "${next_page}" ]]; do
-		percentage=$(( 100 * next_page / total_pages ))
-		printf "📡 Querying GitLab: %s/%s [%s] %%spinner%%" \
-			"${BOLD}${next_page}" "${total_pages}" "${percentage}%${ALL_OFF}"  \
-			> "${tmp_file}"
-		mv "${tmp_file}" "${status_file}"
-
-		result="${api_workdir}/result.${next_page}"
-		header="${api_workdir}/header"
-		if ! curl --request "${request}" \
-				--get \
-				--url "https://${GITLAB_HOST}/api/v4/${endpoint}&per_page=100&page=${next_page}" \
-				--header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
-				--header "Content-Type: application/json" \
-				--data-urlencode "${data}" \
-				--dump-header "${header}" \
-				--output "${result}" \
-				--silent; then
-			msg_error "  api call failed: $(cat "${result}")"
-			return 1
-		fi
-
-		if ! gitlab_check_api_errors "${result}"; then
-			return 1
-		fi
-
-		next_page=$(grep "x-next-page" "${header}" | tr -d '\r' | awk '{ print $2 }')
-		total_pages=$(grep "x-total-pages" "${header}" | tr -d '\r' | awk '{ print $2 }')
-	done
-
-	jq --slurp add "${api_workdir}"/result.* > "${outfile}"
-	return 0
-}
-
-gitlab_check_api_errors() {
-	local file=$1
-	local error
-
-	# search API only returns an array, no errors
-	if [[ $(jq --raw-output 'type' < "${file}") == "array" ]]; then
-		return 0
-	fi
-
 	# check for general purpose api error
-	if error=$(jq --raw-output --exit-status '.error' < "${file}"); then
+	if error=$(jq --raw-output --exit-status '.error' < "${outfile}"); then
 		msg_error "  api call failed: ${error}"
 		return 1
 	fi
 
 	# check for api specific error messages
-	if ! jq --raw-output --exit-status '.id' < "${file}" >/dev/null; then
+	if ! jq --raw-output --exit-status '.id' < "${outfile}" >/dev/null; then
-		if jq --raw-output --exit-status '.message | keys[]' < "${file}" &>/dev/null; then
+		if jq --raw-output --exit-status '.message | keys[]' < "${outfile}" &>/dev/null; then
 			while read -r error; do
 				msg_error "  api call failed: ${error}"
-			done < <(jq --raw-output --exit-status '.message|to_entries|map("\(.key) \(.value[])")[]' < "${file}")
+			done < <(jq --raw-output --exit-status '.message|to_entries|map("\(.key) \(.value[])")[]' < "${outfile}")
-		elif error=$(jq --raw-output --exit-status '.message' < "${file}"); then
+		elif error=$(jq --raw-output --exit-status '.message' < "${outfile}"); then
 			msg_error "  api call failed: ${error}"
 		fi
 		return 1
 	fi
+
 	return 0
 }
 
-graphql_check_api_errors() {
-	local file=$1
-	local error
-
-	# early exit if we do not have errors
-	if ! jq --raw-output --exit-status '.errors[]' < "${file}" &>/dev/null; then
-		return 0
-	fi
-
-	# check for api specific error messages
-	while read -r error; do
-		msg_error "  api call failed: ${error}"
-	done < <(jq --raw-output --exit-status '.errors[].message' < "${file}")
-	return 1
-}
-
 gitlab_api_get_user() {
 	local outfile username
 
@@ -217,42 +81,15 @@ gitlab_api_get_user() {
 	return 0
 }
 
-gitlab_api_get_project_name_mapping() {
-	local query=$1
-	local outfile
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
-
-	# query user details
-	if ! graphql_api_call "${outfile}" POST projects "${query}"; then
-		msg_warn "  Invalid token provided?"
-		exit 1
-	fi
-
-	cat "${outfile}"
-	return 0
-}
-
-# Convert arbitrary project names to GitLab valid path names.
-#
-# GitLab has several limitations on project and group names and also maintains
-# a list of reserved keywords as documented on their docs.
-# https://docs.gitlab.com/ee/user/reserved_names.html
-#
 # 1. replace single '+' between word boundaries with '-'
 # 2. replace any other '+' with literal 'plus'
 # 3. replace any special chars other than '_', '-' and '.' with '-'
-# 4. replace consecutive '_-' chars with a single '-'
-# 5. replace 'tree' with 'unix-tree' due to GitLab reserved keyword
 gitlab_project_name_to_path() {
 	local name=$1
 	printf "%s" "${name}" \
 		| sed -E 's/([a-zA-Z0-9]+)\+([a-zA-Z]+)/\1-\2/g' \
 		| sed -E 's/\+/plus/g' \
-		| sed -E 's/[^a-zA-Z0-9_\-\.]/-/g' \
+		| sed -E 's/[^a-zA-Z0-9_\-\.]/-/g'
-		| sed -E 's/[_\-]{2,}/-/g' \
-		| sed -E 's/^tree$/unix-tree/g'
 }
 
 gitlab_api_create_project() {
@@ -283,22 +120,3 @@ gitlab_api_create_project() {
 	printf "%s" "${path}"
 	return 0
 }
-
-# TODO: parallelize
-# https://docs.gitlab.com/ee/api/search.html#scope-blobs
-gitlab_api_search() {
-	local search=$1
-	local status_file=$2
-	local outfile
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
-
-	if ! gitlab_api_call_paged "${outfile}" "${status_file}" GET "/groups/archlinux%2fpackaging%2fpackages/search?scope=blobs" "search=${search}"; then
-		return 1
-	fi
-
-	cat "${outfile}"
-
-	return 0
-}

src/lib/archroot.sh

@@ -4,19 +4,18 @@
 :
 
 # shellcheck disable=2034
-CHROOT_VERSION='v5'
+CHROOT_VERSION='v4'
 
 ##
 #  usage : check_root $keepenv
 ##
+orig_argv=("${BASH_SOURCE[0]}" "$@")
 check_root() {
 	local keepenv=$1
-	shift
-	local orig_argv=("$@")
 
 	(( EUID == 0 )) && return
 	if type -P sudo >/dev/null; then
-		exec sudo --preserve-env="${keepenv}" -- "${orig_argv[@]}"
+		exec sudo --preserve-env=$keepenv -- "${orig_argv[@]}"
 	else
 		exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
 	fi

src/lib/aur.sh

@@ -1,65 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUR_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUR_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-set -eo pipefail
-
-
-pkgctl_aur_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-		Interact with the Arch User Repository (AUR).
-
-		Provides a suite of tools designed for managing and interacting with the Arch
-		User Repository (AUR). It simplifies various tasks related to AUR, including
-		importing repositories, managing packages, and transitioning packages between
-		the official repositories and the AUR.
-
-		COMMANDS
-		    drop-from-repo    Drop a package from the official repository to the AUR
-
-		OPTIONS
-		    -h, --help        Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} drop-from-repo libfoo
-_EOF_
-}
-
-pkgctl_aur() {
-	if (( $# < 1 )); then
-		pkgctl_aur_usage
-		exit 0
-	fi
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_aur_usage
-				exit 0
-				;;
-			drop-from-repo)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/aur/drop-from-repo.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/aur/drop-from-repo.sh
-				pkgctl_aur_drop_from_repo "$@"
-				exit 0
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				die "invalid command: %s" "$1"
-				;;
-		esac
-	done
-}

src/lib/aur/drop-from-repo.sh

@@ -1,173 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUR_DROP_FROM_REPO_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUR_DROP_FROM_REPO_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/db/remove.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/remove.sh
-# shellcheck source=src//lib/util/pacman.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pacman.sh
-
-source /usr/share/makepkg/util/message.sh
-
-set -eo pipefail
-
-
-pkgctl_aur_drop_from_repo_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PATH]...
-
-		Drops a specified package from the official repositories to the Arch
-		User Repository.
-
-		This command requires a local Git clone of the package repository. It
-		reconfigures the repository for AUR compatibility and pushes it to the
-		AUR. Afterwards, the package is removed from the official repository.
-
-		By default, the package is automatically disowned in the AUR.
-
-		OPTIONS
-		    --no-disown    Do not disown the package on the AUR
-		    -f, --force    Force push to the AUR overwriting the remote repository
-		    -h, --help     Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} foo
-		    $ ${COMMAND} --no-disown --force
-_EOF_
-}
-
-pkgctl_aur_drop_from_repo() {
-	# options
-	local paths=()
-	local DISOWN=1
-	local FORCE=0
-
-	# variables
-	local path realpath pkgbase pkgrepo remote_url
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_aur_drop_from_repo_usage
-				exit 0
-				;;
-			--no-disown)
-				DISOWN=0
-				shift
-				;;
-			-f|--force)
-				FORCE=1
-				shift
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "Invalid argument: %s" "$1"
-				;;
-			*)
-				paths=("$@")
-				break
-				;;
-		esac
-	done
-
-	# check if invoked without any path from within a packaging repo
-	if (( ${#paths[@]} == 0 )); then
-		if [[ -f PKGBUILD ]]; then
-			paths=(".")
-		else
-			pkgctl_aur_drop_from_repo_usage
-			exit 1
-		fi
-	fi
-
-	for path in "${paths[@]}"; do
-		# resolve symlink for basename
-		if ! realpath=$(realpath --canonicalize-existing -- "${path}"); then
-			die "No such directory: ${path}"
-		fi
-		# skip paths that are not directories
-		if [[ ! -d "${realpath}" ]]; then
-			continue
-		fi
-
-		pkgbase=$(basename "${realpath}")
-		pkgbase=${pkgbase%.git}
-
-		if [[ ! -d "${realpath}/.git" ]]; then
-			die "Not a Git repository: ${path}"
-		fi
-
-		pushd "${path}" >/dev/null
-
-		if [[ ! -f PKGBUILD ]]; then
-			die 'PKGBUILD not found in %s' "${path}"
-		fi
-
-		msg "Dropping ${pkgbase} to the AUR"
-
-		remote_url="${AUR_URL_SSH}:${pkgbase}.git"
-		if ! git remote add origin "${remote_url}" &>/dev/null; then
-			git remote set-url origin "${remote_url}"
-		fi
-
-		# move the main branch to master
-		if [[ $(git symbolic-ref --quiet --short HEAD) == main ]]; then
-			git branch --move master
-			git config branch.master.merge refs/heads/master
-		fi
-
-		# auto generate .SRCINFO if not already present
-		if [[ -z "$(git ls-tree -r HEAD --name-only .SRCINFO)" ]]; then
-			stat_busy 'Generating .SRCINFO'
-			makepkg --printsrcinfo > .SRCINFO
-			stat_done
-
-			git add --force -- .SRCINFO
-			git commit --quiet --message "Adding .SRCINFO" -- .SRCINFO
-		fi
-
-		msg "Pushing ${pkgbase} to the AUR"
-		if (( FORCE )); then
-			AUR_OVERWRITE=1 \
-				GIT_SSH_COMMAND="ssh -o SendEnv=AUR_OVERWRITE" \
-				git push --force --no-follow-tags origin master
-		else
-			git push --no-follow-tags origin master
-		fi
-
-		# update the local default branch in case this clone is used in the future
-		git remote set-head origin master
-
-		if (( DISOWN )); then
-			msg "Disowning ${pkgbase} on the AUR"
-			# shellcheck disable=SC2029
-			ssh "${AUR_URL_SSH}" disown "${pkgbase}"
-		fi
-
-		# auto-detection of the repo to remove from
-		if ! pkgrepo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
-			die 'Failed to get pacman repo'
-		fi
-
-		msg "Deleting ${pkgbase} from the official repository"
-		if [[ -z "${pkgrepo}" ]]; then
-			warning 'Did not find %s in any repository, please delete manually' "${pkgbase}"
-		else
-			msg2 "  repo: ${pkgrepo}"
-			pkgctl_db_remove "${pkgrepo}" "${pkgbase}"
-		fi
-
-		popd >/dev/null
-	done
-}

src/lib/auth/login.sh

@@ -23,13 +23,9 @@ pkgctl_auth_login_usage() {
 	cat <<- _EOF_
 		Usage: ${COMMAND} [OPTIONS]
 
-		Interactively authenticate with the GitLab instance.
+		Authenticate with the GitLab instance.
 
-		The minimum required scopes for the token are: 'api', 'write_repository'.
+		The minimum required scopes for the token are: "api", "write_repository".
-
-		The GitLab API token can either be stored in a plaintext file, or
-		supplied via the DEVTOOLS_GITLAB_TOKEN environment variable using a
-		vault, see pkgctl-auth-login(1) for details.
 
 		OPTIONS
 		    -g, --gen-access-token   Open the URL to generate a new personal access token
@@ -63,17 +59,13 @@ pkgctl_auth_login() {
 		esac
 	done
 
-	personal_access_token_url="https://${GITLAB_HOST}/-/profile/personal_access_tokens?name=pkgctl+token&scopes=api,write_repository"
+	personal_access_token_url="https://${GITLAB_HOST}/-/profile/personal_access_tokens"
 
     cat <<- _EOF_
 	Logging into ${BOLD}${GITLAB_HOST}${ALL_OFF}
 
 	Tip: you can generate a Personal Access Token here ${personal_access_token_url}
 	The minimum required scopes are 'api' and 'write_repository'.
-
-	If you do not want to store the token in a plaintext file, you can abort
-	the following prompt and supply the token via the DEVTOOLS_GITLAB_TOKEN
-	environment variable using a vault, see pkgctl-auth-login(1) for details.
 _EOF_
 
 	if (( GEN_ACESS_TOKEN )); then

src/lib/build/build.sh

@@ -14,25 +14,17 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
 # shellcheck source=src/lib/util/git.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
-# shellcheck source=src/lib/util/srcinfo.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/srcinfo.sh
 # shellcheck source=src/lib/util/pacman.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pacman.sh
-# shellcheck source=src/lib/util/pkgbuild.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pkgbuild.sh
-# shellcheck source=src/lib/valid-build-install.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-build-install.sh
 # shellcheck source=src/lib/valid-repos.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
 # shellcheck source=src/lib/valid-tags.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
-# shellcheck source=src/lib/valid-inspect.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
 
 source /usr/share/makepkg/util/config.sh
 source /usr/share/makepkg/util/message.sh
 
-set -eo pipefail
+set -e
 
 
 pkgctl_build_usage() {
@@ -49,24 +41,18 @@ pkgctl_build_usage() {
 
 		BUILD OPTIONS
 		    --arch ARCH          Specify architectures to build for (disables auto-detection)
-		    --repo REPO          Specify target repository for new packages not in any official repo
+		    --repo REPO          Specify a target repository (disables auto-detection)
 		    -s, --staging        Build against the staging counterpart of the auto-detected repo
 		    -t, --testing        Build against the testing counterpart of the auto-detected repo
 		    -o, --offload        Build on a remote server and transfer artifacts afterwards
 		    -c, --clean          Recreate the chroot before building
-		    --inspect WHEN       Spawn an interactive shell to inspect the chroot (never, always, failure)
+		    -I, --install FILE   Install a package into the working copy of the chroot
-		    -w, --worker SLOT    Name of the worker slot, useful for concurrent builds (disables automatic names)
 		    --nocheck            Do not run the check() function in the PKGBUILD
 
-		INSTALL OPTIONS
-		    -I, --install-to-chroot FILE   Install a package to the working copy of the chroot
-		    -i, --install-to-host MODE     Install the built package to the host system, possible modes are 'all' and 'auto'
-
 		PKGBUILD OPTIONS
 		    --pkgver=PKGVER      Set pkgver, reset pkgrel and update checksums
 		    --pkgrel=PKGREL      Set pkgrel to a given value
 		    --rebuild            Increment the current pkgrel variable
-		    --update-checksums   Force computation and update of the checksums (disables auto-detection)
 		    -e, --edit           Edit the PKGBUILD before building
 
 		RELEASE OPTIONS
@@ -89,7 +75,8 @@ pkgctl_build_check_option_group_repo() {
 	local repo=$2
 	local testing=$3
 	local staging=$4
-	if [[ -n "${repo}" ]] || (( testing )) || (( staging )); then
+	if ( (( testing )) && (( staging )) ) ||
+		( [[ $repo =~ ^.*-(staging|testing)$ ]] && ( (( testing )) || (( staging )) )); then
 		die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
 		exit 1
 	fi
@@ -115,7 +102,7 @@ pkgctl_build() {
 		exit 1
 	fi
 
-	local UPDATE_CHECKSUMS=0
+	local UPDPKGSUMS=0
 	local EDIT=0
 	local REBUILD=0
 	local OFFLOAD=0
@@ -123,7 +110,6 @@ pkgctl_build() {
 	local TESTING=0
 	local RELEASE=0
 	local DB_UPDATE=0
-	local INSTALL_TO_HOST=none
 
 	local REPO=
 	local PKGVER=
@@ -136,13 +122,13 @@ pkgctl_build() {
 	local MAKECHROOT_OPTIONS=()
 	local RELEASE_OPTIONS=()
 	local MAKEPKG_OPTIONS=()
-	local INSTALL_HOST_PACKAGES=()
 
-	local WORKER=
+	local PTS
-	local WORKER_SLOT=
+	PTS="$(tty | sed 's|/dev/pts/||')"
+	local WORKER="${USER}-${PTS}"
 
 	# variables
-	local _arch path pkgbase pkgrepo source pkgbuild_checksum current_checksum
+	local path pkgbase pkgrepo source soname_changed=0
 
 	while (( $# )); do
 		case $1 in
@@ -152,19 +138,18 @@ pkgctl_build() {
 				;;
 			--repo)
 				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				pkgctl_build_check_option_group_repo '--repo' "${REPO}" "${TESTING}" "${STAGING}"
 				REPO="${2}"
-				RELEASE_OPTIONS+=("--repo" "${REPO}")
+				pkgctl_build_check_option_group_repo '--repo' "${REPO}" "${TESTING}" "${STAGING}"
 				shift 2
 				;;
 			--arch)
 				(( $# <= 1 )) && die "missing argument for %s" "$1"
 				if [[ ${2} == all ]]; then
-					BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[@]::${#DEVTOOLS_VALID_ARCHES[@]}-1}")
+					BUILD_ARCH=("${_arch[@]::${#_arch[@]}-1}")
 				elif [[ ${2} == any ]]; then
-					BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
+					BUILD_ARCH=("${_arch[0]}")
 				elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
-					if ! in_array "${2}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
+					if ! in_array "${2}" "${_arch[@]}"; then
 						die 'invalid architecture: %s' "${2}"
 					fi
 					BUILD_ARCH+=("${2}")
@@ -175,7 +160,7 @@ pkgctl_build() {
 				pkgctl_build_check_option_group_ver '--pkgver' "${PKGVER}" "${PKGREL}" "${REBUILD}"
 				PKGVER="${1#*=}"
 				PKGREL=1
-				UPDATE_CHECKSUMS=1
+				UPDPKGSUMS=1
 				shift
 				;;
 			--pkgrel=*)
@@ -183,13 +168,7 @@ pkgctl_build() {
 				PKGREL="${1#*=}"
 				shift
 				;;
-			--update-checksums)
-				UPDATE_CHECKSUMS=1
-				shift
-				;;
 			--rebuild)
-				# shellcheck source=src/lib/util/git.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
 				pkgctl_build_check_option_group_ver '--rebuild' "${PKGVER}" "${PKGREL}" "${REBUILD}"
 				REBUILD=1
 				shift
@@ -203,37 +182,23 @@ pkgctl_build() {
 				shift
 				;;
 			-s|--staging)
-				pkgctl_build_check_option_group_repo '--staging' "${REPO}" "${TESTING}" "${STAGING}"
 				STAGING=1
-				RELEASE_OPTIONS+=("--staging")
+				pkgctl_build_check_option_group_repo '--staging' "${REPO}" "${TESTING}" "${STAGING}"
 				shift
 				;;
 			-t|--testing)
-				pkgctl_build_check_option_group_repo '--testing' "${REPO}" "${TESTING}" "${STAGING}"
 				TESTING=1
-				RELEASE_OPTIONS+=("--testing")
+				pkgctl_build_check_option_group_repo '--testing' "${REPO}" "${TESTING}" "${STAGING}"
 				shift
 				;;
 			-c|--clean)
 				BUILD_OPTIONS+=("-c")
 				shift
 				;;
-			-I|--install-to-chroot)
+			-I|--install)
 				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if (( OFFLOAD )); then
+				MAKECHROOT_OPTIONS+=("-I" "$2")
-					MAKECHROOT_OPTIONS+=("-I" "$2")
+				warning 'installing packages into the chroot may break reproducible builds, use with caution!'
-				else
-					MAKECHROOT_OPTIONS+=("-I" "$(realpath "$2")")
-				fi
-				warning 'installing packages to the chroot may break reproducible builds, use with caution!'
-				shift 2
-				;;
-			-i|--install-to-host)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if ! in_array "$2" "${DEVTOOLS_VALID_BUILD_INSTALL[@]}"; then
-					die 'invalid install mode: %s' "${2}"
-				fi
-				INSTALL_TO_HOST=$2
 				shift 2
 				;;
 			--nocheck)
@@ -241,14 +206,6 @@ pkgctl_build() {
 				warning 'not running checks is disallowed for official packages, except for bootstrapping. Please rebuild after bootstrapping is completed!'
 				shift
 				;;
-			--inspect)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if ! in_array "${2}" "${DEVTOOLS_VALID_INSPECT_MODES[@]}"; then
-					die "Invalid inspect mode: %s" "${2}"
-				fi
-				MAKECHROOT_OPTIONS+=("-x" "${2}")
-				shift 2
-				;;
 			-r|--release)
 				# shellcheck source=src/lib/release.sh
 				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
@@ -265,11 +222,6 @@ pkgctl_build() {
 				DB_UPDATE=1
 				shift
 				;;
-			-w|--worker)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				WORKER_SLOT=$2
-				shift 2
-				;;
 			--)
 				shift
 				break
@@ -284,16 +236,6 @@ pkgctl_build() {
 		esac
 	done
 
-	# check if any release specific options were specified without releasing
-	if (( ! RELEASE )); then
-		if (( DB_UPDATE )); then
-			die "cannot use --db-update without --release"
-		fi
-		if [[ -n "${MESSAGE}" ]]; then
-			die "cannot use --message without --release"
-		fi
-	fi
-
 	# check if invoked without any path from within a packaging repo
 	if (( ${#paths[@]} == 0 )); then
 		if [[ -f PKGBUILD ]]; then
@@ -304,25 +246,15 @@ pkgctl_build() {
 		fi
 	fi
 
-	# assign default worker slot
-	if [[ -z ${WORKER_SLOT} ]] && ! WORKER_SLOT="$(tty | sed 's|/dev/pts/||')"; then
-		WORKER_SLOT=$(( RANDOM % $(nproc) + 1 ))
-	fi
-	WORKER="${USER}-${WORKER_SLOT}"
-
 	# Update pacman cache for auto-detection
 	if [[ -z ${REPO} ]]; then
 		update_pacman_repo_cache
 	# Check valid repos if not resolved dynamically
-	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
+	elif ! in_array "${REPO}" "${_repos[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"
 	fi
 
 	for path in "${paths[@]}"; do
-		# skip paths that are not directories
-		if [[ ! -d "${path}" ]]; then
-			continue
-		fi
 		pushd "${path}" >/dev/null
 
 		if [[ ! -f PKGBUILD ]]; then
@@ -334,29 +266,21 @@ pkgctl_build() {
 		. ./PKGBUILD
 		pkgbase=${pkgbase:-$pkgname}
 		pkgrepo=${REPO}
-		pkgbuild_checksum=$(b2sum PKGBUILD | awk '{print $1}')
+		soname_changed=0
 		msg "Building ${pkgbase}"
 
-		# auto-detect target repository
+		# auto-detection of build target
-		if ! repo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
+		if [[ -z ${pkgrepo} ]]; then
-			die 'Failed to query pacman repo'
+			if ! pkgrepo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
-		fi
+				die 'failed to get pacman repo'
-
+			fi
-		# fail if an existing package specifies --repo
+			if [[ -z "${pkgrepo}" ]]; then
-		if [[ -n "${repo}" ]] && [[ -n ${pkgrepo} ]]; then
+				die 'unknown repo, please specify --repo for new packages'
-			# allow unstable to use --repo
-			if [[ ${pkgrepo} == *unstable ]]; then
-				repo=${pkgrepo}
-			else
-				die 'Using --repo for packages that exist in official repositories is disallowed'
 			fi
 		fi
 
-		# assign auto-detected target repository
+		# TODO: REMOVE AFTER POC
-		if [[ -n ${repo} ]]; then
+		if [[ ${pkgrepo} == community ]]; then
-			pkgrepo=${repo}
-		# fallback to extra for unreleased packages
-		elif [[ -z ${pkgrepo} ]]; then
 			pkgrepo=extra
 		fi
 
@@ -374,26 +298,19 @@ pkgctl_build() {
 			BUILD_ARCH=("")
 		elif (( ${#BUILD_ARCH[@]} == 0 )); then
 			if in_array any "${arch[@]}"; then
-				BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
+				BUILD_ARCH=("${_arch[0]}")
 			else
-				for _arch in "${arch[@]}"; do
+				BUILD_ARCH+=("${arch[@]}")
-					if in_array "${_arch}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
-						BUILD_ARCH+=("$_arch")
-					else
-						warning 'invalid architecture, not building for: %s' "${_arch}"
-					fi
-				done
 			fi
 		fi
 
 		# print gathered build modes
-		msg2 "  repo: ${pkgrepo}"
+		msg2 "repo: ${pkgrepo}"
-		msg2 "  arch: ${BUILD_ARCH[*]}"
+		msg2 "arch: ${BUILD_ARCH[*]}"
-		msg2 "worker: ${WORKER}"
 
 		# increment pkgrel on rebuild
 		if (( REBUILD )); then
-			# try to figure out if pkgrel has been changed
+			# try to figure out of pkgrel has been changed
 			if ! old_pkgrel=$(git_diff_tree HEAD PKGBUILD | grep --perl-regexp --only-matching --max-count=1 '^-pkgrel=\K\w+'); then
 				old_pkgrel=${pkgrel}
 			fi
@@ -410,14 +327,20 @@ pkgctl_build() {
 
 		# update pkgver
 		if [[ -n ${PKGVER} ]]; then
+			if [[ $(type -t pkgver) == function ]]; then
+				# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
+				warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
+			fi
 			msg "Bumping pkgver to ${PKGVER}"
-			pkgbuild_set_pkgver "${PKGVER}"
+			grep --extended-regexp --quiet --max-count=1 "^pkgver=${pkgver}$" PKGBUILD || die "Non-standard pkgver declaration"
+			sed --regexp-extended "s|^(pkgver=)${pkgver}$|\1${PKGVER}|g" -i PKGBUILD
 		fi
 
 		# update pkgrel
 		if [[ -n ${PKGREL} ]]; then
 			msg "Bumping pkgrel to ${PKGREL}"
-			pkgbuild_set_pkgrel "${PKGREL}"
+			grep --extended-regexp --quiet --max-count=1 "^pkgrel=${pkgrel}$" PKGBUILD || die "Non-standard pkgrel declaration"
+			sed --regexp-extended "s|^(pkgrel=)${pkgrel}$|\1${PKGREL}|g" -i PKGBUILD
 		fi
 
 		# edit PKGBUILD
@@ -439,18 +362,10 @@ pkgctl_build() {
 
 
 		# update checksums if any sources are declared
-		if (( UPDATE_CHECKSUMS )) && (( ${#source[@]} >= 1 )); then
+		if (( UPDPKGSUMS )) && (( ${#source[@]} >= 1 )); then
 			updpkgsums
 		fi
 
-		# re-source the PKGBUILD if it changed
-		current_checksum="$(b2sum PKGBUILD | awk '{print $1}')"
-		if [[ ${pkgbuild_checksum} != "${current_checksum}" ]]; then
-			pkgbuild_checksum=${current_checksum}
-			# shellcheck source=contrib/makepkg/PKGBUILD.proto
-			. ./PKGBUILD
-		fi
-
 		# execute build
 		for arch in "${BUILD_ARCH[@]}"; do
 			if [[ -n $arch ]]; then
@@ -461,48 +376,31 @@ pkgctl_build() {
 				BUILDTOOL="${pkgrepo}-build"
 			fi
 
+			# TODO: REMOVE AFTER POC
+			offload_tool=${pkgrepo}
+			if [[ ${pkgrepo} == core-* ]]; then
+				BUILDTOOL=${BUILDTOOL/core-/}
+				offload_tool=${offload_tool/core-/}
+			elif [[ ${pkgrepo} == extra-* ]]; then
+				BUILDTOOL=${BUILDTOOL/extra-/}
+				offload_tool=${offload_tool/extra-/}
+			fi
+
 			if (( OFFLOAD )); then
-				offload-build --repo "${pkgrepo}" -- "${BUILD_OPTIONS[@]}" -- "${MAKECHROOT_OPTIONS[@]}" -l "${WORKER}" -- "${MAKEPKG_OPTIONS[@]}"
+				offload-build --repo "${offload_tool}" -- "${BUILD_OPTIONS[@]}" -- "${MAKECHROOT_OPTIONS[@]}" -l "${WORKER}" -- "${MAKEPKG_OPTIONS[@]}"
 			else
 				"${BUILDTOOL}" "${BUILD_OPTIONS[@]}" -- "${MAKECHROOT_OPTIONS[@]}" -l "${WORKER}" -- "${MAKEPKG_OPTIONS[@]}"
 			fi
 		done
 
-		# re-source the PKGBUILD if it changed
-		current_checksum="$(b2sum PKGBUILD | awk '{print $1}')"
-		if [[ ${pkgbuild_checksum} != "${current_checksum}" ]]; then
-			pkgbuild_checksum=${current_checksum}
-			# shellcheck source=contrib/makepkg/PKGBUILD.proto
-			. ./PKGBUILD
-		fi
-
-		# auto generate .SRCINFO
-		# shellcheck disable=SC2119
-		write_srcinfo_file
-
-		# test-install (some of) the produced packages
-		if [[ ${INSTALL_TO_HOST} == auto ]] || [[ ${INSTALL_TO_HOST} == all ]]; then
-			# shellcheck disable=2119
-			load_makepkg_config
-
-			# this is inspired by print_all_package_names from libmakepkg
-			local version pkg_architecture pkg pkgfile
-			version=$(get_full_version)
-
-			for pkg in "${pkgname[@]}"; do
-				pkg_architecture=$(get_pkg_arch "$pkg")
-				pkgfile=$(realpath "$(printf "%s/%s-%s-%s%s\n" "${PKGDEST:-.}" "$pkg" "$version" "$pkg_architecture" "$PKGEXT")")
-
-				# check if we install all packages or if the (split-)package is already installed
-				if [[ ${INSTALL_TO_HOST} == all ]] || ( [[ ${INSTALL_TO_HOST} == auto ]] && pacman -Qq -- "$pkg" &>/dev/null ); then
-					INSTALL_HOST_PACKAGES+=("$pkgfile")
-				fi
-			done
-		fi
-
 		# release the build
 		if (( RELEASE )); then
-			pkgctl_release "${RELEASE_OPTIONS[@]}"
+			if [[ ${pkgrepo} != *-staging ]] && ! diffpkg --soname >/dev/null; then
+				die "abort none staging auto-release: package contains soname differences"
+			fi
+			echo RELEASE, ABORT
+			exit 0
+			pkgctl_release --repo "${pkgrepo}" "${RELEASE_OPTIONS[@]}"
 		fi
 
 		# reset common PKGBUILD variables
@@ -510,12 +408,6 @@ pkgctl_build() {
 		popd >/dev/null
 	done
 
-	# install all collected packages to the host system
-	if (( ${#INSTALL_HOST_PACKAGES[@]} )); then
-		msg "Installing built packages to the host system"
-		sudo pacman -U -- "${INSTALL_HOST_PACKAGES[@]}"
-	fi
-
 	# update the binary package repo db as last action
 	if (( RELEASE )) && (( DB_UPDATE )); then
 		# shellcheck disable=2119

src/lib/cache.sh

@@ -1,22 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_CACHE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_CACHE_SH=1
-
-set -e
-
-readonly XDG_DEVTOOLS_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/devtools"
-
-get_cache_file() {
-	local filename=$1
-	local path="${XDG_DEVTOOLS_CACHE_DIR}/${filename}"
-
-	mkdir --parents -- "$(dirname -- "$path")"
-	if [[ ! -f ${path} ]]; then
-		touch -- "${path}"
-	fi
-
-	printf '%s' "${path}"
-}

src/lib/common.sh

@@ -13,7 +13,7 @@ set +u +o posix
 $DEVTOOLS_INCLUDE_COMMON_SH
 
 # Avoid any encoding problems
-export LANG=C.UTF-8
+export LANG=C
 
 # Set buildtool properties
 export BUILDTOOL=devtools
@@ -22,33 +22,19 @@ export BUILDTOOLVER=@buildtoolver@
 # Set common properties
 export PACMAN_KEYRING_DIR=/etc/pacman.d/gnupg
 export GITLAB_HOST=gitlab.archlinux.org
-export GIT_REPO_SPEC_VERSION=2
+export GIT_REPO_SPEC_VERSION=0
-export GIT_PACKAGING_NAMESPACE=archlinux/packaging/packages
+export GIT_PACKAGING_NAMESPACE=bot-test/packages
-export GIT_PACKAGING_NAMESPACE_ID=11323
+export GIT_PACKAGING_NAMESPACE_ID=11233
-export GIT_PACKAGING_URL_SSH="git@${GITLAB_HOST}:${GIT_PACKAGING_NAMESPACE}"
+export GIT_PACKAGING_URL_SSH="ssh://git@${GITLAB_HOST}:222/${GIT_PACKAGING_NAMESPACE}"
 export GIT_PACKAGING_URL_HTTPS="https://${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
-export PACKAGING_REPO_RELEASE_HOST=repos.archlinux.org
+export PACKAGING_REPO_RELEASE_HOST=repos.sandbox.archlinux.org
-export PKGBASE_MAINTAINER_URL=https://archlinux.org/packages/pkgbase-maintainer
-export AUR_URL_SSH=aur@aur.archlinux.org
-
-# ensure TERM is set with a fallback to dumb
-export TERM=${TERM:-dumb}
 
 # check if messages are to be printed using color
-if [[ -t 2 && "$TERM" != dumb ]] || [[ ${DEVTOOLS_COLOR} == always ]]; then
+if [[ -t 2 && "$TERM" != dumb ]]; then
 	colorize
-	if tput setaf 0 &>/dev/null; then
-		PURPLE="$(tput setaf 5)"
-		DARK_GREEN="$(tput setaf 2)"
-		UNDERLINE="$(tput smul)"
-	else
-		PURPLE="\e[35m"
-		DARK_GREEN="\e[32m"
-		UNDERLINE="\e[4m"
-	fi
 else
 	# shellcheck disable=2034
-	declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW='' PURPLE='' DARK_GREEN='' UNDERLINE=''
+	declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi
 
 stat_busy() {
@@ -67,11 +53,6 @@ stat_done() {
 	printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
-stat_failed() {
-	# shellcheck disable=2059
-	printf "${BOLD}${RED}failed${ALL_OFF}\n" >&2
-}
-
 msg_success() {
 	local msg=$1
 	local padding
@@ -96,15 +77,6 @@ msg_warn() {
 	printf "%s %s\n" "${padding}${YELLOW}!${ALL_OFF}" "${msg}" >&2
 }
 
-print_workdir_error() {
-	if [[ ! -f "${WORKDIR}"/error ]]; then
-		return
-	fi
-	while read -r LINE; do
-		error '%s' "${LINE}"
-	done < "${WORKDIR}/error"
-}
-
 _setup_workdir=false
 setup_workdir() {
 	[[ -z ${WORKDIR:-} ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")
@@ -117,9 +89,6 @@ cleanup() {
 	if [[ -n ${WORKDIR:-} ]] && $_setup_workdir; then
 		rm -rf "$WORKDIR"
 	fi
-	if tput setaf 0 &>/dev/null; then
-		tput cnorm >&2
-	fi
 	exit "${1:-0}"
 }
 
@@ -151,7 +120,7 @@ lock() {
 	# Only reopen the FD if it wasn't handed to us
 	if ! [[ "/dev/fd/$1" -ef "$2" ]]; then
 		mkdir -p -- "$(dirname -- "$2")"
-		eval "exec $1>>"'"$2"'
+		eval "exec $1>"'"$2"'
 	fi
 
 	if ! flock -n "$1"; then

src/lib/config.sh

@@ -34,12 +34,8 @@ load_devtools_config() {
 
 save_devtools_config() {
 	# temporary permission fixup
-	if [[ -d "${XDG_DEVTOOLS_DIR}" ]]; then
+	chmod 700 "${XDG_DEVTOOLS_DIR}"
-		chmod 700 "${XDG_DEVTOOLS_DIR}"
+	chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	fi
-	if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
-		chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	fi
 	(
 		umask 0077
 		mkdir -p "${XDG_DEVTOOLS_DIR}"

src/lib/db.sh

@@ -15,7 +15,7 @@ pkgctl_db_usage() {
 	cat <<- _EOF_
 		Usage: ${COMMAND} [COMMAND] [OPTIONS]
 
-		Pacman database modification for package update, move etc
+		Pacman database modification for packge update, move etc
 
 		COMMANDS
 		    move      Move packages between pacman repositories

src/lib/db/remove.sh

@@ -25,7 +25,7 @@ pkgctl_db_remove_usage() {
 
 		EXAMPLES
 		    $ ${COMMAND} core-testing libfoo libbar
-		    $ ${COMMAND} --arch x86_64 core libyay
+		    $ ${COMMAND} core --arch x86_64 libyay
 _EOF_
 }
 

src/lib/rebuild-todo.sh

@@ -1,234 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_REBUILD_TODO_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_REBUILD_TODO_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-source /usr/share/makepkg/util/util.sh
-
-# shellcheck source=src/lib/repo/clone.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/clone.sh
-# shellcheck source=src/lib/build/build.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/build/build.sh
-# shellcheck source=src/lib/release.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
-
-set -e
-
-
-pkgctl_rebuild_todo_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] URL
-
-		Rebuilds packages from a todo list.
-
-		OPTIONS
-		    -h, --help        Show this help text
-		    -m, --message MSG Use the given <msg> as the commit message
-		    -i, --ignore      Give one or more pkgbases to ignore
-		    -f, --maintainer  Filter for one or more maintainers (orphan for orphan packages)
-		    -o, --offload     Build on a remote server and transfer artifacts afterwards
-		    -e, --edit        Edit PKGBUILD before building. Default when todo type is "Task"
-		    -r, --repo REPO   Specify a target repository (disables auto-detection)
-		    -s, --staging     Release to the staging counterpart of the auto-detected repo
-		    -t, --testing     Release to the testing counterpart of the auto-detected repo
-		    -u, --db-update   Automatically update the pacman database after uploading
-		    --no-build        Don't build PKGBUILD
-		    --no-release      Don't run commitpkg after building
-
-		EXAMPLES
-			TODO
-_EOF_
-}
-
-pkgctl_rebuild_todo() {
-	if (( $# < 1 )); then
-		pkgctl_rebuild_todo_usage
-		exit 1
-	fi
-
-	local URL=""
-	local REPO=""
-
-	local MAINTAINERS=()
-	local IGNORE_PKGBASES=()
-	local FILTER_REPOSITORY=("extra")
-
-	local DRY_RUN=0
-	local MESSAGE_SET=0
-	local NO_RELEASE=0
-	local NO_BUILD=0
-
-	local RELEASE_OPTIONS=("--staging")
-	local BUILD_OPTIONS=("--staging" "--rebuild")
-
-	local packages
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_rebuild_todo_usage
-				exit 0
-				;;
-			--dry-run)
-				DRY_RUN=1
-				shift 1
-				;;
-			-f|--maintainer)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				MAINTAINERS+=("$2")
-				shift 2
-				;;
-			-i|--ignore)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				IGNORE_PKGBASES+=("$2")
-				shift 2
-				;;
-			-o|--offload)
-				BUILD_OPTIONS+=("--offload")
-				shift
-				;;
-			-e|--edit)
-				BUILD_OPTIONS+=("--edit")
-				shift
-				;;
-			-m|--message)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				MESSAGE_SET=1
-				RELEASE_OPTIONS+=("--message" "$2")
-				shift 2
-				;;
-			-s|--staging)
-				RELEASE_OPTIONS+=("--staging")
-				shift
-				;;
-			-t|--testing)
-				RELEASE_OPTIONS+=("--testing")
-				shift
-				;;
-			--no-release)
-				NO_RELEASE=1
-				shift
-				;;
-			--no-build)
-				NO_BUILD=1
-				shift
-				;;
-			-*)
-				die "invalid option: %s" "$1"
-				;;
-			*)
-				if [[ ! "$1" == https* ]]; then
-					die "Missing url!"
-				fi
-				URL="$1"
-				if [[ ! "$URL" == */ ]]; then
-					URL+="/"
-				fi
-				if [[ ! "$URL" == *json ]]; then
-					URL+="json"
-				fi
-				break
-				;;
-		esac
-	done
-
-	# TODO: setup default values for options
-
-	while read -r json; do
-		readarray -t packages < <(jq --slurpfile repo <(printf '"%s" ' "${FILTER_REPOSITORY[@]}") \
-									 --slurpfile maint <(printf '"%s" ' "${MAINTAINERS[@]}") \
-									 -r '.created as $created
-										 | .packages[]
-										 | select(.status_str == "Incomplete" )
-										 | select([.repo] | inside($repo))
-										 | select(($maint[0] == "") or (($maint[0] == "orphan") and .maintainers == []) or (select(.maintainers | any([.] | inside($maint)))))
-										 | "\(.pkgbase)"' \
-									 - <<< "$json" | sort -u)
-
-		# This removes any elements we have ignored.... it's not pretty
-		readarray -t packages < <(comm -1 -3 <(printf "%s\n" "${IGNORE_PKGBASES[@]}" | sort) <(printf "%s\n" "${packages[@]}"| sort))
-
-		# Default to include the list name in the commit message
-		if (( ! MESSAGE_SET )); then
-			RELEASE_OPTIONS+=("--message" "$(jq -r '.name' - <<< "$json")")
-		fi
-
-		# If we are doing a Task we probably want to edit the PKGBUILD
-		if [[ "$(jq -r '.kind' - <<< "$json")" == "Task" ]]; then
-			BUILD_OPTIONS+=("--edit")
-		fi
-	done <<< "$(curl -s "$URL")"
-
-	if (( DRY_RUN )); then
-		msg "Would rebuild the following packages:"
-		msg2 '%s' "${packages[@]}"
-		msg "by running the following for each:"
-		if ! ((NO_BUILD)); then
-			msg2 "pkgctl build ${BUILD_OPTIONS[*]}"
-		fi
-		if ! ((NO_RELEASE)); then
-			msg2 "pkgctl release ${RELEASE_OPTIONS[*]}"
-		fi
-		exit 0
-	fi
-
-	if (( 0 == ${#packages[@]} )); then
-		die "No packages to rebuild!"
-	fi
-
-	msg "Rebuilding the following packages:"
-	msg2 '%s' "${packages[@]}"
-	msg "Press [Enter] to continue..."
-	read <&1
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	pushd "$WORKDIR" &>/dev/null
-
-	# TODO set -j 1 to circumvent bug in repo clone
-	msg "Clone the pacakges"
-	if ! pkgctl_repo_clone -j 1 "${packages[@]}"; then
-		die "error while cloning packages"
-	fi
-
-	for pkg in "${packages[@]}"; do
-		pushd "$pkg" &>/dev/null
-
-		# This should help us figure out if the package is already built
-		readarray -t pkgs < <(makepkg --packagelist)
-		if [[ -f ${pkgs[0]} ]]; then
-			msg "${pkg[0]} has already been rebuilt!"
-			continue
-		fi
-
-		if ! ((NO_BUILD)); then
-			SKIP_BUILD=0
-			while true; do
-				# TODO: it seems like pkgctl build does not set the exit code correctly if (offload?) build fails
-				if pkgctl_build "${BUILD_OPTIONS[@]}"; then
-					break
-				fi
-				error "We failed to build! You are in a subshell to fix the build. Exit the shell to build again."
-				$SHELL || true
-				read -p "Skip build? [N/y] " -n 1 -r
-				if [[ $REPLY =~ ^[Yy]$ ]]; then
-					SKIP_BUILD=1
-					break
-				fi
-			done
-			if ((SKIP_BUILD)); then
-				popd &>/dev/null
-				continue
-			fi
-		fi
-		if ! ((NO_RELEASE)); then
-			pkgctl_release "${RELEASE_OPTIONS[@]}"
-		fi
-		popd &>/dev/null
-	done
-}

src/lib/release.sh

@@ -35,7 +35,7 @@ pkgctl_release_usage() {
 
 		OPTIONS
 		    -m, --message MSG   Use the given <msg> as the commit message
-		    -r, --repo REPO     Specify target repository for new packages not in any official repo
+		    -r, --repo REPO     Specify a target repository (disables auto-detection)
 		    -s, --staging       Release to the staging counterpart of the auto-detected repo
 		    -t, --testing       Release to the testing counterpart of the auto-detected repo
 		    -u, --db-update     Automatically update the pacman database after uploading
@@ -43,8 +43,8 @@ pkgctl_release_usage() {
 
 		EXAMPLES
 		    $ ${COMMAND}
-		    $ ${COMMAND} --staging --message 'libyay 0.42 rebuild' libfoo libbar
+		    $ ${COMMAND} --repo core-testing --message 'libyay 0.42 rebuild' libfoo libbar
-		    $ ${COMMAND} --repo extra --db-update new-package
+		    $ ${COMMAND} --staging --db-update libfoo
 _EOF_
 }
 
@@ -126,7 +126,7 @@ pkgctl_release() {
 	if [[ -z ${REPO} ]]; then
 		update_pacman_repo_cache
 	# Check valid repos if not resolved dynamically
-	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
+	elif ! in_array "${REPO}" "${_repos[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"
 	fi
 
@@ -134,27 +134,20 @@ pkgctl_release() {
 		pushd "${path}" >/dev/null
 		pkgbase=$(basename "${path}")
 
-		# auto-detect target repository
+		if [[ -n ${REPO} ]]; then
-		if ! repo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
-			die 'Failed to query pacman repo'
-		fi
-
-		# fail if an existing package specifies --repo
-		if [[ -n "${repo}" ]] && [[ -n ${REPO} ]]; then
-			# allow unstable to use --repo
-			if [[ ${REPO} == *unstable ]]; then
-				repo=${REPO}
-			else
-				die 'Using --repo for packages that exist in official repositories is disallowed'
-			fi
-		fi
-
-		# fail if a new package does not specify --repo
-		if [[ -z "${repo}" ]]; then
-			if [[ -z ${REPO} ]]; then
-				die 'Specify --repo for packages that do not yet exist in official repositories'
-			fi
 			repo=${REPO}
+		else
+			if ! repo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
+				die 'Failed to get pacman repo'
+			fi
+			if [[ -z "${repo}" ]]; then
+				die 'Unknown repo, please specify --repo for new packages'
+			fi
+		fi
+
+		# TODO: REMOVE AFTER POC
+		if [[ ${repo} == community ]]; then
+			repo=extra
 		fi
 
 		if (( TESTING )); then

src/lib/repo.sh

@@ -30,7 +30,6 @@ pkgctl_repo_usage() {
 		    clone          Clone a package repository
 		    configure      Configure a clone according to distro specs
 		    create         Create a new GitLab package repository
-		    switch         Switch a package repository to a specified version
 		    web            Open the packaging repository's website
 
 		OPTIONS
@@ -41,7 +40,6 @@ pkgctl_repo_usage() {
 		    $ ${COMMAND} clone --maintainer mynickname
 		    $ ${COMMAND} configure *
 		    $ ${COMMAND} create libfoo
-		    $ ${COMMAND} switch 2:1.19.5-1 libfoo
 		    $ ${COMMAND} web linux
 _EOF_
 }
@@ -83,14 +81,6 @@ pkgctl_repo() {
 				pkgctl_repo_create "$@"
 				exit 0
 				;;
-			switch)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/repo/switch.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/switch.sh
-				pkgctl_repo_switch "$@"
-				exit 0
-				;;
 			web)
 				_DEVTOOLS_COMMAND+=" $1"
 				shift

src/lib/repo/clone.sh

@@ -8,19 +8,14 @@ DEVTOOLS_INCLUDE_REPO_CLONE_SH=1
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 # shellcheck source=src/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/api/archweb.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/archweb.sh
 # shellcheck source=src/lib/api/gitlab.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
 # shellcheck source=src/lib/repo/configure.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
-# shellcheck source=src/lib/util/git.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
 
 source /usr/share/makepkg/util/message.sh
 
 set -e
-set -o pipefail
 
 
 pkgctl_repo_clone_usage() {
@@ -31,22 +26,18 @@ pkgctl_repo_clone_usage() {
 		Clone Git packaging repositories from the canonical namespace.
 
 		The configure command is subsequently invoked to synchronize the distro
-		specs and makepkg.conf settings. The protocol option can be used
+		specs and makepkg.conf settings. The unprivileged option can be used
 		for cloning packaging repositories without SSH access using read-only
 		HTTPS.
 
 		OPTIONS
 		    -m, --maintainer=NAME  Clone all packages of the named maintainer
-		    --protocol https       Clone the repository over https
-		    --switch VERSION       Switch the current working tree to a specified version
 		    --universe             Clone all existing packages, useful for cache warming
-		    -j, --jobs N           Run up to N jobs in parallel (default: $(nproc))
 		    -h, --help             Show this help text
 
 		EXAMPLES
 		    $ ${COMMAND} libfoo linux libbar
 		    $ ${COMMAND} --maintainer mynickname
-		    $ ${COMMAND} --switch 1:1.0-2 libfoo
 _EOF_
 }
 
@@ -57,17 +48,13 @@ pkgctl_repo_clone() {
 	fi
 
 	# options
-	local protocol=ssh
 	local GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
 	local CLONE_ALL=0
 	local MAINTAINER=
-	local VERSION=
 	local CONFIGURE_OPTIONS=()
-	local jobs=
+	local pkgbases
-	jobs=$(nproc)
 
 	# variables
-	local command=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
 	local project_path
 
 	while (( $# )); do
@@ -76,23 +63,11 @@ pkgctl_repo_clone() {
 				pkgctl_repo_clone_usage
 				exit 0
 				;;
-			--protocol=https)
+			-u|--unprivileged)
 				GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
-				protocol=https
 				CONFIGURE_OPTIONS+=("$1")
 				shift
 				;;
-			--protocol)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if [[ $2 == https ]]; then
-					GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
-				else
-					die "unsupported protocol: %s" "$2"
-				fi
-				protocol="$2"
-				CONFIGURE_OPTIONS+=("$1" "$2")
-				shift 2
-				;;
 			-m|--maintainer)
 				(( $# <= 1 )) && die "missing argument for %s" "$1"
 				MAINTAINER="$2"
@@ -102,28 +77,10 @@ pkgctl_repo_clone() {
 				MAINTAINER="${1#*=}"
 				shift
 				;;
-			--switch)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				# shellcheck source=src/lib/repo/switch.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/switch.sh
-				VERSION="$2"
-				shift 2
-				;;
-			--switch=*)
-				# shellcheck source=src/lib/repo/switch.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/switch.sh
-				VERSION="${1#*=}"
-				shift
-				;;
 			--universe)
 				CLONE_ALL=1
 				shift
 				;;
-			-j|--jobs)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				jobs=$2
-				shift 2
-				;;
 			--)
 				shift
 				break
@@ -140,41 +97,33 @@ pkgctl_repo_clone() {
 
 	# Query packages of a maintainer
 	if [[ -n ${MAINTAINER} ]]; then
-		mapfile -t pkgbases < <(archweb_query_maintainer_packages "${MAINTAINER}")
+		stat_busy "Query packages"
-		if ! wait $!; then
+		max_pages=$(curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&maintainer=${MAINTAINER}" | jq -r '.num_pages')
-			die "Failed to query maintainer packages"
+		if [[ ! ${max_pages} =~ ([[:digit:]]) ]]; then
+			stat_done
+			warning "found no packages for maintainer ${MAINTAINER}"
+			exit 0
 		fi
+		mapfile -t pkgbases < <(for page in $(seq "${max_pages}"); do
+			curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&maintainer=${MAINTAINER}&page=${page}" | jq -r '.results[].pkgbase'
+			stat_progress
+		done | sort --unique)
+		stat_done
 	fi
 
 	# Query all released packages
 	if (( CLONE_ALL )); then
-		mapfile -t pkgbases < <(archweb_query_all_packages)
+		stat_busy "Query all released packages"
-		if ! wait $!; then
+		max_pages=$(curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name" | jq -r '.num_pages')
-			die "Failed to query all packages"
+		if [[ ! ${max_pages} =~ ([[:digit:]]) ]]; then
+			stat_done
+			die "failed to query packages"
 		fi
-	fi
+		mapfile -t pkgbases < <(for page in $(seq "${max_pages}"); do
-
+			curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&page=${page}" | jq -r '.results[].pkgbase'
-	# parallelization
+			stat_progress
-	if [[ ${jobs} != 1 ]] && (( ${#pkgbases[@]} > 1 )); then
+		done | sort --unique)
-		# force colors in parallel if parent process is colorized
+		stat_done
-		if [[ -n ${BOLD} ]]; then
-			export DEVTOOLS_COLOR=always
-		fi
-		# assign command options
-		if [[ -n "${VERSION}" ]]; then
-			command+=" --switch '${VERSION}'"
-		fi
-
-		# warm up ssh connection as it may require user input (key unlock, hostkey verification etc)
-		if [[ ${protocol} == ssh ]]; then
-			git_warmup_ssh_connection
-		fi
-
-		if ! parallel --bar --jobs "${jobs}" "${command}" ::: "${pkgbases[@]}"; then
-			die 'Failed to clone some packages, please check the output'
-			exit 1
-		fi
-		exit 0
 	fi
 
 	for pkgbase in "${pkgbases[@]}"; do
@@ -182,17 +131,11 @@ pkgctl_repo_clone() {
 			msg "Cloning ${pkgbase} ..."
 			project_path=$(gitlab_project_name_to_path "${pkgbase}")
 			remote_url="${GIT_REPO_BASE_URL}/${project_path}.git"
-			if ! git clone --origin origin "${remote_url}" "${pkgbase}"; then
+			git clone --origin origin "${remote_url}" "${pkgbase}"
-				die 'failed to clone %s' "${pkgbase}"
-			fi
 		else
 			warning "Skip cloning ${pkgbase}: Directory exists"
 		fi
 
 		pkgctl_repo_configure "${CONFIGURE_OPTIONS[@]}" "${pkgbase}"
-
-		if [[ -n "${VERSION}" ]]; then
-			pkgctl_repo_switch "${VERSION}" "${pkgbase}"
-		fi
 	done
 }

src/lib/repo/configure.sh

@@ -10,14 +10,11 @@ _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
 # shellcheck source=src/lib/api/gitlab.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-# shellcheck source=src/lib/util/git.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
 
 source /usr/share/makepkg/util/config.sh
 source /usr/share/makepkg/util/message.sh
 
 set -e
-shopt -s nullglob
 
 
 pkgctl_repo_configure_usage() {
@@ -35,15 +32,11 @@ pkgctl_repo_configure_usage() {
 		address by choosing SSH for all official packager identities and
 		read-only HTTPS otherwise.
 
-		Git default excludes and hooks are applied to the configured repo.
-
 		OPTIONS
-		    --protocol https     Configure remote url to use https
-		    -j, --jobs N         Run up to N jobs in parallel (default: $(nproc))
 		    -h, --help           Show this help text
 
 		EXAMPLES
-		    $ ${COMMAND} *
+		    $ ${COMMAND} configure *
 _EOF_
 }
 
@@ -100,14 +93,10 @@ pkgctl_repo_configure() {
 	local GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
 	local official=0
 	local proto=https
-	local proto_force=0
-	local jobs=
-	jobs=$(nproc)
 	local paths=()
 
 	# variables
-	local -r command=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+	local path realpath pkgbase remote_url project_path
-	local path realpath pkgbase remote_url project_path hook
 	local PACKAGER GPGKEY packager_name packager_email
 
 	while (( $# )); do
@@ -116,24 +105,6 @@ pkgctl_repo_configure() {
 				pkgctl_repo_configure_usage
 				exit 0
 				;;
-			--protocol=https)
-				proto_force=1
-				shift
-				;;
-			--protocol)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if [[ $2 == https ]]; then
-					proto_force=1
-				else
-					die "unsupported protocol: %s" "$2"
-				fi
-				shift 2
-				;;
-			-j|--jobs)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				jobs=$2
-				shift 2
-				;;
 			--)
 				shift
 				break
@@ -172,10 +143,8 @@ pkgctl_repo_configure() {
 		fi
 		if is_packager_email_official "${packager_email}"; then
 			official=1
-			if (( ! proto_force )); then
+			proto=ssh
-				proto=ssh
+			GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
-				GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
-			fi
 		fi
 	fi
 
@@ -188,31 +157,9 @@ pkgctl_repo_configure() {
 		msg2 "protocol: ${YELLOW}${proto}${ALL_OFF}"
 	fi
 
-	# parallelization
-	if [[ ${jobs} != 1 ]] && (( ${#paths[@]} > 1 )); then
-		if [[ -n ${BOLD} ]]; then
-			export DEVTOOLS_COLOR=always
-		fi
-
-		# warm up ssh connection as it may require user input (key unlock, hostkey verification etc)
-		if [[ ${proto} == ssh ]]; then
-			git_warmup_ssh_connection
-		fi
-
-		if ! parallel --bar --jobs "${jobs}" "${command}" ::: "${paths[@]}"; then
-			die 'Failed to configure some packages, please check the output'
-			exit 1
-		fi
-		exit 0
-	fi
-
 	for path in "${paths[@]}"; do
-		# resolve symlink for basename
+		if ! realpath=$(realpath -e "${path}"); then
-		if ! realpath=$(realpath --canonicalize-existing -- "${path}"); then
+			error "No such directory: ${path}"
-			die "No such directory: ${path}"
-		fi
-		# skip paths that aren't directories
-		if [[ ! -d "${realpath}" ]]; then
 			continue
 		fi
 
@@ -221,7 +168,8 @@ pkgctl_repo_configure() {
 		msg "Configuring ${pkgbase}"
 
 		if [[ ! -d "${path}/.git" ]]; then
-			die "Not a Git repository: ${path}"
+			error "Not a Git repository: ${path}"
+			continue
 		fi
 
 		pushd "${path}" >/dev/null
@@ -233,20 +181,12 @@ pkgctl_repo_configure() {
 		fi
 
 		# move the master branch to main
-		if [[ $(git symbolic-ref --quiet --short HEAD) == master ]]; then
+		if [[ $(git symbolic-ref --short HEAD) == master ]]; then
 			git branch --move main
 			git config branch.main.merge refs/heads/main
 		fi
 
-		# configure spec version and variant to avoid using development hooks in production
 		git config devtools.version "${GIT_REPO_SPEC_VERSION}"
-		if [[ ${_DEVTOOLS_LIBRARY_DIR} == /usr/share/devtools ]]; then
-			git config devtools.variant canonical
-		else
-			warning "Configuring with development version of pkgctl, do not use this repo in production"
-			git config devtools.variant development
-		fi
-
 		git config pull.rebase true
 		git config branch.autoSetupRebase always
 		git config branch.main.remote origin
@@ -273,18 +213,6 @@ pkgctl_repo_configure() {
 			git config user.signingKey "${GPGKEY}"
 		fi
 
-		# set default git exclude
-		mkdir -p .git/info
-		ln -sf "${_DEVTOOLS_LIBRARY_DIR}/git.conf.d/template/info/exclude" \
-			.git/info/exclude
-
-		# set default git hooks
-		mkdir -p .git/hooks
-		rm -f .git/hooks/*.sample
-		for hook in "${_DEVTOOLS_LIBRARY_DIR}"/git.conf.d/template/hooks/*; do
-			ln -sf "${hook}" ".git/hooks/$(basename "${hook}")"
-		done
-
 		if ! git ls-remote origin &>/dev/null; then
 			warning "configured remote origin may not exist, run:"
 			msg2 "pkgctl repo create ${pkgbase}"

src/lib/repo/switch.sh

@@ -1,124 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_REPO_SWITCH_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_REPO_SWITCH_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-source /usr/share/makepkg/util/message.sh
-
-set -e
-
-
-pkgctl_repo_switch_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [VERSION] [PKGBASE]...
-
-		Switch a package source repository to a specified version, tag or
-		branch. The working tree and the index are updated to match the
-		specified ref.
-
-		If a version identifier is specified in the pacman version format, that
-		identifier is automatically translated to the Git tag name accordingly.
-
-		The current working directory is used if no PKGBASE is specified.
-
-		OPTIONS
-		    --discard-changes   Discard changes if index or working tree is dirty
-		    -f, --force         An alias for --discard-changes
-		    -h, --help          Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} 1.14.6-1 gopass gopass-jsonapi
-		    $ ${COMMAND} --force 2:1.19.5-1
-		    $ ${COMMAND} main
-_EOF_
-}
-
-pkgctl_repo_switch() {
-	if (( $# < 1 )); then
-		pkgctl_repo_switch_usage
-		exit 0
-	fi
-
-	# options
-	local VERSION
-	local GIT_REF
-	local GIT_CHECKOUT_OPTIONS=()
-	local paths path realpath pkgbase
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_repo_switch_usage
-				exit 0
-				;;
-			-f|--force|--discard-changes)
-				GIT_CHECKOUT_OPTIONS+=("--force")
-				shift
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				# - is special to switch back to previous version
-				if [[ $1 != - ]]; then
-					die "invalid argument: %s" "$1"
-				fi
-				;;&
-			*)
-				if [[ -n ${VERSION} ]]; then
-					break
-				fi
-				VERSION=$1
-				shift
-				;;
-		esac
-	done
-
-	if [[ -z ${VERSION} ]]; then
-		error "missing positional argument 'VERSION'"
-		pkgctl_repo_switch_usage
-		exit 1
-	fi
-
-	GIT_REF="$(get_tag_from_pkgver "${VERSION}")"
-	paths=("$@")
-
-	# check if invoked without any path from within a packaging repo
-	if (( ${#paths[@]} == 0 )); then
-		if [[ -f PKGBUILD ]]; then
-			paths=(".")
-		else
-			die "Not a package repository: $(realpath -- .)"
-		fi
-	fi
-
-	for path in "${paths[@]}"; do
-		# resolve symlink for basename
-		if ! realpath=$(realpath --canonicalize-existing -- "${path}"); then
-			die "No such directory: ${path}"
-		fi
-		# skip paths that are not directories
-		if [[ ! -d "${realpath}" ]]; then
-			continue
-		fi
-		# skip paths that are not git repositories
-		if [[ ! -d "${realpath}/.git" ]]; then
-			error "Not a Git repository: ${path}"
-			continue
-		fi
-
-		pkgbase=$(basename "${realpath}")
-		if ! git -C "${path}" checkout "${GIT_CHECKOUT_OPTIONS[@]}" "${GIT_REF}"; then
-			die "Failed to switch ${pkgbase} to version ${VERSION}"
-		fi
-		msg "Successfully switched ${pkgbase} to version ${VERSION}"
-	done
-}

src/lib/repo/web.sh

@@ -23,18 +23,16 @@ pkgctl_repo_web_usage() {
 		no arguments, open the package cloned in the current working directory.
 
 		OPTIONS
-		    --print       Print the url instead of opening it with xdg-open
 		    -h, --help    Show this help text
 
 		EXAMPLES
-		    $ ${COMMAND} linux
+		    $ ${COMMAND} web linux
 _EOF_
 }
 
 pkgctl_repo_web() {
 	local pkgbases=()
-	local path giturl pkgbase url
+	local path giturl pkgbase
-	local mode=open
 
 	# option checking
 	while (( $# )); do
@@ -43,10 +41,6 @@ pkgctl_repo_web() {
 				pkgctl_repo_web_usage
 				exit 0
 				;;
-			--print)
-				mode=print
-				shift
-				;;
 			--)
 				shift
 				break
@@ -62,7 +56,7 @@ pkgctl_repo_web() {
 	done
 
 	# Check if web mode has xdg-open
-	if [[ ${mode} == open ]] && ! command -v xdg-open &>/dev/null; then
+	if ! command -v xdg-open &>/dev/null; then
 		die "The web command requires 'xdg-open'"
 	fi
 
@@ -84,18 +78,6 @@ pkgctl_repo_web() {
 	fi
 
 	for pkgbase in "${pkgbases[@]}"; do
-		pkgbase=$(basename "${pkgbase}")
+		xdg-open "${GIT_PACKAGING_URL_HTTPS}/${pkgbase}"
-		path=$(gitlab_project_name_to_path "${pkgbase}")
-		url="${GIT_PACKAGING_URL_HTTPS}/${path}"
-		case ${mode} in
-			open)
-				xdg-open "${url}"
-				;;
-			print)
-				printf "%s\n" "${url}"
-				;;
-			*)
-				die "Unknown mode: ${mode}"
-		esac
 	done
 }

src/lib/search.sh

@@ -1,308 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_SEARCH_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_SEARCH_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/cache.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/cache.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-# shellcheck source=src/lib/valid-search.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
-# shellcheck source=src/lib/util/term.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/term.sh
-
-source /usr/share/makepkg/util/util.sh
-source /usr/share/makepkg/util/message.sh
-
-set -eo pipefail
-
-
-pkgctl_search_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] QUERY
-
-		Search for an expression across the GitLab packaging group.
-
-		To use a filter, include it in your query. You may use wildcards (*) to
-		use glob matching.
-
-		Available filters for the blobs scope: path, extension
-
-		Every usage of the search command must be authenticated. Consult the
-		'pkgctl auth' command to authenticate with GitLab or view the
-		authentication status.
-
-		SEARCH TIPS
-		    Syntax  Description    Example
-		    ───────────────────────────────────────
-		    "       Exact search   "gem sidekiq"
-		    ~       Fuzzy search   J~ Doe
-		    |       Or             display | banner
-		    +       And            display +banner
-		    -       Exclude        display -banner
-		    *       Partial        bug error 50*
-		    \\       Escape         \\*md
-		    #       Issue ID       #23456
-		    !       Merge request  !23456
-
-		OPTIONS
-		    -h, --help            Show this help text
-
-		FILTER OPTIONS
-		    --no-default-filter   Do not apply default filter (like -path:keys/pgp/*.asc)
-
-		OUTPUT OPTIONS
-		    --json                Enable printing in JSON; Shorthand for '--format json'
-		    -F, --format FORMAT   Controls the formatting of the results; FORMAT is 'pretty',
-		                          'plain', or 'json' (default: pretty)
-		    -N, --no-line-number  Don't show line numbers when formatting results
-
-		EXAMPLES
-		    $ ${COMMAND} linux
-		    $ ${COMMAND} --json '"pytest -v" +PYTHONPATH'
-_EOF_
-}
-
-pkgctl_search_check_option_group_format() {
-	local option=$1
-	local output_format=$2
-	if [[ -n ${output_format} ]]; then
-		die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
-		exit 1
-	fi
-	return 0
-}
-
-pkgctl_search() {
-	if (( $# < 1 )); then
-		pkgctl_search_usage
-		exit 0
-	fi
-
-	# options
-	local search
-	local output_format=
-	local use_default_filter=1
-	local line_numbers=1
-
-	# variables
-	local bat_style="header,grid"
-	local default_filter="-path:keys/pgp/*.asc"
-	local graphql_lookup_batch=200
-	local output result query entries from until length
-	local project_name_cache_file project_name_lookup project_ids project_id project_name project_slice
-	local mapping_output path startline currentline data line
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_search_usage
-				exit 0
-				;;
-			--no-default-filter)
-				use_default_filter=0
-				shift
-				;;
-			--json)
-				pkgctl_search_check_option_group_format "$1" "${output_format}"
-				output_format=json
-				shift
-				;;
-			-F|--format)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				pkgctl_search_check_option_group_format "$1" "${output_format}"
-				output_format="${2}"
-				if ! in_array "${output_format}" "${valid_search_output_format[@]}"; then
-					die "Unknown output format: %s" "${output_format}"
-				fi
-				shift 2
-				;;
-			-N|--no-line-number)
-				line_numbers=0
-				shift
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	if (( $# == 0 )); then
-		pkgctl_search_usage
-		exit 1
-	fi
-
-	# assign search parameter
-	search="${*}"
-	if (( use_default_filter )); then
-		search+=" ${default_filter}"
-	fi
-
-	# assign default output format
-	if [[ -z ${output_format} ]]; then
-		output_format=pretty
-	fi
-
-	# check for optional dependencies
-	if [[ ${output_format} == pretty ]] && ! command -v bat &>/dev/null; then
-		warning "Failed to find optional dependency 'bat': falling back to plain output"
-		output_format=plain
-	fi
-
-	# populate line numbers option
-	if (( line_numbers )); then
-		bat_style="numbers,${bat_style}"
-	fi
-
-	# call the gitlab search API
-	status_dir=$(mktemp --tmpdir="${WORKDIR}" --directory pkgctl-gitlab-api.XXXXXXXXXX)
-	printf "📡 Querying GitLab search API..." > "${status_dir}/status"
-	term_spinner_start "${status_dir}"
-	output=$(gitlab_api_search "${search}" "${status_dir}/status")
-	term_spinner_stop "${status_dir}"
-	msg_success "Querying GitLab search API"
-
-	# collect project ids whose name needs to be looked up
-	project_name_cache_file=$(get_cache_file gitlab/project_id_to_name)
-	lock 11 "${project_name_cache_file}" "Locking project name cache"
-	mapfile -t project_ids < <(
-		jq --raw-output '[.[].project_id] | unique[]' <<< "${output}" | \
-			grep --invert-match --file <(awk '{ print $1 }' < "${project_name_cache_file}" ))
-
-	# look up project names
-	tmp_file=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api-spinner.tmp.XXXXXXXXXX)
-	printf "📡 Querying GitLab project names..." > "${status_dir}/status"
-	term_spinner_start "${status_dir}"
-	local entries="${#project_ids[@]}"
-	local until=0
-	while (( until < entries )); do
-		from=${until}
-		until=$(( until + graphql_lookup_batch ))
-		if (( until > entries )); then
-			until=${entries}
-		fi
-		length=$(( until - from ))
-
-		percentage=$(( 100 * until / entries ))
-		printf "📡 Querying GitLab project names: %s/%s [%s] %%spinner%%" \
-			"${BOLD}${until}" "${entries}" "${percentage}%${ALL_OFF}"  \
-			> "${tmp_file}"
-		mv "${tmp_file}" "${status_dir}/status"
-
-		project_slice=("${project_ids[@]:${from}:${length}}")
-		printf -v projects '"gid://gitlab/Project/%s",' "${project_slice[@]}"
-		query='{
-			projects(after: "" ids: ['"${projects}"']) {
-				pageInfo {
-					startCursor
-					endCursor
-					hasNextPage
-				}
-				nodes {
-					id
-					name
-				}
-			}
-		}'
-		mapping_output=$(gitlab_api_get_project_name_mapping "${query}")
-
-		# update cache
-		while read -r project_id project_name; do
-			printf "%s %s\n" "${project_id}" "${project_name}" >> "${project_name_cache_file}"
-		done < <(jq --raw-output \
-			'.[] | "\(.id | rindex("/") as $lastSlash | .[$lastSlash+1:]) \(.name)"' \
-			<<< "${mapping_output}")
-	done
-	term_spinner_stop "${status_dir}"
-	msg_success "Querying GitLab project names"
-
-	# read project_id to name mapping from cache
-	declare -A project_name_lookup=()
-	while read -r project_id project_name; do
-		project_name_lookup[${project_id}]=${project_name}
-	done < "${project_name_cache_file}"
-
-	# close project name cache lock
-	lock_close 11
-
-	# output mode JSON
-	if [[ ${output_format} == json ]]; then
-		jq --from-file <(
-			for project_id in $(jq '.[].project_id' <<< "${output}"); do
-				project_name=${project_name_lookup[${project_id}]}
-				printf 'map(if .project_id == %s then . + {"project_name": "%s"} else . end) | ' \
-					"${project_id}" "${project_name}"
-			done
-			printf .
-		) <<< "${output}"
-		exit 0
-	fi
-
-	# pretty print each result
-	while read -r result; do
-		# read properties from search result
-		mapfile -t data < <(jq --raw-output ".data" <<< "${result}")
-		{ read -r project_id; read -r path; read -r startline; } < <(
-			jq --raw-output ".project_id, .path, .startline" <<< "${result}"
-		)
-		project_name=${project_name_lookup[${project_id}]}
-
-		# remove trailing newline for multiline results
-		if (( ${#data[@]} > 1 )) && [[ ${data[-1]} == "" ]]; then
-			unset "data[${#data[@]}-1]"
-		fi
-
-		# output mode plain
-		if [[ ${output_format} == plain ]]; then
-			printf "%s%s%s\n" "${PURPLE}" "${project_name}/${path}" "${ALL_OFF}"
-
-			currentline=${startline}
-			for line in "${data[@]}"; do
-				if (( line_numbers )); then
-					line="${DARK_GREEN}${currentline}${ALL_OFF}: ${line}"
-					currentline=$(( currentline + 1 ))
-				fi
-				printf "%s\n" "${line}"
-			done
-			printf "\n"
-
-			continue
-		fi
-
-		# prepend empty lines to match startline
-		if (( startline > 1 )); then
-			mapfile -t data < <(
-				printf '%.0s\n' $(seq 1 "$(( startline - 1 ))")
-				printf "%s\n" "${data[@]}"
-			)
-		fi
-
-		bat \
-			--file-name="${project_name}/${path}" \
-			--line-range "${startline}:" \
-			--paging=never \
-			--force-colorization \
-			--style "${bat_style}" \
-			--map-syntax "PKGBUILD:Bourne Again Shell (bash)" \
-			--map-syntax ".SRCINFO:INI" \
-			--map-syntax "*install:Bourne Again Shell (bash)" \
-			--map-syntax "*sysusers*:Bourne Again Shell (bash)" \
-			--map-syntax "*tmpfiles*:Bourne Again Shell (bash)" \
-			--map-syntax "*.hook:INI" \
-			<(printf "%s\n" "${data[@]}")
-	done < <(jq --compact-output '.[]' <<< "${output}")
-}

src/lib/util/git.sh

@@ -7,9 +7,6 @@ DEVTOOLS_INCLUDE_UTIL_GIT_SH=1
 
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
 
 git_diff_tree() {
 	local commit=$1
@@ -25,10 +22,3 @@ git_diff_tree() {
 		"${commit}" \
 		-- "${path}"
 }
-
-git_warmup_ssh_connection() {
-	msg 'Establishing ssh connection to git@%s' "${GITLAB_HOST}"
-	if ! ssh -T "git@${GITLAB_HOST}" >/dev/null; then
-		die 'Failed to establish ssh connection to git@%s' "${GITLAB_HOST}"
-	fi
-}

src/lib/util/makepkg.sh

@@ -1,37 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_MAKEPKG_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_MAKEPKG_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/util/srcinfo.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/srcinfo.sh
-
-
-set -e
-
-makepkg_source_package() {
-	if (( EUID != 0 )); then
-		[[ -z ${WORKDIR:-} ]] && setup_workdir
-		export WORKDIR DEVTOOLS_INCLUDE_COMMON_SH
-		fakeroot -- bash -$- -c "source '${BASH_SOURCE[0]}' && ${FUNCNAME[0]}"
-		return
-	fi
-	(
-		export LIBMAKEPKG_LINT_PKGBUILD_SH=1
-		lint_pkgbuild() { :; }
-
-		export LIBMAKEPKG_SRCINFO_SH=1
-		write_srcinfo() { print_srcinfo; }
-
-		# explicitly instruct makepkg to not sign the source package, even when
-		# the BUILDENV array in makepkg.conf contains 'sign'
-		set +e -- -F --source --nosign
-		# shellcheck source=/usr/bin/makepkg
-		source "$(command -v makepkg)"
-	)
-}

src/lib/util/pacman.sh

@@ -38,21 +38,13 @@ get_pacman_repo_from_pkgbuild() {
 		return
 	fi
 
-	# update the pacman repo cache if it doesn't exist yet
-	if [[ ! -d "${_DEVTOOLS_PACMAN_CACHE_DIR}" ]]; then
-		update_pacman_repo_cache
-	fi
-
 	slock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
-	# query repo of passed pkgname, specify --nodeps twice to skip all dependency checks
 	mapfile -t repos < <(pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/multilib.conf" \
 		--dbpath "${_DEVTOOLS_PACMAN_CACHE_DIR}" \
-		--sync \
+		-S \
-		--nodeps \
-		--nodeps \
 		--print \
 		--print-format '%n %r' \
-		"${pkgnames[0]}" 2>/dev/null | awk '$1=="'"${pkgnames[0]}"'"{print $2}'
+		"${pkgnames[0]}" | grep -E "^${pkgnames[0]} " | awk '{print $2}'
 	)
 	lock_close 10
 

src/lib/util/pkgbuild.sh

@@ -1,43 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_PKGBUILD_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_PKGBUILD_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-source /usr/share/makepkg/util/message.sh
-
-set -e
-
-
-# set the pkgver variable in a PKGBUILD
-# assumes that the pkgbuild is sourced to detect the presence of a pkgver function
-pkgbuild_set_pkgver() {
-	local new_pkgver=$1
-	local pkgver=${pkgver}
-
-	if [[ $(type -t pkgver) == function ]]; then
-		# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
-		warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
-	fi
-
-	if ! grep --extended-regexp --quiet --max-count=1 "^pkgver=${pkgver}$" PKGBUILD; then
-		die "Non-standard pkgver declaration"
-	fi
-	sed --regexp-extended "s|^(pkgver=)${pkgver}$|\1${new_pkgver}|g" --in-place PKGBUILD
-}
-
-# set the pkgrel variable in a PKGBUILD
-# assumes that the pkgbuild is sourced so pkgrel is present
-pkgbuild_set_pkgrel() {
-	local new_pkgrel=$1
-	local pkgrel=${pkgrel}
-
-	if ! grep --extended-regexp --quiet --max-count=1 "^pkgrel=${pkgrel}$" PKGBUILD; then
-		die "Non-standard pkgrel declaration"
-	fi
-	sed --regexp-extended "s|^(pkgrel=)${pkgrel}$|\1${new_pkgrel}|g" --in-place PKGBUILD
-}
-

src/lib/util/srcinfo.sh

@@ -1,69 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_SRCINFO_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_SRCINFO_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-source /usr/share/makepkg/util/util.sh
-source /usr/share/makepkg/srcinfo.sh
-
-set -eo pipefail
-
-
-print_srcinfo() {
-	local pkgpath=${1:-.}
-	local outdir pkg pid
-	local pids=()
-
-	# source the PKGBUILD
-	# shellcheck source=contrib/makepkg/PKGBUILD.proto
-	. "${pkgpath}"/PKGBUILD
-
-	# run without parallelization for single packages
-	if (( ${#pkgname[@]} == 1 )); then
-		write_srcinfo_content
-		return 0
-	fi
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	outdir=$(mktemp --directory --tmpdir="${WORKDIR}" pkgctl-srcinfo.XXXXXXXXXX)
-
-	# fork workload for each split pkgname
-	for pkg in "${pkgname[@]}"; do
-		(
-			# deactivate errexit to avoid makepkg abort on grep_function
-			set +e
-			srcinfo_write_package "$pkg" > "${outdir}/${pkg}"
-		)&
-		pids+=($!)
-	done
-
-	# join workload
-	for pid in "${pids[@]}"; do
-		if ! wait "${pid}"; then
-			return 1
-		fi
-	done
-
-	# collect output
-	srcinfo_write_global
-	for pkg in "${pkgname[@]}"; do
-		srcinfo_separate_section
-		cat "${outdir}/${pkg}"
-	done
-}
-
-write_srcinfo_file() {
-	local pkgpath=${1:-.}
-	stat_busy 'Generating .SRCINFO'
-	if ! print_srcinfo "${pkgpath}" > "${pkgpath}"/.SRCINFO; then
-		error 'Failed to write .SRCINFO file'
-		return 1
-	fi
-	stat_done
-}

src/lib/util/term.sh

@@ -1,182 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_TERM_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_TERM_SH=1
-
-set -eo pipefail
-
-
-readonly PKGCTL_TERM_SPINNER_DOTS=Dots
-export PKGCTL_TERM_SPINNER_DOTS
-readonly PKGCTL_TERM_SPINNER_DOTS12=Dots12
-export PKGCTL_TERM_SPINNER_DOTS12
-readonly PKGCTL_TERM_SPINNER_LINE=Line
-export PKGCTL_TERM_SPINNER_LINE
-readonly PKGCTL_TERM_SPINNER_SIMPLE_DOTS_SCROLLING=SimpleDotsScrolling
-export PKGCTL_TERM_SPINNER_SIMPLE_DOTS_SCROLLING
-readonly PKGCTL_TERM_SPINNER_TRIANGLE=Triangle
-export PKGCTL_TERM_SPINNER_TRIANGLE
-readonly PKGCTL_TERM_SPINNER_RANDOM=Random
-export PKGCTL_TERM_SPINNER_RANDOM
-
-readonly PKGCTL_TERM_SPINNER_TYPES=(
-	"${PKGCTL_TERM_SPINNER_DOTS}"
-	"${PKGCTL_TERM_SPINNER_DOTS12}"
-	"${PKGCTL_TERM_SPINNER_LINE}"
-	"${PKGCTL_TERM_SPINNER_SIMPLE_DOTS_SCROLLING}"
-	"${PKGCTL_TERM_SPINNER_TRIANGLE}"
-)
-export PKGCTL_TERM_SPINNER_TYPES
-
-
-term_cursor_hide() {
-	tput civis >&2
-}
-
-term_cursor_show() {
-	tput cnorm >&2
-}
-
-term_cursor_up() {
-	tput cuu1
-}
-
-term_carriage_return() {
-	tput cr
-}
-
-term_erase_line() {
-	tput el
-}
-
-term_erase_lines() {
-	local lines=$1
-
-	local cursor_up erase_line
-	cursor_up=$(term_cursor_up)
-	erase_line="$(term_carriage_return)$(term_erase_line)"
-
-	local prefix=''
-	for _ in $(seq 1 "${lines}"); do
-		printf '%s' "${prefix}${erase_line}"
-		prefix="${cursor_up}"
-	done
-}
-
-_pkgctl_spinner_type=${PKGCTL_TERM_SPINNER_RANDOM}
-term_spinner_set_type() {
-	_pkgctl_spinner_type=$1
-}
-
-# takes a status directory that can be used to dynamically update the spinner
-# by writing to the `status` file inside that directory atomically.
-# replace the placeholder %spinner% with the currently configured spinner type
-term_spinner_start() {
-	local status_dir=$1
-	local parent_pid=$$
-	(
-		local spinner_type=${_pkgctl_spinner_type}
-		local spinner_offset=0
-		local frame_buffer=''
-		local spinner status_message line
-
-		local status_file="${status_dir}/status"
-		local next_file="${status_dir}/next"
-		local drawn_file="${status_dir}/drawn"
-
-		# assign random spinner type
-		if [[ ${spinner_type} == "${PKGCTL_TERM_SPINNER_RANDOM}" ]]; then
-			spinner_type=${PKGCTL_TERM_SPINNER_TYPES[$((RANDOM % ${#PKGCTL_TERM_SPINNER_TYPES[@]}))]}
-		fi
-
-		# select spinner based on the named type
-		case "${spinner_type}" in
-			"${PKGCTL_TERM_SPINNER_DOTS}")
-				spinner=("⠋" "⠙" "⠹" "⠸" "⠼" "⠴" "⠦" "⠧" "⠇" "⠏")
-				update_interval=0.08
-				;;
-			"${PKGCTL_TERM_SPINNER_DOTS12}")
-				spinner=("⢀⠀" "⡀⠀" "⠄⠀" "⢂⠀" "⡂⠀" "⠅⠀" "⢃⠀" "⡃⠀" "⠍⠀" "⢋⠀" "⡋⠀" "⠍⠁" "⢋⠁" "⡋⠁" "⠍⠉" "⠋⠉" "⠋⠉" "⠉⠙" "⠉⠙" "⠉⠩" "⠈⢙" "⠈⡙" "⢈⠩" "⡀⢙" "⠄⡙" "⢂⠩" "⡂⢘" "⠅⡘" "⢃⠨" "⡃⢐" "⠍⡐" "⢋⠠" "⡋⢀" "⠍⡁" "⢋⠁" "⡋⠁" "⠍⠉" "⠋⠉" "⠋⠉" "⠉⠙" "⠉⠙" "⠉⠩" "⠈⢙" "⠈⡙" "⠈⠩" "⠀⢙" "⠀⡙" "⠀⠩" "⠀⢘" "⠀⡘" "⠀⠨" "⠀⢐" "⠀⡐" "⠀⠠" "⠀⢀" "⠀⡀")
-				update_interval=0.08
-				;;
-			"${PKGCTL_TERM_SPINNER_LINE}")
-				spinner=("⎯" "\\" "|" "/")
-				update_interval=0.13
-				;;
-			"${PKGCTL_TERM_SPINNER_SIMPLE_DOTS_SCROLLING}")
-				spinner=(".  " ".. " "..." " .." "  ." "   ")
-				update_interval=0.2
-				;;
-			"${PKGCTL_TERM_SPINNER_TRIANGLE}")
-				spinner=("◢" "◣" "◤" "◥")
-				update_interval=0.05
-				;;
-		esac
-
-		# hide the cursor while spinning
-		term_cursor_hide
-
-		# run the spinner as long as the parent process didn't terminate
-		while ps -p "${parent_pid}" &>/dev/null; do
-			# cache the new status template if it exists
-			if mv "${status_file}" "${next_file}" &>/dev/null; then
-				status_message="$(cat "$next_file")"
-			elif [[ -z "${status_message}" ]]; then
-				# wait until we either have a new or cached status
-				sleep 0.05
-			fi
-
-			# fill the frame buffer with the current status
-			local prefix=''
-			while IFS= read -r line; do
-				# replace spinner placeholder
-				line=${line//%spinner%/${spinner[spinner_offset%${#spinner[@]}]}}
-
-				# append the current line to the frame buffer
-				frame_buffer+="${prefix}${line}"
-				prefix=$'\n'
-			done <<< "${status_message}"
-
-			# print current frame buffer
-			echo -n "${frame_buffer}" >&2
-			mv "${next_file}" "${drawn_file}" &>/dev/null ||:
-
-			# setup next frame buffer to clear current content
-			frame_buffer=$(term_erase_lines "$(awk 'END {print NR}' <<< "${status_message}")")
-
-			# advance the spinner animation offset
-			(( ++spinner_offset ))
-
-			# sleep for the spinner update interval
-			sleep "${update_interval}"
-		done
-	)&
-	_pkgctl_spinner_pid=$!
-	disown
-}
-
-term_spinner_stop() {
-	local status_dir=$1
-	local frame_buffer status_file
-
-	# kill the spinner process
-	if ! kill "${_pkgctl_spinner_pid}" > /dev/null 2>&1; then
-		return 1
-	fi
-	unset _pkgctl_spinner_pid
-
-	# acquire last drawn status
-	status_file="${status_dir}/drawn"
-	if [[ ! -f ${status_file} ]]; then
-		return 0
-	fi
-
-	# clear terminal based on last status line
-	frame_buffer=$(term_erase_lines "$(awk 'END {print NR}' < "${status_file}")")
-	echo -n "${frame_buffer}" >&2
-
-	# show the cursor after stopping the spinner
-	term_cursor_show
-}

src/lib/util/util.sh

@@ -0,0 +1,19 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${DEVTOOLS_INCLUDE_UTIL_UTIL_SH:-} ]] || return 0
+DEVTOOLS_INCLUDE_UTIL_UTIL_SH=1
+
+_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
+
+
+is_tty() {
+	if [ ! -t 1 ] || [ -p /dev/stdout ]; then
+		return 1
+	fi
+	if [[ $TERM == dumb ]]; then
+		return 1
+	fi
+	return 0
+}

src/lib/valid-build-install.sh

@@ -1,11 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-:
-
-# shellcheck disable=2034
-DEVTOOLS_VALID_BUILD_INSTALL=(
-	none
-	auto
-	all
-)

src/lib/valid-inspect.sh

@@ -1,10 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# shellcheck disable=2034
-DEVTOOLS_VALID_INSPECT_MODES=(
-	never
-	always
-	failure
-)

src/lib/valid-repos.sh

@@ -4,7 +4,7 @@
 :
 
 # shellcheck disable=2034
-DEVTOOLS_VALID_REPOS=(
+_repos=(
 	core core-staging core-testing
 	extra extra-staging extra-testing
 	multilib multilib-staging multilib-testing
@@ -13,9 +13,8 @@ DEVTOOLS_VALID_REPOS=(
 )
 
 # shellcheck disable=2034
-DEVTOOLS_VALID_BUILDREPOS=(
+_build_repos=(
-	core-staging core-testing
+	extra staging testing
-	extra extra-staging extra-testing
 	multilib multilib-staging multilib-testing
 	gnome-unstable
 	kde-unstable