commitpkg: handle option parsind and help before abort checks

Previously it was not possible to call for the help of find early
command line option problems when invoking in any location on the shell
as the command aborted without PKGBUILD being present.

Fix this by moving everything related to options at the very top.

.gitignore

@@ -1,3 +1,3 @@
 *~
 devtools-*.tar.gz*
-/build/
+build/

.gitlab-ci.yml

@@ -8,37 +8,14 @@ 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
 
-lint:
+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
-
-test:
-  stage: test
-  needs: []
-  script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats
-    - make test BATS_EXTRA_ARGS='--formatter junit'
-  artifacts:
-    reports:
-      junit: build/coverage/bats-report.xml
-
-coverage:
-  stage: test
-  needs: []
-  script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats kcov jq
-    - make coverage
-  coverage: '/Percent covered\s+\d+\.\d+/'
-  artifacts:
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: build/coverage/bats.*/cobertura.xml

Makefile

@@ -1,31 +1,23 @@
-SHELL=/bin/bash -o pipefail
-
-V=1.2.0
+V=20220621
 BUILDTOOLVER ?= $(V)
 
 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
-DATADIR = $(PREFIX)/share/devtools
 BUILDDIR = build
 
-rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
-
-BINPROGS_SRC = $(wildcard src/*.in)
-BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC))))
-LIBRARY_SRC = $(call rwildcard,src/lib,*.sh)
-LIBRARY = $(addprefix $(BUILDDIR)/,$(patsubst src/%,%,$(patsubst %.in,%,$(LIBRARY_SRC))))
+BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(wildcard src/*.in))))
 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)))
 
 COMMITPKG_LINKS = \
-	core-testingpkg \
-	core-stagingpkg \
 	extrapkg \
-	extra-testingpkg \
-	extra-stagingpkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
 	multilibpkg \
 	multilib-testingpkg \
 	multilib-stagingpkg \
@@ -33,35 +25,30 @@ 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 \
-	extra-testing-x86_64_v3-build \
-	extra-staging-x86_64-build \
-	extra-staging-x86_64_v3-build \
+	testing-x86_64-build \
+	testing-x86_64_v3-build \
+	staging-x86_64-build \
+	staging-x86_64_v3-build \
 	multilib-build \
 	multilib-testing-build \
 	multilib-staging-build \
 	kde-unstable-x86_64-build \
 	gnome-unstable-x86_64-build
 
+CROSSREPOMOVE_LINKS = \
+	extra2community \
+	community2extra
+
 COMPLETIONS = $(addprefix $(BUILDDIR)/,$(patsubst %.in,%,$(wildcard contrib/completion/*/*)))
+BASHCOMPLETION_LINKS = \
+	archco \
+	communityco
 
 
-CASES ?= test/case
-JOBS ?= $(shell nproc)
-BATS_EXTRA_ARGS ?=
-BATS_ARGS ?= --jobs $(JOBS) $(BATS_EXTRA_ARGS) --verbose-run
-COVERAGE_DIR ?= $(BUILDDIR)/coverage
-
-
-all: binprogs library conf completion man
+all: binprogs completion man
 binprogs: $(BINPROGS)
-library: $(LIBRARY)
 completion: $(COMPLETIONS)
 man: $(MANS)
 
@@ -80,112 +67,80 @@ ifneq ($(wildcard setarch-aliases.d/*),)
 endif
 
 
-edit = sed \
-	-e "s|@pkgdatadir[@]|$(DATADIR)|g" \
-	-e "s|@buildtoolver[@]|$(BUILDTOOLVER)|g"
+edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
 GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
 
 define buildInScript
-$(1)/%: $(2)%$(3)
+$(1)/%: $(2)%.in
 	$$(GEN_MSG)
 	@mkdir -p $$(dir $$@)
 	@$(RM) "$$@"
-	@cat $$< | $(edit) >$$@
-	@chmod $(4) "$$@"
+	@{ echo -n 'm4_changequote([[[,]]])'; cat $$<; } | m4 -P --define=m4_devtools_version=$$(BUILDTOOLVER) | $(edit) >$$@
+	@chmod $(3) "$$@"
 	@bash -O extglob -n "$$@"
 endef
 
-$(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)))
+$(eval $(call buildInScript,build/bin,src/,555))
+$(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,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) $<
-
-conf:
-	@install -d $(BUILDDIR)/makepkg.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
+	@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(PREFIX)/share/devtools $<
 
 clean:
 	rm -rf $(BUILDDIR)
 
 install: all
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -dm0755 $(DESTDIR)$(DATADIR)/setarch-aliases.d
-	install -dm0755 $(DESTDIR)$(DATADIR)/makepkg.conf.d
-	install -dm0755 $(DESTDIR)$(DATADIR)/pacman.conf.d
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d
 	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
+	for conf in ${MAKEPKG_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
+	for conf in ${PACMAN_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
+	for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d; done
 	for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
+	for l in ${CROSSREPOMOVE_LINKS}; do ln -sf crossrepomove $(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
+	for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
 	install -Dm0644 $(BUILDDIR)/contrib/completion/zsh/_devtools $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
+	ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
 	for manfile in $(MANS); do \
 		install -Dm644 $$manfile -t $(DESTDIR)$(MANDIR)/man$${manfile##*.}; \
 	done;
 
 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 conf in ${MAKEPKG_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
+	for conf in ${PACMAN_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
+	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(PREFIX)/share/devtools/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
+	for l in ${CROSSREPOMOVE_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
+	for l in ${BASHCOMPLETION_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
+	rm $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
+	rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
+	rm -f $(DESTDIR)$(PREFIX)/bin/communityco
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	for manfile in $(notdir $(MANS)); do rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile}; done;
-	rmdir --ignore-fail-on-non-empty \
-		$(DESTDIR)$(DATADIR)/setarch-aliases.d \
-		$(DESTDIR)$(DATADIR)/makepkg.conf.d \
-		$(DESTDIR)$(DATADIR)/pacman.conf.d \
-		$(DESTDIR)$(DATADIR)
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d $(DESTDIR)$(PREFIX)/share/devtools
 
+TODAY=$(shell date +"%Y%m%d")
 tag:
-	git cliff --strip=all --unreleased
-	@echo "current version: v$(V)"
-	@read -r -p "tag version: v" VERSION && \
-	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)
+	@sed -E "s|^V=[0-9]{8}|V=$(TODAY)|" -i Makefile
+	@git commit --gpg-sign --message "Version $(TODAY)" Makefile
+	@git tag --sign --message "Version $(TODAY)" $(TODAY)
 
 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
 
-test: binprogs library conf completion man
-	@mkdir -p $(COVERAGE_DIR)
-	bats $(BATS_ARGS) $(CASES) | tee $(COVERAGE_DIR)/bats-report.xml
+upload:
+	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/
 
-coverage: binprogs library conf completion man
-	kcov --include-path=src $(COVERAGE_DIR) bats $(BATS_ARGS) $(CASES)
-	jq -r '. | ["Percent covered", .percent_covered], ["Covered lines", .covered_lines], ["Total lines", .total_lines], ["Percent low", .percent_low], ["Percent high", .percent_high] | @tsv' \
-		$(COVERAGE_DIR)/bats.*/coverage.json
-
-check: $(BINPROGS_SRC) $(LIBRARY_SRC) contrib/completion/bash/devtools.in config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
+check: $(BINPROGS) $(BUILDDIR)/contrib/completion/bash/devtools config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
 	shellcheck $^
 
-.PHONY: all binprogs library completion conf man clean install uninstall tag dist upload test coverage check
+.PHONY: all completion man clean install uninstall dist upload check tag
 .DELETE_ON_ERROR:

README.md

@@ -14,43 +14,6 @@ files like `makepkg.conf`.
 BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" make all
 ```
 
-## Development
-
-For local development testing, there is a convenience wrapper for `pkgctl` that
-will automatically build the project and proxy all calls to the local build directory:
-
-```sh
-./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
@@ -60,46 +23,6 @@ Component: pkgctl db remove
 5. Upload the source tarball with ```make dist upload```
 6. Update the package
 
-## Dependencies
-
-### Runtime Dependencies
-
-- arch-install-scripts
-- awk
-- bash
-- binutils
-- coreutils
-- curl
-- diffutils
-- expac
-- fakeroot
-- findutils
-- grep
-- jq
-- ncurses
-- openssh
-- parallel
-- rsync
-- sed
-- systemd
-- util-linux
-- bzr
-- git
-- mercurial
-- subversion
-
-### Optional Dependencies
-
-- bat (pretty printing)
-- nvchecker (version checking)
-
-### Development Dependencies
-
-- asciidoctor
-- make
-- shellcheck
-- bats
-
 ## License
 
 Devtools is licensed under the terms of the **GPL-3.0-or-later** (see [LICENSE](LICENSE)).

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,20 +41,18 @@ 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 \
-        -fstack-clash-protection -fcf-protection \
-        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
-         -Wl,-z,pack-relative-relocs"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS="-Cforce-frame-pointers=yes"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-DEBUG_RUSTFLAGS="-C debuginfo=2"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -96,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(sha256)

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,20 +41,18 @@ 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 \
-        -fstack-clash-protection -fcf-protection \
-        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
-         -Wl,-z,pack-relative-relocs"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS="-Cforce-frame-pointers=yes"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-DEBUG_RUSTFLAGS="-C debuginfo=2"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -96,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(sha256)

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

config/pacman/universe.conf

@@ -1,112 +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.
-
-[gnome-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[kde-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[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
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-[multilib-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[multilib-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[multilib]
-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/unstable.conf

@@ -1,83 +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.
-
-[gnome-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[kde-unstable]
-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

contrib/completion/bash/devtools.in

@@ -2,564 +2,89 @@
 #
 # 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
+_devtools_compgen() {
+  local i r
+  COMPREPLY=($(compgen -W '$*' -- "$cur"))
+  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
+    for r in "${!COMPREPLY[@]}"; do
+      if [[ ${COMP_WORDS[i]} = "${COMPREPLY[r]}" ]]; then
+        unset 'COMPREPLY[r]'; break
+      fi
+    done
+  done
+}
 
-_colors=(never always auto)
+_archco_pkg() {
+  _devtools_compgen "$(
+      command pacman "-$1"
+  )"
+}
 
+_archco() {
+  local cur prev 
+  COMPREPLY=()
+  cur=$(_get_cword)
+  prev=${COMP_WORDS[COMP_CWORD-1]}
 
-_makechrootpkg_args=(
-	-h
-	-c
-	-d
-	-D
-	-u
-	-r
-	-I
-	-l
-	-n
-	-T
-	-U
-	-x
-)
-_makechrootpkg_args_d_opts() { _filedir -d; }
-_makechrootpkg_args_D_opts() { _filedir -d; }
-_makechrootpkg_args_r_opts() { _filedir -d; }
-_makechrootpkg_args_I_opts() { _filedir '*.pkg.tar.*'; }
-_makechrootpkg_args_l_opts() { _filedir -d; }
-_makechrootpkg_args_U_opts() { :; }
-_makechrootpkg_args_x_opts() { _devtools_completions_inspect; }
-_makechrootpkg() { __devtools_complete _makechrootpkg; }
+  _archco_pkg Slq
+  true
+} &&
+complete -F _archco archco communityco
+
+_makechrootpkg() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-I -c -h -l -r -u' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
 complete -F _makechrootpkg makechrootpkg
 
+_mkarchroot() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
 
-_makerepropkg_args=(
-	-h
-	-d
-	-n
-	-c
-	-M
-)
-_makerepropkg_args_c_opts() { _filedir -d; }
-_makerepropkg_args_M_opts() { _filedir '*.conf'; }
-_makerepropkg_opts() { _filedir '*.pkg.tar.*'; }
-_makerepropkg() { __devtools_complete _makerepropkg; }
-complete -F _makerepropkg makerepropkg
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-C -M -c -h' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
 
-
-_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; }
+  true
+} &&
 complete -F _mkarchroot mkarchroot
 
-
-_arch_nspawn_args=(
-	-C
-	-M
-	-c
-	-f
-	-s
-	-h
-)
-_arch_nspawn_args_C_opts() { _filedir '*.conf'; }
-_arch_nspawn_args_M_opts() { _filedir '*.conf'; }
-_arch_nspawn_args_c_opts() { _filedir -d; }
-_arch_nspawn_args_f_opts() { _filedir; }
-_arch_nspawn_opts() {
-	local args
-	args=$(__pkgctl_word_count_after_subcommand)
-	if (( args == 0 )); then
-		_filedir -d
-	fi
-}
-_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_binary_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_binary_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=(
-	--partial
-	--noconfirm
-	-a --arch
-	-h --help
-)
-_pkgctl_db_remove_args__arch_opts() { _devtools_completions_binary_arch; }
-_pkgctl_db_remove_args_a_opts() { _pkgctl_db_remove_args__arch_opts; }
-_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=(
-	clean
-	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_clean_args=(
-	-i --interactive
-	-n --dry-run
-	-h --help
-)
-_pkgctl_repo_clean_opts() { _filedir -d; }
-
-_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
-	setup
-	upgrade
-)
-
-_pkgctl_version_check_args=(
-	-v --verbose
-	-h --help
-)
-
-_pkgctl_version_check_opts() { _filedir -d; }
-
-_pkgctl_version_setup_args=(
-	--prefer-platform-api
-	--url
-	--no-check
-	-f --force
-	-h --help
-)
-
-_pkgctl_version_setup_opts() { _filedir -d; }
-_pkgctl_version_setup_args__url_opts() { :; }
-
-_pkgctl_version_upgrade_args=(
-	--no-update-checksums
-	-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_binary_arch() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BINARY_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
+_arch-nspawn() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-C -M -c -h' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
+complete -F _arch-nspawn arch-nspawn
+# ex:et ts=2 sw=2 ft=sh

contrib/completion/zsh/_devtools.in

@@ -1,20 +1,11 @@
-#compdef archbuild arch-nspawn archrelease commitpkg pkgctl diffpkg finddeps makechrootpkg mkarchroot extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild checkpkg sogrep offload-build makerepropkg
+#compdef archbuild archco arch-nspawn archrelease commitpkg diffpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg
 #
 # 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
+m4_include(lib/valid-tags.sh)
+m4_include(lib/valid-repos.sh)
 
-_colors=(never always auto)
+_binary_arch=${_arch[*]:0:-1}
 
 _archbuild_args=(
 	'-c[Recreate the chroot before building]'
@@ -23,162 +14,15 @@ _archbuild_args=(
 	'--[Introduce makechrootpkg options]:*::makechrootpkg options:=  _dispatch makechrootpkg makechrootpkg'
 )
 
-_pkgctl_auth_cmds=(
-	"pkgctl auth command"
-	"login[Authenticate with the GitLab instance]"
-	"status[View authentication status]"
-)
-
-_pkgctl_auth_login_args=(
-	'(-g --gen-access-token)'{-g,--gen-access-token}'[Open the URL to generate a new personal access token]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_auth_status_args=(
-	'(-t --show-token)'{-t,--show-token}'[Display the auth token]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_build_args=(
-	"--arch[Specify architectures to build for (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
-	"--repo[Specify a target repository (disables auto-detection)]:repo:($DEVTOOLS_VALID_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-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:"
-	'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database as last action]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_db_cmds=(
-	"pkgctl db command"
-	"move[Move packages between pacman repositories]"
-	"remove[Remove packages from pacman repositories]"
-	"update[Update the pacman database as final release step]"
-)
-
-_pkgctl_db_move_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:src-repo:($DEVTOOLS_VALID_REPOS[*])"
-	"2:target-repo:($DEVTOOLS_VALID_REPOS[*])"
-	'*:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_db_remove_args=(
-	'--partial[Remove only partial pkgnames from a split package]'
-	'--noconfirm[Bypass any confirmation messages, should only be used with caution]'
-	'(-a --arch)'{-a,--arch}"[Override the architecture (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:repo:($DEVTOOLS_VALID_REPOS[*])"
-	'*:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_db_update_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_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[*])"
-	'(-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]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*: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"
-	"clean[Remove untracked files from the working tree]"
-	"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_clean_args=(
-	'(-i --interactive)'{-i,--interactive}'[Show what would be done and clean files interactively]'
-	'(-n --dry-run)'{-n,--dry-run}"[Don't remove anything, just show what would be done]"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*: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]'
+_archco_args=(
 	'*: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 -/'
-)
-
-_pkgctl_repo_create_args=(
-	'(-c --clone)'{-c,--clone}'[Clone the Git repository after creation]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:pkgbase'
-)
-
-_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 -/'
-	'*-f[Copy file from the host to the chroot]:copy_file:_files'
+	'-c[Set pacman cache]:pacman_cache:_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 -/'
@@ -186,14 +30,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'
 )
 
@@ -203,11 +47,6 @@ _diffpkg_args=(
 	'(-p --pkginfo)'{-p,--pkginfo}'[.PKGINFO diff mode]'
 	'(-b --buildinfo)'{-b,--buildinfo}'[.BUILDINFO diff mode]'
 	'(-m --makepkg-config)'{-m,--makepkg-config}'[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
-	'(-u -U --unified)'{-u,-U,--unified}'[Output 3 lines of unified context]'
-	'(-y --side-by-side)'{-y,--side-by-side}'[Output in two columns]'
-	'--color=[Color output]:when:($_colors[*])'
-	'(-W --width=)'{-W,--width=}'[Output at most NUM print columns]:num:(auto columns)'
-	'(-P --pool=)'{-P,--pool=}'[pool directory]:dir:_files -/'
 	'(-v --verbose)'{-v,--verbose}'[Provide more detailed/unfiltered output]'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:packages:_devtools_completions_all_packages'
@@ -220,16 +59,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-only]:bind_dir_ro:_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 -/'
 	'-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=(
@@ -242,6 +80,11 @@ _mkarchroot_args=(
 	'*:packages:_devtools_completions_all_packages'
 )
 
+_rebuildpkgs_args=(
+	'1:chroot_dir:_files -/'
+	'*:packages:_devtools_completions_all_packages'
+)
+
 _checkpkg_args=(
 	'(-r --rmdir)'{-r,--rmdir}'[Remove the temporary directory]'
 	'(-w --warn)'{-w,--warn}'[Print a warning in case of differences]'
@@ -253,20 +96,19 @@ _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[*])'
-	'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${DEVTOOLS_VALID_BINARY_ARCHES[*]})'
+	'(-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]'
 )
 
 _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]'
@@ -279,89 +121,9 @@ _devtools_completions_all_packages() {
 	compadd - "${(@)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]"
-	"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]"
-	"setup[Automatically detect and setup a basic nvchecker config]"
-	"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_setup_args=(
-	'(-f --force)'{-f,--force}'[Do not prompt before overwriting]'
-	'--prefer-platform-api[Prefer platform specific GitHub/GitLab API for complex cases]'
-	'--url[Derive check target from URL instead of source array]:url:'
-	'--no-check[Do not run version check after setup]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_version_upgrade_args=(
-	'--no-update-checksums[Disable computation and update of the checksums]'
-	'(-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[@]}")
-
-_handle_subcommands() {
-	local service_name=${1}
-	if typeset -p ${service_name}_cmds &> /dev/null; then
-		_arguments -C \
-			"1: :->cmds" \
-			'*::arg:->args'
-		case $state in
-			cmds)
-				if [[ "${line[-1]}" == -* ]] && typeset -p ${service_name}_args &> /dev/null; then
-					local argname="${service_name}_args[@]"
-					_arguments -s "${(P)argname}"
-				else
-					local service_cmds=${service_name}_cmds[@]
-					_values "${(P)service_cmds}"
-				fi
-				;;
-			args)
-				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}"
-				elif typeset -p ${service_sub}_cmds &> /dev/null; then
-					_handle_subcommands "${service_sub}"
-				fi
-				;;
-		esac
-	elif typeset -p ${service_name}_args &> /dev/null; then
-		local argname="${service_name}_args[@]"
-		_arguments -s "${(P)argname}"
-	fi
-}
-
 _devtools() {
-	_handle_subcommands _${service//-/_}
+	local argname="_${service//-/_}_args[@]"
+	_arguments -s "${(P)argname}"
 }
 
 _devtools

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

@@ -23,9 +23,8 @@ Description
 * staging-x86_64-build
 * testing-x86_64-build
 
-The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'reponame-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/pacman.conf.d. The makepkg configuration is loaded from 'repo-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/makepkg.conf.d.
+The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'pacman-reponame-arch.conf' with a fallback to 'pacman-reponame.conf' from {pkgdatadir}. The makepkg configuration is loaded from 'makepkg-repo-arch.conf' with a fallback to 'makepkg-reponame.conf' from {pkgdatadir}.
 
-It will also load the bind mount configuration from 'mount.d/arch' in {pkgdatadir}. The file format is that each line starting with ro and rw will be used, other lines will be ignored, and the rest of the used line is out/path:in/path preceded by a space as a separator. ro means it is a read-only mount, rw means a read-write mount.
 
 Options
 -------
@@ -43,6 +42,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

@@ -8,60 +8,48 @@ devtools - Developer tools for the Arch Linux distribution
 Description
 -----------
 
-Devtools contains tools for package maintenance in Arch Linux. It comes with a
-unified command-line frontend called 'pkgctl' that aids to conveniently
-interact with all the different tools this collection provides.
-
-The toolset varies from tools for building packages in a clean chroot
-('mkarchroot', 'archbuild', ...), packaging related tools ('sogrep', 'diffpkg',
-'lddd') and tools for repository management such as ('pkgrepo').
+Devtools contains tools for package maintenance in Arch Linux. The toolset
+varies from tools for building packages in a clean chroot ('mkarchroot',...),
+packaging related tools for sonames ('sogrep', 'lddd') and tools for
+repository management such as ('archco', 'extra2community')
 
 Programs
 --------
 The list below gives a short overview; see the respective documentation
 for details.
 
-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)
-	Compare package files using different modes
-
-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
 ----
@@ -21,7 +21,7 @@ When given one package, use it to diff against the locally built one.
 When given two packages, diff both packages against each other.
 
 In either case, a package name will be converted to a filename from the
-cache or pool, and diffpkg will proceed as though this filename was initially
+cache, and diffpkg will proceed as though this filename was initially
 specified.
 
 Options
@@ -30,31 +30,12 @@ Options
 *-M, --makepkg-config*::
 	Set an alternate makepkg configuration file
 
-*-P, --pool*='DIR'::
-	Search diff target in pool dir (default `'/srv/ftp/pool'`)
-
 *-v, --verbose*::
 	Provide more detailed/unfiltered output
 
 *-h, --help*::
 	Show a help text
 
-Output Options
---------------
-
-*--color*[='WHEN']::
-	Color output; 'WHEN' is `'never'`, `'always'`, or `'auto'`; Plain *--color* means *--color='auto'*
-
-*-u, -U, --unified*::
-	Output 3 lines of unified context
-
-*-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.
-	`'auto'` will be resolved to the maximum line length of both files, guaranteeing the diff to be uncut.
-
 Modes
 -----
 
@@ -70,4 +51,7 @@ Modes
 *-b, --buildinfo*::
 	Activate .BUILDINFO diff mode
 
+See Also
+--------
+
 include::include/footer.asciidoc[]

doc/man/include/footer.asciidoc

@@ -1,7 +1,27 @@
 
-Homepage
---------
+Bugs
+----
+Bugs can be reported on the project's GitLab bug tracker 'https://gitlab.archlinux.org/archlinux/devtools'
 
-'https://gitlab.archlinux.org/archlinux/devtools'
 
-Please report bugs and feature requests in the issue tracker. Please do your best to provide a reproducible test case for bugs.
+Authors
+-------
+
+Maintainers:
+
+* Aaron Griffin <aaronmgriffin@gmail.com>
+* Allan McRae <allan@archlinux.org>
+* Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+* Dan McGee <dan@archlinux.org>
+* Dave Reisner <dreisner@archlinux.org>
+* Evangelos Foutras <evangelos@foutrelis.com>
+* Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+* Jelle van der Waa <jelle@archlinux.org>
+* Levente Polyak <anthraxx@archlinux.org>
+* Pierre Schmitz <pierre@archlinux.de>
+* Sébastien Luttringer <seblu@seblu.net>
+* Sven-Hendrik Haase <svenstaro@gmail.com>
+* Thomas Bächler <thomas@archlinux.org>
+
+For additional contributors, use `git shortlog -s` on the devtools.git
+repository.

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

@@ -1,113 +0,0 @@
-pkgctl-build(1)
-===============
-
-Name
-----
-pkgctl-build - Build packages inside a clean chroot
-
-Synopsis
---------
-pkgctl build [OPTIONS] [PATH...]
-
-Description
------------
-
-TODO
-
-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.
-	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
-
-*-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 after building. Useful to ease the debugging of a package build. +
-	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
-----------------
-
-*--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 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
-
-Release Options
----------------
-
-*-r, --release*::
-	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
-
-*-u, --db-update*::
-	Automatically update the pacman database as last action
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-release(1)
-pkgctl-db-update(1)
-
-include::include/footer.asciidoc[]

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

@@ -1,23 +0,0 @@
-pkgctl-db-move(1)
-=================
-
-Name
-----
-pkgctl-db-move - Move packages between binary repositories.
-
-Synopsis
---------
-pkgctl db move [OPTIONS] [SOURCE_REPO] [TARGET_REPO] [PKGBASE]...
-
-Description
------------
-
-Move packages between binary repositories i.e. from 'extra-testing' to 'extra'.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

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

@@ -1,40 +0,0 @@
-pkgctl-db-remove(1)
-===================
-
-Name
-----
-pkgctl-db-remove - Remove packages from binary repositories
-
-Synopsis
---------
-pkgctl db remove [OPTIONS] [REPO] [PKGBASE]...
-
-Description
------------
-
-Remove packages from pacman repositories. By default passing a pkgbase removes
-all split packages, debug packages as well as entries from the state repo for
-all existing architectures.
-
-Beware when using the `--partial` option, as it may most likely lead to
-undesired effects by leaving debug packages behind as well as dangling entries
-in the state repository.
-
-Options
--------
-
-*--partial*::
-	Remove only partial pkgnames from a split package. This leaves debug
-	packages behind and pkgbase entries in the state repo.
-
-*-a, --arch* 'ARCH'::
-	Remove only one specific architecture (disables auto-detection).
-	By default all architectures are removed when this option is not used.
-
-*--noconfirm*::
-	Bypass any confirmation messages, should only be used with caution.
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

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

@@ -1,24 +0,0 @@
-pkgctl-db-update(1)
-===================
-
-Name
-----
-pkgctl-db-update - Update the binary repository as final release step
-
-Synopsis
---------
-pkgctl db update [OPTIONS]
-
-Description
------------
-
-Update the pacman database as final release step for packages that
-have been transfered and staged on 'repos.archlinux.org'.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-diff.1.asciidoc

@@ -1,73 +0,0 @@
-pkgctl-diff(1)
-==============
-
-Name
-----
-pkgctl-diff - Compare package files using different modes.
-
-Synopsis
---------
-pkgctl diff [OPTIONS] [MODES] [FILE|PKGNAME...]
-
-Description
------------
-
-Searches for a locally built package corresponding to the PKGBUILD, and
-downloads the last version of that package from the Pacman repositories.
-It then compares the package archives using different modes while using
-simple tar content list by default.
-
-When given one package, use it to diff against the locally built one.
-When given two packages, diff both packages against each other.
-
-In either case, a package name will be converted to a filename from the cache
-or pool, and 'pkgctl diff' will proceed as though this filename was initially
-specified.
-
-Options
--------
-
-*-M, --makepkg-config*::
-	Set an alternate makepkg configuration file
-
-*-P, --pool*='DIR'::
-	Search diff target in pool dir (default `'/srv/ftp/pool'`)
-
-*-v, --verbose*::
-	Provide more detailed/unfiltered output
-
-*-h, --help*::
-	Show a help text
-
-Output Options
---------------
-
-*--color*[='WHEN']::
-	Color output; 'WHEN' is `'never'`, `'always'`, or `'auto'`; Plain *--color* means *--color='auto'*
-
-*-u, -U, --unified*::
-	Output 3 lines of unified context
-
-*-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.
-	`'auto'` will be resolved to the maximum line length of both files, guaranteeing the diff to be uncut.
-
-Modes
------
-
-*-l, --list*::
-	Activate tar content list diff mode (default)
-
-*-d, --diffoscope*::
-	Activate diffoscope diff mode
-
-*-p, --pkginfo*::
-	Activate .PKGINFO diff mode
-
-*-b, --buildinfo*::
-	Activate .BUILDINFO diff mode
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-release.1.asciidoc

@@ -1,51 +0,0 @@
-pkgctl-release(1)
-=================
-
-Name
-----
-pkgctl-release - Release step to commit, tag and upload build artifacts
-
-Synopsis
---------
-pkgctl release [OPTIONS] [PATH...]
-
-Description
------------
-
-Modified version controlled files will first be staged for commit,
-afterwards a Git tag matching the pkgver will be created and finally
-all build artifacts will be uploaded.
-
-By default the target pacman repository will be auto-detected by querying
-the repo it is currently released in. When initially adding a new package
-to the repositories, the target repo must be specified manually.
-
-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.
-	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
-
-*-t, --testing*::
-	Build against the testing counterpart of the auto-detected repo
-
-*-u, --db-update*::
-	Automatically update the pacman database after uploading
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-db-update(1)
-
-include::include/footer.asciidoc[]

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

@@ -1,40 +0,0 @@
-pkgctl-repo-clean(1)
-====================
-
-Name
-----
-
-pkgctl-repo-clean - Remove untracked files from the working tree
-
-Synopsis
---------
-
-pkgctl repo clean [OPTION] [PATH]...
-
-Description
------------
-
-Cleans the working tree by recursively removing files that are not under
-version control, starting from the current directory.
-
-Files unknown to Git as well as ignored files are removed. This can, for
-example, be useful to remove all build products.
-
-Options
--------
-
-*-i, --interactive*::
-	Show what would be done and clean files interactively
-
-*-n, --dry-run*::
-	Don't actually remove anything, just show what would be done
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-git-clean(1)
-
-include::include/footer.asciidoc[]

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

@@ -1,52 +0,0 @@
-pkgctl-repo-clone(1)
-====================
-
-Name
-----
-pkgctl-repo-clone - Clone a package repository
-
-Synopsis
---------
-pkgctl repo clone [OPTIONS] [PKGNAME...]
-
-Description
------------
-
-Clone Git packaging repositories from the canonical namespace.
-
-The configure command is subsequently invoked to synchronize the distro
-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
-
-*--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)
-pkgctl-repo-switch(1)
-
-include::include/footer.asciidoc[]

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

@@ -1,41 +0,0 @@
-pkgctl-repo-configure(1)
-========================
-
-Name
-----
-pkgctl-repo-configure - Configure a clone according to distro specs
-
-Synopsis
---------
-pkgctl repo configure [OPTIONS] [PATH...]
-
-Description
------------
-
-Configure Git packaging repositories according to distro specs and
-'makepkg.conf' settings.
-
-Git author information and the used signing key is set up from
-'makepkg.conf' read from any valid location like '/etc' or 'XDG_CONFIG_HOME'.
-
-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
-
-include::include/footer.asciidoc[]

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

@@ -1,40 +0,0 @@
-pkgctl-repo-create(1)
-=====================
-
-Name
-----
-pkgctl-repo-create - Create a new GitLab package repository
-
-Synopsis
---------
-pkgctl repo create [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Create a new Git packaging repository in the canonical GitLab namespace.
-
-This command requires a valid GitLab API authentication. To setup a new
-GitLab token or check the currently configured one please consult the
-'auth' subcommand for further instructions.
-
-If invoked without a parameter, try to create a packaging repository
-based on the 'PKGBUILD' from the current working directory.
-
-Options
--------
-
-*-c, --clone*::
-	Clone the Git repository after creation
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-auth(1)
-pkgctl-repo-clone(1)
-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

@@ -1,27 +0,0 @@
-pkgctl-repo-web(1)
-==================
-
-Name
-----
-pkgctl-repo-web - Open the packaging repository's website
-
-Synopsis
---------
-pkgctl repo web [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Open the packaging repository's website via xdg-open. If called with
-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
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo.1.asciidoc

@@ -1,63 +0,0 @@
-pkgctl-repo(1)
-==============
-
-Name
-----
-pkgctl-repo - Manage Git packaging repositories and their configuration
-
-Synopsis
---------
-pkgctl repo [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Manage Git packaging repositories and helps with their configuration
-according to distro specs.
-
-Git author information and the used signing key is set up from
-'makepkg.conf' read from any valid location like '/etc' or 'XDG_CONFIG_HOME'.
-The configure command can be used to synchronize the distro specs and
-makepkg.conf settings for previously cloned repositories.
-
-The unprivileged option can be used for cloning packaging repositories
-without SSH access using read-only HTTPS.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl repo clean::
-	Remove untracked files from the working tree
-
-pkgctl repo clone::
-	Clone a package repository
-
-pkgctl repo configure::
-	Configure a clone according to distro specs
-
-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-clean(1)
-pkgctl-repo-clone(1)
-pkgctl-repo-configure(1)
-pkgctl-repo-create(1)
-pkgctl-repo-switch(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-setup.1.asciidoc

@@ -1,120 +0,0 @@
-pkgctl-version-setup(1)
-=======================
-
-Name
-----
-pkgctl-version-setup - Automatically detect and setup a basic nvchecker config
-
-Synopsis
---------
-pkgctl version setup [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-This subcommand automates the creation of a basic nvchecker(1) configuration
-file by analyzing the source array specified in the PKGBUILD(1) file of a
-package. This command intelligently detects various platforms and APIs (e.g.,
-GitHub, GitLab, PyPI) used by the package sources and generates a corresponding
-`.nvchecker.toml` configuration based on its best guess.
-
-This is particularly useful for initializing nvchecker(1) settings for a
-package without manually crafting the `.nvchecker.toml` file. It simplifies the
-process of setting up version checks, especially when transitioning a package's
-monitoring from one source platform to another or starting version checks for a
-new package.
-
-If no `PKGBASE` is specified, the command defaults to using the current working
-directory.
-
-To obtain a list of supported sources and their expected URL formats, please
-consult the sources section.
-
-Options
--------
-
-*-f, --force*::
-	Overwrite existing nvchecker(1) configuration
-
-*--prefer-platform-api*::
-	Prefer platform specific GitHub/GitLab API over git for complex cases
-
-*--url* 'URL'::
-	Derive check target from the given URL instead of the source array entries
-
-
-*--no-check*::
-	Do not run pkgctl-version-check(1) after setup
-
-*-h, --help*::
-	Show a help text
-
-Sources
--------
-
-Here are the currently supported platforms and sources, along with examples of
-URL formats that enable their automatic detection as specific source types:
-
-*Git*::
-	* https://github.com/example/project
-	* https://gitlab.com/example/group/project
-	* git://git.foobar.org/example
-	* git+https://git.foobar.org/example
-
-*GitHub*::
-	* https://github.com/example/project
-	* https://github.com/example/project/archive/v1.0/project-v1.0.tar.gz
-
-*GitLab*::
-	* https://gitlab.com/example/group/project
-	* https://gitlab.archlinux.org/archlinux/devtools.git
-	* https://gitlab.archlinux.org/archlinux/devtools/-/releases/v1.1.0/downloads/devtools-v1.1.0.tar.gz
-
-*Hackage*::
-	* https://hackage.haskell.org/package/xmonad
-	* https://hackage.haskell.org/package/xmonad-0.18.0/xmonad-0.18.0.tar.gz
-	* https://hackage.haskell.org/packages/archive/xmonad/0.18.0/xmonad-0.18.0.tar.gz
-
-*NPM*::
-	* https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz
-	* https://www.npmjs.com/package/node-gyp
-
-*PyPI*::
-	* https://pypi.io/packages/source/p/pyflakes
-	* https://pypi.org/packages/source/b/bleach
-	* https://files.pythonhosted.org/packages/source/p/pyflakes
-	* https://pypi.org/project/SQLAlchemy/
-
-*RubyGems*::
-	* https://rubygems.org/downloads/diff-lcs-1.5.1.gem
-	* https://rubygems.org/gems/diff-lcs
-
-*CPAN*::
-	* https://search.cpan.org/CPAN/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
-	* https://cpan.metacpan.org/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
-
-*crates.io*::
-	* https://static.crates.io/crates/shotgun/shotgun-1.0.crate
-	* https://crates.io/api/v1/crates/shotgun/1.0/download
-	* https://crates.io/crates/git-smash
-
-Examples
---------
-
-*pkgctl version setup*::
-	Detects the source from the current directory's PKGBUILD(1) and
-	sets up a basic `.nvchecker.toml`.
-
-*pkgctl version setup --url https://github.com/example/project*::
-	Generates an `.nvchecker.toml` for the current PKGBUILD(1) but
-	overrides the source URL with the specified GitHub project.
-
-See Also
---------
-
-pkgctl-version(1)
-pkgctl-version-check(1)
-nvchecker(1)
-PKGBUILD(5)
-
-include::include/footer.asciidoc[]

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

@@ -1,53 +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 and updates checksums.
-
-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
--------
-
-*--no-update-checksums*::
-	Disable computation and update of the checksums
-
-*-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,67 +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.
-
-Use pkgctl-version-setup(1) to automatically detect and setup a basic nvchecker
-config based on the source array of the package PKGBUILD.
-
-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 setup::
-	Automatically detect and setup a basic nvchecker config
-
-pkgctl version upgrade::
-	Adjust the PKGBUILD to match the latest upstream version
-
-See Also
---------
-
-pkgctl-version-check(1)
-pkgctl-version-setup(1)
-pkgctl-version-upgrade(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl.1.asciidoc

@@ -1,69 +0,0 @@
-pkgctl(1)
-=========
-
-Name
-----
-pkgctl - Unified command-line frontend for devtools
-
-Synopsis
---------
-pkgctl [SUBCOMMAND] [OPTIONS]
-
-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
-
-pkgctl build::
-	Build packages inside a clean chroot
-
-pkgctl db::
-	Pacman database modification for package update, move etc
-
-pkgctl diff::
-	Compare package files using different modes
-
-pkgctl release::
-	Release step to commit, tag and upload build artifacts
-
-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)
-pkgctl-auth(1)
-pkgctl-build(1)
-pkgctl-db(1)
-pkgctl-diff(1)
-pkgctl-release(1)
-pkgctl-repo(1)
-pkgctl-search(1)
-pkgctl-version(1)
-
-include::include/footer.asciidoc[]

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

lib/common.sh

@@ -4,62 +4,29 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-[[ -z ${DEVTOOLS_INCLUDE_COMMON_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_COMMON_SH="$(set +o|grep nounset)"
+[[ -z ${_INCLUDE_COMMON_SH:-} ]] || return 0
+_INCLUDE_COMMON_SH="$(set +o|grep nounset)"
 
 set +u +o posix
 # shellcheck disable=1091
 . /usr/share/makepkg/util.sh
-$DEVTOOLS_INCLUDE_COMMON_SH
+$_INCLUDE_COMMON_SH
 
 # Avoid any encoding problems
-export LANG=C.UTF-8
+export LANG=C
 
 # Set buildtool properties
 export BUILDTOOL=devtools
-export BUILDTOOLVER=@buildtoolver@
+export BUILDTOOLVER=m4_devtools_version
 
-# 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_PACKAGING_NAMESPACE=archlinux/packaging/packages
-export GIT_PACKAGING_NAMESPACE_ID=11323
-export GIT_PACKAGING_URL_SSH="git@${GITLAB_HOST}:${GIT_PACKAGING_NAMESPACE}"
-export GIT_PACKAGING_URL_HTTPS="https://${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
-export PACKAGING_REPO_RELEASE_HOST=repos.archlinux.org
-export PKGBASE_MAINTAINER_URL=https://archlinux.org/packages/pkgbase-maintainer
-export AUR_URL_SSH=aur@aur.archlinux.org
-
-export RSYNC_OPTS=(
-  --rsh=ssh
-  --checksum
-  --copy-links
-  --human-readable
-  --progress
-  --partial
-  --partial-dir=.partial
-  --delay-updates
-)
-
-# ensure TERM is set with a fallback to dumb
-export TERM=${TERM:-dumb}
+shopt -s extglob
 
 # 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() {
@@ -68,54 +35,11 @@ stat_busy() {
 	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
-stat_progress() {
-	# shellcheck disable=2059
-	printf "${BOLD}.${ALL_OFF}" >&2
-}
-
 stat_done() {
 	# shellcheck disable=2059
 	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
-	padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
-	msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
-	printf "%s %s\n" "${padding}${GREEN}✓${ALL_OFF}" "${msg}" >&2
-}
-
-msg_error() {
-	local msg=$1
-	local padding
-	padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
-	msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
-	printf "%s %s\n" "${padding}${RED}x${ALL_OFF}" "${msg}" >&2
-}
-
-msg_warn() {
-	local msg=$1
-	local padding
-	padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
-	msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
-	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")
@@ -128,9 +52,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}"
 }
 
@@ -162,7 +83,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
@@ -218,20 +139,15 @@ pkgver_equal() {
 #    $pkgver can be supplied with or without a pkgrel appended.
 #    If not supplied, any pkgrel will be matched.
 ##
-shopt -s extglob
 find_cached_package() {
 	local searchdirs=("$PWD" "$PKGDEST") results=()
 	local targetname=$1 targetver=$2 targetarch=$3
-	local dir pkg packages pkgbasename name ver rel arch r results
+	local dir pkg pkgbasename name ver rel arch r results
 
 	for dir in "${searchdirs[@]}"; do
 		[[ -d $dir ]] || continue
 
-		shopt -s extglob nullglob
-		mapfile -t packages < <(printf "%s\n" "$dir"/"${targetname}"-"${targetver}"-*"${targetarch}".pkg.tar?(.!(sig|*.*)))
-		shopt -u extglob nullglob
-
-		for pkg in "${packages[@]}"; do
+		for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
 			[[ -f $pkg ]] || continue
 
 			# avoid adding duplicates of the same inode
@@ -273,7 +189,7 @@ find_cached_package() {
 			return 1
 	esac
 }
-shopt -u extglob
+
 
 check_package_validity(){
 	local pkgfile=$1
@@ -336,16 +252,6 @@ getpkgdesc() {
 }
 
 
-get_tag_from_pkgver() {
-	local pkgver=$1
-	local tag=${pkgver}
-
-	tag=${tag/:/-}
-	tag=${tag//~/.}
-	echo "${tag}"
-}
-
-
 is_debug_package() {
 	local pkgfile=${1} pkgbase pkgname pkgdesc
 	pkgbase="$(getpkgbase "${pkgfile}")"
@@ -353,17 +259,3 @@ is_debug_package() {
 	pkgdesc="$(getpkgdesc "${pkgfile}")"
 	[[ ${pkgdesc} == "Detached debugging symbols for "* && ${pkgbase}-debug = "${pkgname}" ]]
 }
-
-# Proxy function to check if a file exists. Using [[ -f ... ]] directly is not
-# always wanted because we might want to expand bash globs first. This way we
-# can pass unquoted globs to is_globfile() and have them expanded as function
-# arguments before being checked.
-is_globfile() {
-	[[ -f $1 ]]
-}
-
-join_by() {
-	local IFS="$1"
-	shift
-	echo "$*"
-}

lib/valid-repos.sh

@@ -0,0 +1,32 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+:
+
+# shellcheck disable=2034
+_repos=(
+	staging
+	testing
+	core
+	extra
+	community-staging
+	community-testing
+	community
+	multilib-staging
+	multilib-testing
+	multilib
+	gnome-unstable
+	kde-unstable
+)
+
+# shellcheck disable=2034
+_build_repos=(
+	staging
+	testing
+	extra
+	multilib-staging
+	multilib-testing
+	multilib
+	gnome-unstable
+	kde-unstable
+)

lib/valid-tags.sh

@@ -4,27 +4,23 @@
 :
 
 # shellcheck disable=2034
-DEVTOOLS_VALID_BINARY_ARCHES=(
+_arch=(
 	x86_64
-)
-
-# shellcheck disable=2034
-DEVTOOLS_VALID_ARCHES=(
-	"${DEVTOOLS_VALID_BINARY_ARCHES[@]}"
 	any
 )
 
 # shellcheck disable=2034
-DEVTOOLS_VALID_TAGS=(
+_tags=(
 	core-x86_64 core-any
-	core-staging-x86_64 core-staging-any
-	core-testing-x86_64 core-testing-any
 	extra-x86_64 extra-any
-	extra-staging-x86_64 extra-staging-any
-	extra-testing-x86_64 extra-testing-any
 	multilib-x86_64
+	staging-x86_64 staging-any
+	testing-x86_64 testing-any
 	multilib-testing-x86_64
 	multilib-staging-x86_64
+	community-x86_64 community-any
+	community-staging-x86_64 community-staging-any
+	community-testing-x86_64 community-testing-any
 	kde-unstable-x86_64 kde-unstable-any
 	gnome-unstable-x86_64 gnome-unstable-any
 )

src/arch-nspawn.in

@@ -2,12 +2,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/archroot.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
-
+m4_include(lib/common.sh)
+m4_include(lib/archroot.sh)
 
 # umask might have been changed in /etc/profile
 # ensure that sane default is set again
@@ -16,6 +12,7 @@ umask 0022
 working_dir=''
 
 files=()
+mount_args=()
 
 usage() {
 	echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
@@ -31,9 +28,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,31 +42,19 @@ 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
-	--console=autopipe
-)
-
 if (( ${#cache_dirs[@]} == 0 )); then
 	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
 
 # shellcheck disable=2016
 host_mirrors=($(pacman-conf --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
-host_cachemirrors=($(pacman-conf --repo extra CacheServer 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
 
 for host_mirror in "${host_mirrors[@]}"; do
 	if [[ $host_mirror == *file://* ]]; then
@@ -94,10 +76,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
@@ -107,8 +89,6 @@ copy_hostconf () {
 
 	printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
 
-	[[ -n $host_cachemirrors ]] && printf 'CacheServer = %s\n' "${host_cachemirrors[@]}" >>"$working_dir/etc/pacman.d/mirrorlist"
-
 	[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
 	[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
 
@@ -142,4 +122,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

@@ -2,12 +2,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/archroot.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
-
+m4_include(lib/common.sh)
+m4_include(lib/archroot.sh)
 
 base_packages=(base-devel)
 makechrootpkg_args=(-c -n -C)
@@ -27,32 +23,16 @@ if [[ -f "@pkgdatadir@/setarch-aliases.d/${arch}" ]]; then
 else
 	set_arch="${arch}"
 fi
-
-# Architecture-specific Mount
-arch_mounts=()
-if [[ -f "@pkgdatadir@/mount.d/${arch}" ]]; then
-	mapfile -t arch_mounts < "@pkgdatadir@/mount.d/${arch}"
-fi
-for arch_mount in "${arch_mounts[@]}"; do
-	if [[ $arch_mount = rw* ]]; then
-		arch_mount=${arch_mount#rw }
-		in_array "$arch_mount" "${makechrootpkg_args[@]}" || makechrootpkg_args+=("-d" "$arch_mount")
-	elif [[ $arch_mount = ro* ]]; then
-		arch_mount=${arch_mount#ro }
-		in_array "$arch_mount" "${makechrootpkg_args[@]}" || makechrootpkg_args+=("-D" "$arch_mount")
-	fi
-done
-
 chroots='/var/lib/archbuild'
 clean_first=false
 
-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"
+pacman_config="@pkgdatadir@/pacman-${repo}.conf"
+if [[ -f @pkgdatadir@/pacman-${repo}-${arch}.conf ]]; then
+    pacman_config="@pkgdatadir@/pacman-${repo}-${arch}.conf"
 fi
-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"
+makepkg_config="@pkgdatadir@/makepkg-${arch}.conf"
+if [[ -f @pkgdatadir@/makepkg-${repo}-${arch}.conf ]]; then
+    makepkg_config="@pkgdatadir@/makepkg-${repo}-${arch}.conf"
 fi
 
 usage() {
@@ -74,7 +54,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/archco.in

@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+m4_include(lib/common.sh)
+
+scriptname=${0##*/}
+
+if [[ -z $1 ]]; then
+	printf 'Usage: %s <package name>...\n' "$scriptname"
+	exit 1
+fi
+
+case $scriptname in
+	archco)
+		SVNURL="svn+ssh://svn-packages@repos.archlinux.org/srv/repos/svn-packages/svn";;
+	communityco)
+		SVNURL="svn+ssh://svn-community@repos.archlinux.org/srv/repos/svn-community/svn";;
+	*)
+		die "Couldn't find svn url for %s" "$scriptname"
+		;;
+esac
+
+for i in "$@"; do
+	svn co "$SVNURL/$i"
+done

src/archrelease.in

@@ -2,19 +2,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/valid-tags.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
-
-set -e
-
-
-# Deprecation warning
-if [[ -z $_DEVTOOLS_COMMAND ]]; then
-	warning "${0##*/} is deprecated and will be removed. Use 'pkgctl release' instead"
-fi
+m4_include(lib/common.sh)
+m4_include(lib/valid-tags.sh)
 
 # parse command line options
 FORCE=
@@ -35,7 +24,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
@@ -45,50 +34,54 @@ if [[ ! -f PKGBUILD ]]; then
 	die 'archrelease: PKGBUILD not found'
 fi
 
-# shellcheck source=contrib/makepkg/PKGBUILD.proto
-. ./PKGBUILD
-pkgbase=${pkgbase:-$pkgname}
-pkgver=$(get_full_version "$pkgbase")
-gittag=$(get_tag_from_pkgver "$pkgver")
+trunk=${PWD##*/}
 
-# Check if releasing from a branch
-if ! branchname=$(git symbolic-ref --short HEAD); then
-	die 'not on any branch'
+# Normally this should be trunk, but it may be something
+# such as 'gnome-unstable'
+IFS='/' read -r -d '' -a parts <<< "$PWD"
+if [[ "${parts[*]:(-2):1}" == "repos" ]]; then
+	die 'archrelease: Should not be in repos dir (try from trunk/)'
 fi
-if [[ "${branchname}" != main ]]; then
-	die 'must be run from the main branch'
+unset parts
+
+if [[ $(svn status -q) ]]; then
+	die 'archrelease: You have not committed your changes yet!'
 fi
 
-# Check if remote origin is setup properly
-if ! giturl=$(git remote get-url origin) || [[ ${giturl} != *${GIT_PACKAGING_URL_SSH}* ]]; then
-	die "remote origin is not configured, run 'pkgctl repo configure'"
-fi
-if ! git ls-remote origin >/dev/null; then
-	die "configured remote origin may not exist, run 'pkgctl repo create ${pkgbase}' to create it"
-fi
+pushd .. >/dev/null
+mapfile -t known_files < <(svn ls -r HEAD "$trunk")
+wait $! || die "failed to discover committed files"
 
-msg 'Fetching remote changes'
-git fetch --prune --prune-tags origin || die 'failed to fetch remote changes'
+# gracefully handle files containing an "@" character
+known_files=("${known_files[@]/%/@}")
 
-# Check if local branch is up to date and contains the latest origin commit
-if remoteref=$(git rev-parse "origin/${branchname}" 2>/dev/null); then
-	if [[ $(git branch "${branchname}" --contains "${remoteref}" --format '%(refname:short)') != "${branchname}" ]]; then
-		die "local branch is out of date, run 'git pull --rebase'"
+# update repo directory first to avoid a commit failure
+svn up repos
+
+for tag in "$@"; do
+	stat_busy "Copying %s to %s" "${trunk}" "${tag}"
+
+	if [[ -d repos/$tag ]]; then
+		mapfile -t trash < <(svn ls --recursive "repos/$tag")
+		wait $! || die "failed to discover existing files"
+		if (( ${#trash[@]} )); then
+			trash=("${trash[@]/#/repos/$tag/}")
+			svn rm -q "${trash[@]/%/@}"
+		fi
+	else
+		mkdir -p "repos/$tag"
+		svn add --parents -q "repos/$tag"
 	fi
-fi
 
-# If the tag exists we check if it's properly signed and that it
-# matches the working directory PKGBUILD.
-if git tag --verify "$gittag" &> /dev/null; then
-	cwd_checksum=$(sha256sum PKGBUILD|cut -d' ' -f1)
-	tag_checksum=$(git show "${gittag}:PKGBUILD" | sha256sum |cut -d' ' -f1)
-	if [[ "$cwd_checksum" != "$tag_checksum" ]]; then
-		die "tagged PKGBUILD is not the same as the working dir PKGBUILD"
-	fi
-	git push --tags --set-upstream origin main || abort
-	exit 0
-fi
+	# copy all files at once from trunk to the subdirectory in repos/
+	svn copy -q -r HEAD "${known_files[@]/#/$trunk/}" "repos/$tag/"
 
-msg "Releasing package"
-git tag --sign --message="Package release ${pkgver}" "$gittag" || abort
-git push --tags --set-upstream origin main || abort
+	stat_done
+done
+
+stat_busy "Releasing package"
+printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }"
+svn commit -q -m "archrelease: copy ${trunk} to $tag_list" || abort
+stat_done
+
+popd >/dev/null

src/checkpkg.in

@@ -2,10 +2,9 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+shopt -s extglob
 
+m4_include(lib/common.sh)
 
 usage() {
     cat <<- _EOF_
@@ -53,7 +52,7 @@ while (( $# )); do
 			shift
 			break
 			;;
-		-*|--*)
+		-*,--*)
 			die "invalid argument: %s" "$1"
 			;;
 		*)

src/commitpkg.in

@@ -2,43 +2,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_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
-	. ./PKGBUILD
-
-	# skip when there are no sources available
-	if (( ! ${#source[@]} )); then
-		return
-	fi
-
-	# validate sources hash algo is at least > sha1
-	local bad_algos=("cksums" "md5sums" "sha1sums")
-	local good_hash_algo=false
-
-	# from makepkg libmakepkg/util/schema.sh
-	for integ in "${known_hash_algos[@]}"; do
-		local sumname="${integ}sums"
-		if [[ -n ${!sumname} ]] && ! in_array "${sumname}" "${bad_algos[@]}"; then
-			good_hash_algo=true
-			break
-		fi
-	done
-
-	if ! $good_hash_algo; then
-		die "PKGBUILD lacks a secure cryptographic checksum, insecure algorithms: ${bad_algos[*]}"
-	fi
-}
+m4_include(lib/common.sh)
 
 # Source makepkg.conf; fail if it is not found
 if [[ -r '/etc/makepkg.conf' ]]; then
@@ -58,37 +22,8 @@ elif [[ -r "$HOME/.makepkg.conf" ]]; then
 fi
 
 cmd=${0##*/}
-
-# Deprecation warning
-if [[ -z $_DEVTOOLS_COMMAND ]]; then
-	warning "${cmd} is deprecated and will be removed. Use 'pkgctl release' instead"
-fi
-
-if [[ ! -f PKGBUILD ]]; then
-	die 'No PKGBUILD file'
-fi
-
-if ! repo_spec=$(git config --local devtools.version) || [[ ${repo_spec} != "${GIT_REPO_SPEC_VERSION}" ]]; then
-	error "repository specs are out of date, try:"
-	msg2 'pkgctl repo configure'
-	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
-
-source=()
-# shellcheck source=contrib/makepkg/PKGBUILD.proto
-. ./PKGBUILD
-pkgbase=${pkgbase:-$pkgname}
-
+rsyncopts=(-e ssh -p '--chmod=ug=rw,o=r' -c -h -L --progress --partial -y)
+archreleaseopts=()
 case "$cmd" in
 	commitpkg)
 		if (( $# == 0 )); then
@@ -104,7 +39,26 @@ case "$cmd" in
 		die 'Usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]'
 		;;
 esac
+while getopts ':l:a:s:f' flag; do
+	case $flag in
+		f) archreleaseopts+=('-f') ;;
+		s) server=$OPTARG ;;
+		l) rsyncopts+=("--bwlimit=$OPTARG") ;;
+		a) commit_arch=$OPTARG ;;
+		:) die "Option requires an argument -- '%s'" "$OPTARG" ;;
+		\?) die "Invalid option -- '%s'" "$OPTARG" ;;
+	esac
+done
+shift $(( OPTIND - 1 ))
 
+if [[ ! -f PKGBUILD ]]; then
+	die 'No PKGBUILD file'
+fi
+
+source=()
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
+. ./PKGBUILD
+pkgbase=${pkgbase:-$pkgname}
 
 if (( ${#validpgpkeys[@]} != 0 )); then
 	if [[ -d keys ]]; then
@@ -117,11 +71,11 @@ if (( ${#validpgpkeys[@]} != 0 )); then
 		export-pkgbuild-keys || die 'Failed to export valid PGP keys for source files'
 	fi
 
-	git add --force -- keys/pgp/*
+	svn add --parents --force keys/pgp/*
 fi
 
 # find files which should be under source control
-needsversioning=(PKGBUILD)
+needsversioning=()
 for s in "${source[@]}"; do
 	[[ $s != *://* ]] && needsversioning+=("$s")
 done
@@ -136,35 +90,15 @@ for key in "${validpgpkeys[@]}"; do
 	needsversioning+=("keys/pgp/$key.asc")
 done
 
-# assert that they really are controlled by git
+# assert that they really are controlled by SVN
 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
-	done
+	# svn status's output is only two columns when the status is unknown
+	while read -r status filename; do
+		[[ $status = '?' ]] && unversioned+=("$filename")
+	done < <(svn status -v "${needsversioning[@]}")
+	(( ${#unversioned[*]} )) && die "%s is not under version control" "${unversioned[@]}"
 fi
 
-
-server=${PACKAGING_REPO_RELEASE_HOST}
-rsyncopts=("${RSYNC_OPTS[@]}" --perms --chmod='ug=rw,o=r')
-archreleaseopts=()
-while getopts ':l:a:s:f' flag; do
-	case $flag in
-		f) archreleaseopts+=('-f') ;;
-		s) server=$OPTARG ;;
-		l) rsyncopts+=("--bwlimit=$OPTARG") ;;
-		a) commit_arch=$OPTARG ;;
-		:) die "Option requires an argument -- '%s'" "$OPTARG" ;;
-		\?) die "Invalid option -- '%s'" "$OPTARG" ;;
-	esac
-done
-shift $(( OPTIND - 1 ))
-
 # check packages for validity
 for _arch in "${arch[@]}"; do
 	if [[ -n $commit_arch && ${_arch} != "$commit_arch" ]]; then
@@ -184,47 +118,31 @@ for _arch in "${arch[@]}"; do
 	fi
 done
 
-# check for PKGBUILD standards
-check_pkgbuild_validity
+if [[ -z $server ]]; then
+	server='repos.archlinux.org'
+fi
 
-# auto generate .SRCINFO
-# 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"
-	done
-	for f in $(git ls-files --deleted); do
-		git rm "$f"
-	done
-	stat_done
-
-	msgtemplate="upgpkg: $(get_full_version)"
+if [[ -n $(svn status -q) ]]; then
+	msgtemplate="upgpkg: $pkgbase $(get_full_version)"
 	if [[ -n $1 ]]; then
-		stat_busy 'Committing changes'
-		git commit -q -m "${msgtemplate}: ${1}" || die
+		stat_busy 'Committing changes to trunk'
+		svn commit -q -m "${msgtemplate}: ${1}" || die
 		stat_done
 	else
-		[[ -z ${WORKDIR:-} ]] && setup_workdir
-		msgfile=$(mktemp --tmpdir="${WORKDIR}" commitpkg.XXXXXXXXXX)
+		msgfile="$(mktemp)"
 		echo "$msgtemplate" > "$msgfile"
-		if [[ -n $GIT_EDITOR ]]; then
-			$GIT_EDITOR "$msgfile" || die
-		elif giteditor=$(git config --get core.editor); then
-			$giteditor "$msgfile" || die
+		if [[ -n $SVN_EDITOR ]]; then
+			$SVN_EDITOR "$msgfile"
 		elif [[ -n $VISUAL ]]; then
-			$VISUAL "$msgfile" || die
+			$VISUAL "$msgfile"
 		elif [[ -n $EDITOR ]]; then
-			$EDITOR "$msgfile" || die
+			$EDITOR "$msgfile"
 		else
-			die "No usable editor found (tried \$GIT_EDITOR, git config [core.editor], \$VISUAL, \$EDITOR)."
+			vi "$msgfile"
 		fi
 		[[ -s $msgfile ]] || die
-		stat_busy 'Committing changes'
-		git commit -v -q -F "$msgfile" || die
+		stat_busy 'Committing changes to trunk'
+		svn commit -q -F "$msgfile" || die
 		unlink "$msgfile"
 		stat_done
 	fi
@@ -298,3 +216,23 @@ if [[ ${#uploads[*]} -gt 0 ]]; then
 	msg 'Uploading all package and signature files'
 	rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
 fi
+
+if [[ "${arch[*]}" == 'any' ]]; then
+	if [[ -d ../repos/$repo-x86_64 ]]; then
+		pushd ../repos/ >/dev/null
+		stat_busy "Removing %s" "$repo-x86_64"
+		svn rm -q "$repo-x86_64"
+		svn commit -q -m "Removed $repo-x86_64 for $pkgname"
+		stat_done
+		popd >/dev/null
+	fi
+else
+	if [[ -d ../repos/$repo-any ]]; then
+		pushd ../repos/ >/dev/null
+		stat_busy "Removing %s" "$repo-any"
+		svn rm -q "$repo-any"
+		svn commit -q -m "Removed $repo-any for $pkgname"
+		stat_done
+		popd >/dev/null
+	fi
+fi

src/crossrepomove.in

@@ -0,0 +1,86 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+m4_include(lib/common.sh)
+
+scriptname=${0##*/}
+
+if [[ -z $1 ]]; then
+	printf 'Usage: %s [pkgbase]\n' "$scriptname"
+	exit 1
+fi
+
+pkgbase="${1}"
+
+case $scriptname in
+	extra2community)
+		source_name='packages'
+		target_name='community'
+		source_repo='extra'
+		target_repo='community'
+		;;
+	community2extra)
+		source_name='community'
+		target_name='packages'
+		source_repo='community'
+		target_repo='extra'
+		;;
+	*)
+		die "Couldn't find configuration for %s" "$scriptname"
+		;;
+esac
+
+server='repos.archlinux.org'
+source_svn="svn+ssh://svn-${source_name}@${server}/srv/repos/svn-${source_name}/svn"
+target_svn="svn+ssh://svn-${target_name}@${server}/srv/repos/svn-${target_name}/svn"
+source_dbscripts="/srv/repos/svn-${source_name}/dbscripts"
+target_dbscripts="/srv/repos/svn-${target_name}/dbscripts"
+
+setup_workdir
+
+pushd "$WORKDIR" >/dev/null
+
+msg "Downloading sources for %s" "${pkgbase}"
+svn -q checkout -N "${target_svn}" target_checkout
+mkdir -p "target_checkout/${pkgbase}/repos"
+svn -q export "${source_svn}/${pkgbase}/trunk" "target_checkout/${pkgbase}/trunk" || die
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
+. "target_checkout/${pkgbase}/trunk/PKGBUILD"
+
+msg "Downloading packages for %s" "${pkgbase}"
+for _arch in "${arch[@]}"; do
+	if [[ "${_arch[*]}" == 'any' ]]; then
+		repo_arch='x86_64'
+	else
+		repo_arch=${_arch}
+	fi
+	for _pkgname in "${pkgname[@]}"; do
+		fullver=$(get_full_version "$_pkgname")
+		pkgpath="/srv/ftp/$source_repo/os/$repo_arch/$_pkgname-$fullver-${_arch}.pkg.tar.*"
+		# shellcheck disable=2029
+		ssh "$server" "cp $pkgpath staging/$target_repo" || die
+	done
+done
+
+msg "Adding %s to %s" "${pkgbase}" "${target_repo}"
+svn -q add "target_checkout/${pkgbase}"
+svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" target_checkout
+pushd "target_checkout/${pkgbase}/trunk" >/dev/null
+archrelease "${arch[@]/#/$target_repo-}" || die
+popd >/dev/null
+
+# shellcheck disable=2029
+ssh "${server}" "${target_dbscripts}/db-update" || die
+
+msg "Removing %s from %s" "${pkgbase}" "${source_repo}"
+for _arch in "${arch[@]}"; do
+	# shellcheck disable=2029
+	ssh "${server}" "${source_dbscripts}/db-remove ${source_repo} ${_arch} ${pkgbase}"
+done
+svn -q checkout -N "${source_svn}" source_checkout
+svn -q up "source_checkout/${pkgbase}"
+svn -q rm "source_checkout/${pkgbase}"
+svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" source_checkout
+
+popd >/dev/null

src/diffpkg.in

@@ -2,15 +2,13 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+shopt -s extglob
 
+m4_include(lib/common.sh)
 
 usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [MODES] [FILE|PKGNAME...]
+    cat <<- _EOF_
+		Usage: ${BASH_SOURCE[0]##*/} [OPTIONS] [MODES] [FILE|PKGNAME...]
 
 		Searches for a locally built package corresponding to the PKGBUILD, and
 		downloads the last version of that package from the Pacman repositories.
@@ -21,23 +19,14 @@ usage() {
 		When given two packages, diff both packages against each other.
 
 		In either case, a package name will be converted to a filename from the
-		cache, and '${COMMAND}' will proceed as though this filename was
-		initially specified.
+		cache, and diffpkg will proceed as though this filename was initially
+		specified.
 
 		OPTIONS
 		    -M, --makepkg-config Set an alternate makepkg configuration file
-		    -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
 
-		OUTPUT OPTIONS
-		    --color[=WHEN]       Color output; WHEN is 'never', 'always', or 'auto';
-		                         Plain --color means --color='auto'
-		    -u, -U, --unified    Output 3 lines of unified context
-		    -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
-
 		MODES
 		    -l, --list           Activate content list diff mode (default)
 		    -d, --diffoscope     Activate diffoscope diff mode
@@ -47,19 +36,12 @@ _EOF_
 }
 
 MAKEPKG_CONF=/etc/makepkg.conf
-POOLDIR=/srv/ftp/pool
-
 VERBOSE=0
 TARLIST=0
 DIFFOSCOPE=0
 PKGINFO=0
 BUILDINFO=0
 
-DIFFMODE=--side-by-side
-DIFFCOLOR=--color=auto
-DIFFWIDTH=--width=auto
-DIFFOPTIONS=(--expand-tabs)
-
 # option checking
 while (( $# )); do
 	case $1 in
@@ -68,7 +50,6 @@ while (( $# )); do
 			exit 0
 			;;
 		-M|--makepkg-config)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
 			MAKEPKG_CONF="$2"
 			shift 2
 			;;
@@ -92,50 +73,11 @@ while (( $# )); do
 			VERBOSE=1
 			shift
 			;;
-		-u|-U|--unified)
-			DIFFMODE=--unified
-			shift
-			;;
-		-y|--side-by-side)
-			DIFFMODE=--side-by-side
-			shift
-			;;
-		--color|--color=*)
-			if [[ $2 == never || $2 == always || $2 == auto ]]; then
-				DIFFCOLOR="--color=$2"
-				shift 2
-				continue
-			fi
-			if [[ $1 == --color ]]; then
-				DIFFCOLOR="--color=auto"
-			else
-				DIFFCOLOR="$1"
-			fi
-			shift
-			;;
-		-W|--width)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
-			DIFFWIDTH="--width=$2"
-			shift 2
-			;;
-		--width=*)
-			DIFFWIDTH="$1"
-			shift
-			;;
-		-P|--pool)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
-			POOLDIR="$2"
-			shift 2
-			;;
-		--pool=*)
-			POOLDIR="${1#*=}"
-			shift
-			;;
 		--)
 			shift
 			break
 			;;
-		-*|--*)
+		-*,--*)
 			die "invalid argument: %s" "$1"
 			;;
 		*)
@@ -144,22 +86,6 @@ while (( $# )); do
 	esac
 done
 
-# Set options based on flags or magic values
-if (( VERBOSE )); then
-	if [[ $DIFFMODE == --unified ]]; then
-		DIFFMODE="--unified=99999"
-	fi
-else
-	DIFFOPTIONS+=(--suppress-common-lines)
-fi
-if [[ $DIFFWIDTH == --width=columns ]]; then
-	DIFFWIDTH="--width=${COLUMNS:-130}"
-fi
-if [[ $DIFFWIDTH != --width=auto ]]; then
-	DIFFOPTIONS+=("${DIFFWIDTH}")
-fi
-DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
-
 if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
 	TARLIST=1
 fi
@@ -194,19 +120,6 @@ tar_list() {
 	fi | sort
 }
 
-file_line_length() {
-	path="$1"
-	wc -L "${path}" | tail -n1 | sed -E 's/^ +//g' | cut -d' ' -f1
-}
-
-file_diff_columns() {
-	file1="$1"
-	file2="$2"
-	file1_length=$(file_line_length "$file1")
-	file2_length=$(file_line_length "$file2")
-	echo $(( file1_length + file2_length + 3 ))
-}
-
 diff_pkgs() {
 	local oldpkg newpkg
 	oldpkg=$(readlink -m "$1")
@@ -215,45 +128,32 @@ diff_pkgs() {
 	[[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
 	[[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"
 
-	local -a diffoptions
-	diffoptions=("${DIFFOPTIONS[@]}" --label "${oldpkg}" --label "${newpkg}")
-
 	if (( TARLIST )); then
-		tar_list "$oldpkg" > "$TMPDIR/old"
-		tar_list "$newpkg" > "$TMPDIR/new"
+		tar_list "$oldpkg" > "$TMPDIR/filelist-old"
+		tar_list "$newpkg" > "$TMPDIR/filelist"
+
+		sdiff -s "$TMPDIR/filelist-old" "$TMPDIR/filelist"
 	fi
 
 	if (( PKGINFO )); then
-		bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/new"
+		bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/pkginfo-old"
+		bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/pkginfo"
+
+		sdiff -s "$TMPDIR/pkginfo-old" "$TMPDIR/pkginfo"
 	fi
 
 	if (( BUILDINFO )); then
-		bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
-	fi
+		bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/buildinfo-old"
+		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/buildinfo"
 
-	if (( TARLIST || PKGINFO || BUILDINFO )); 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}")
-		fi
-
-		# Print a header for side-by-side view as it lacks labels
-		if [[ $DIFFMODE == --side-by-side ]]; then
-			printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
-		fi
-
-		diff "${diffoptions[@]}" "$TMPDIR/old" "$TMPDIR/new"
+		sdiff -s "$TMPDIR/buildinfo-old" "$TMPDIR/buildinfo"
 	fi
 
 	if (( DIFFOSCOPE )); then
-		diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
+		diffoscope "$oldpkg" "$newpkg"
 	fi
 }
 
-shopt -s extglob
 fetch_pkg() {
 	local pkg pkgdest pkgurl
 	case $1 in
@@ -269,19 +169,8 @@ fetch_pkg() {
 			pkg=$1 ;;
 	esac
 
-	if [[ -z ${pkgurl} ]]; then
-		# Try to find latest package in pool dir
-		if [[ -d ${POOLDIR} ]]; then
-			shopt -s extglob nullglob
-			pkgurl=$(printf "%s\n" "${POOLDIR}"/*/"${_pkgname}"-!(*-*)-!(*-*)-!(*-*).pkg.tar!(*.sig)|sort -Vr|head -1)
-			shopt -u extglob nullglob
-		fi
-		# Search via pacman database if no pool file exists
-		if [[ ! -f ${pkgurl} ]]; then
-			pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
-				die "Couldn't download previous package for %s." "$pkg"
-		fi
-	fi
+	[[ -n $pkgurl ]] || pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
+		die "Couldn't download previous package for %s." "$pkg"
 
 	pkg=${pkgurl##*/}
 	pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
@@ -301,11 +190,10 @@ fetch_pkg() {
 
 	echo "$pkgdest"
 }
-shopt -u extglob
 
 if (( $# < 2 )); then
 	if [[ ! -f PKGBUILD ]]; then
-		die "This must be run in the directory of a built package.\nTry '${COMMAND} --help' for more information."
+		die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."
 	fi
 
 	# shellcheck source=contrib/makepkg/PKGBUILD.proto

src/export-pkgbuild-keys.in

@@ -2,10 +2,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
+m4_include(lib/common.sh)
 
 usage() {
 	cat <<- _EOF_
@@ -38,7 +35,7 @@ if [[ ! -f PKGBUILD ]]; then
 fi
 
 mapfile -t validpgpkeys < <(
-	# shellcheck source=contrib/makepkg/PKGBUILD.proto
+	# shellcheck source=PKGBUILD.proto
 	. ./PKGBUILD
 	if (( ${#validpgpkeys[@]} )); then
 		printf "%s\n" "${validpgpkeys[@]}"

src/find-libdeps.in

@@ -2,12 +2,10 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
+m4_include(lib/common.sh)
 
 set -e
+shopt -s extglob
 
 IGNORE_INTERNAL=0
 
@@ -43,12 +41,9 @@ else
 	pushd "$WORKDIR" >/dev/null
 fi
 
-shopt -s extglob
 process_sofile() {
 	# extract the library name: libfoo.so
-	shopt -s extglob nullglob
 	soname="${sofile%.so?(+(.+([0-9])))}".so
-	shopt -u extglob nullglob
 	# extract the major version: 1
 	soversion="${sofile##*\.so\.}"
 	if [[ "$soversion" = "$sofile" ]] && ((IGNORE_INTERNAL)); then
@@ -60,7 +55,6 @@ process_sofile() {
 		soobjects+=("${soname}=${soversion}-${soarch}")
 	fi
 }
-shopt -u extglob
 
 case $script_mode in
 	deps) find_args=(-perm -u+x);;

src/finddeps.in

@@ -4,10 +4,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
+m4_include(lib/common.sh)
 
 match=$1
 

src/lddd.in

@@ -4,10 +4,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
+m4_include(lib/common.sh)
 
 ifs=$IFS
 IFS="${IFS}:"

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

@@ -1,304 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_API_GITLAB_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_API_GITLAB_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/config.sh
-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:-}
-
-	# empty token
-	if [[ -z "${GITLAB_TOKEN}" ]]; then
-		msg_error "  api call failed: No token provided"
-		return 1
-	fi
-
-	if ! curl --request "${request}" \
-			--url "https://${GITLAB_HOST}/api/v4/${endpoint}" \
-			--header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
-			--header "Content-Type: application/json" \
-			--data "${data}" \
-			--output "${outfile}" \
-			--silent; then
-		msg_error "  api call failed: $(cat "${outfile}")"
-		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
-		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 '.message | keys[]' < "${file}" &>/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}")
-		elif error=$(jq --raw-output --exit-status '.message' < "${file}"); 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
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
-
-	# query user details
-	if ! gitlab_api_call "${outfile}" GET "user/"; then
-		msg_warn "  Invalid token provided?"
-		exit 1
-	fi
-
-	# extract username from details
-	if ! username=$(jq --raw-output --exit-status '.username' < "${outfile}"); then
-		msg_error "  failed to query username: $(cat "${outfile}")"
-		return 1
-	fi
-
-	printf "%s" "${username}"
-	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/[_\-]{2,}/-/g' \
-		| sed -E 's/^tree$/unix-tree/g'
-}
-
-gitlab_api_create_project() {
-	local pkgbase=$1
-	local outfile data path project_path
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
-
-	project_path=$(gitlab_project_name_to_path "${pkgbase}")
-
-	# create GitLab project
-	data='{
-		"name": "'"${pkgbase}"'",
-		"path": "'"${project_path}"'",
-		"namespace_id": "'"${GIT_PACKAGING_NAMESPACE_ID}"'",
-		"request_access_enabled": "false"
-	}'
-	if ! gitlab_api_call "${outfile}" POST "projects/" "${data}"; then
-		return 1
-	fi
-
-	if ! path=$(jq --raw-output --exit-status '.path' < "${outfile}"); then
-		msg_error "  failed to query path: $(cat "${outfile}")"
-		return 1
-	fi
-
-	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/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.sh

@@ -1,72 +0,0 @@
-#!/hint/bash
-#
-# This may be included with or without `set -euE`
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUTH_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUTH_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-set -e
-
-
-pkgctl_auth_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-		Authenticate with services like GitLab.
-
-		COMMANDS
-		    login    Authenticate with the GitLab instance
-		    status   View authentication status
-
-		OPTIONS
-		    -h, --help     Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} login --gen-access-token
-		    $ ${COMMAND} status
-_EOF_
-}
-
-pkgctl_auth() {
-	if (( $# < 1 )); then
-		pkgctl_auth_usage
-		exit 0
-	fi
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_auth_usage
-				exit 0
-				;;
-			login)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/auth/login.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth/login.sh
-				pkgctl_auth_login "$@"
-				exit 0
-				;;
-			status)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/auth/status.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth/status.sh
-				pkgctl_auth_status "$@"
-				exit 0
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				die "invalid command: %s" "$1"
-				;;
-		esac
-	done
-}

src/lib/auth/login.sh

@@ -1,101 +0,0 @@
-#!/hint/bash
-#
-# This may be included with or without `set -euE`
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUTH_LOGIN_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUTH_LOGIN_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/config.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-
-set -e
-
-
-pkgctl_auth_login_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS]
-
-		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, 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
-		    -h, --help               Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-		    $ ${COMMAND} --gen-access-token
-_EOF_
-}
-
-
-pkgctl_auth_login() {
-	local token personal_access_token_url
-	local GEN_ACESS_TOKEN=0
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_auth_login_usage
-				exit 0
-				;;
-			-g|--gen-access-token)
-				GEN_ACESS_TOKEN=1
-				shift
-				;;
-			*)
-				die "invalid argument: %s" "$1"
-				;;
-		esac
-	done
-
-	personal_access_token_url="https://${GITLAB_HOST}/-/profile/personal_access_tokens?name=pkgctl+token&scopes=api,write_repository"
-
-    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
-		xdg-open "${personal_access_token_url}" 2>/dev/null
-	fi
-
-	# read token from stdin
-	read -s -r -p "${GREEN}?${ALL_OFF} ${BOLD}Paste your authentication token:${ALL_OFF} " token
-	echo
-
-	if [[ -z ${token} ]]; then
-		msg_error "  No token provided"
-		exit 1
-	fi
-
-	# check if the passed token works
-	GITLAB_TOKEN="${token}"
-	if ! result=$(gitlab_api_get_user); then
-		printf "%s\n" "$result"
-		exit 1
-	fi
-
-	msg_success "  Logged in as ${BOLD}${result}${ALL_OFF}"
-	save_devtools_config
-}

src/lib/auth/status.sh

@@ -1,69 +0,0 @@
-#!/hint/bash
-#
-# This may be included with or without `set -euE`
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUTH_STATUS_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUTH_STATUS_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/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-
-set -e
-
-
-pkgctl_auth_status_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS]
-
-		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 this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-		    $ ${COMMAND} --show-token
-_EOF_
-}
-
-pkgctl_auth_status() {
-	local SHOW_TOKEN=0
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_auth_status_usage
-				exit 0
-				;;
-			-t|--show-token)
-				SHOW_TOKEN=1
-				shift
-				;;
-			*)
-				die "invalid argument: %s" "$1"
-				;;
-		esac
-	done
-
-	printf "%s\n" "${BOLD}${GITLAB_HOST}${ALL_OFF}"
-	# shellcheck disable=2119
-	if ! username=$(gitlab_api_get_user); then
-		printf "%s\n" "${username}"
-		exit 1
-	fi
-
-	msg_success "  Logged in as ${BOLD}${username}${ALL_OFF}"
-	if (( SHOW_TOKEN )); then
-		msg_success "  Token: ${GITLAB_TOKEN}"
-	else
-		msg_success "  Token: **************************"
-	fi
-}

src/lib/build/build.sh

@@ -1,525 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_BUILD_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_BUILD_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/update.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
-# shellcheck source=src/lib/release.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
-
-
-pkgctl_build_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PATH]...
-
-		Build packages inside a clean chroot
-
-		When a new pkgver is set using the appropriate PKGBUILD options the
-		checksums are automatically updated.
-
-		TODO
-
-		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
-		    -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)
-		    -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
-		    -r, --release        Automatically commit, tag and release after building
-		    -m, --message MSG    Use the given <msg> as the commit message
-		    -u, --db-update      Automatically update the pacman database as last action
-
-		OPTIONS
-		    -h, --help           Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-		    $ ${COMMAND} --rebuild --staging --message 'libyay 0.42 rebuild' libfoo libbar
-		    $ ${COMMAND} --pkgver 1.42 --release --db-update
-_EOF_
-}
-
-pkgctl_build_check_option_group_repo() {
-	local option=$1
-	local repo=$2
-	local testing=$3
-	local staging=$4
-	if [[ -n "${repo}" ]] || (( testing )) || (( staging )); then
-		die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
-		exit 1
-	fi
-	return 0
-}
-
-pkgctl_build_check_option_group_ver() {
-	local option=$1
-	local pkgver=$2
-	local pkgrel=$3
-	local rebuild=$4
-	if [[ -n "${pkgver}" ]] || [[ -n "${pkgrel}" ]] || (( rebuild )); then
-		die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
-		exit 1
-	fi
-	return 0
-}
-
-# TODO: import pgp keys
-pkgctl_build() {
-	if (( $# < 1 )) && [[ ! -f PKGBUILD ]]; then
-		pkgctl_build_usage
-		exit 1
-	fi
-
-	local UPDATE_CHECKSUMS=0
-	local EDIT=0
-	local REBUILD=0
-	local OFFLOAD=0
-	local STAGING=0
-	local TESTING=0
-	local RELEASE=0
-	local DB_UPDATE=0
-	local INSTALL_TO_HOST=none
-
-	local REPO=
-	local PKGVER=
-	local PKGREL=
-	local MESSAGE=
-
-	local paths=()
-	local BUILD_ARCH=()
-	local BUILD_OPTIONS=()
-	local MAKECHROOT_OPTIONS=()
-	local RELEASE_OPTIONS=()
-	local MAKEPKG_OPTIONS=()
-	local INSTALL_HOST_PACKAGES=()
-
-	local WORKER=
-	local WORKER_SLOT=
-
-	# variables
-	local _arch path pkgbase pkgrepo source pkgbuild_checksum current_checksum
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_build_usage
-				exit 0
-				;;
-			--repo)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				pkgctl_build_check_option_group_repo '--repo' "${REPO}" "${TESTING}" "${STAGING}"
-				REPO="${2}"
-				RELEASE_OPTIONS+=("--repo" "${REPO}")
-				shift 2
-				;;
-			--arch)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if [[ ${2} == all ]]; then
-					BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[@]::${#DEVTOOLS_VALID_ARCHES[@]}-1}")
-				elif [[ ${2} == any ]]; then
-					BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
-				elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
-					if ! in_array "${2}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
-						die 'invalid architecture: %s' "${2}"
-					fi
-					BUILD_ARCH+=("${2}")
-				fi
-				shift 2
-				;;
-			--pkgver=*)
-				pkgctl_build_check_option_group_ver '--pkgver' "${PKGVER}" "${PKGREL}" "${REBUILD}"
-				PKGVER="${1#*=}"
-				PKGREL=1
-				UPDATE_CHECKSUMS=1
-				shift
-				;;
-			--pkgrel=*)
-				pkgctl_build_check_option_group_ver '--pkgrel' "${PKGVER}" "${PKGREL}" "${REBUILD}"
-				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
-				;;
-			-e|--edit)
-				EDIT=1
-				shift
-				;;
-			-o|--offload)
-				OFFLOAD=1
-				shift
-				;;
-			-s|--staging)
-				pkgctl_build_check_option_group_repo '--staging' "${REPO}" "${TESTING}" "${STAGING}"
-				STAGING=1
-				RELEASE_OPTIONS+=("--staging")
-				shift
-				;;
-			-t|--testing)
-				pkgctl_build_check_option_group_repo '--testing' "${REPO}" "${TESTING}" "${STAGING}"
-				TESTING=1
-				RELEASE_OPTIONS+=("--testing")
-				shift
-				;;
-			-c|--clean)
-				BUILD_OPTIONS+=("-c")
-				shift
-				;;
-			-I|--install-to-chroot)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if (( OFFLOAD )); then
-					MAKECHROOT_OPTIONS+=("-I" "$2")
-				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)
-				MAKEPKG_OPTIONS+=("--nocheck")
-				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
-				RELEASE=1
-				shift
-				;;
-			-m|--message)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				MESSAGE=$2
-				RELEASE_OPTIONS+=("--message" "${MESSAGE}")
-				shift 2
-				;;
-			-u|--db-update)
-				DB_UPDATE=1
-				shift
-				;;
-			-w|--worker)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				WORKER_SLOT=$2
-				shift 2
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				paths=("$@")
-				break
-				;;
-		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
-			paths=(".")
-		else
-			pkgctl_build_usage
-			exit 1
-		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 multilib
-	# Check valid repos if not resolved dynamically
-	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_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
-			die 'PKGBUILD not found in %s' "${path}"
-		fi
-
-		source=()
-		# shellcheck source=contrib/makepkg/PKGBUILD.proto
-		. ./PKGBUILD
-		pkgbase=${pkgbase:-$pkgname}
-		pkgrepo=${REPO}
-		pkgbuild_checksum=$(b2sum PKGBUILD | awk '{print $1}')
-		msg "Building ${pkgbase}"
-
-		# auto-detect target repository
-		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 ${pkgrepo} ]]; then
-			# 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
-		if [[ -n ${repo} ]]; then
-			pkgrepo=${repo}
-		# fallback to extra for unreleased packages
-		elif [[ -z ${pkgrepo} ]]; then
-			pkgrepo=extra
-		fi
-
-		# special cases to resolve final build target
-		if (( TESTING )); then
-			pkgrepo="${pkgrepo}-testing"
-		elif (( STAGING )); then
-			pkgrepo="${pkgrepo}-staging"
-		elif [[ $pkgrepo == core ]]; then
-			pkgrepo="${pkgrepo}-testing"
-		fi
-
-		# auto-detection of build architecture
-		if [[ $pkgrepo = multilib* ]]; then
-			BUILD_ARCH=("")
-		elif (( ${#BUILD_ARCH[@]} == 0 )); then
-			if in_array any "${arch[@]}"; then
-				BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
-			else
-				for _arch in "${arch[@]}"; do
-					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 "  arch: ${BUILD_ARCH[*]}"
-		msg2 "worker: ${WORKER}"
-
-		# increment pkgrel on rebuild
-		if (( REBUILD )); then
-			# try to figure out if 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
-			# check if pkgrel conforms expectations
-			[[ ${pkgrel/.*} =~ ^[0-9]+$ ]] || die "Non-standard pkgrel declaration"
-			[[ ${old_pkgrel/.*} =~ ^[0-9]+$ ]] || die "Non-standard pkgrel declaration"
-			# increment pkgrel if it hasn't been changed yet
-			if [[ ${pkgrel} = "${old_pkgrel}" ]]; then
-				PKGREL=$((${pkgrel/.*}+1))
-			else
-				warning 'ignoring --rebuild as pkgrel has already been incremented from %s to %s' "${old_pkgrel}" "${pkgrel}"
-			fi
-		fi
-
-		# update pkgver
-		if [[ -n ${PKGVER} ]]; then
-			msg "Bumping pkgver to ${PKGVER}"
-			pkgbuild_set_pkgver "${PKGVER}"
-		fi
-
-		# update pkgrel
-		if [[ -n ${PKGREL} ]]; then
-			msg "Bumping pkgrel to ${PKGREL}"
-			pkgbuild_set_pkgrel "${PKGREL}"
-		fi
-
-		# edit PKGBUILD
-		if (( EDIT )); then
-			stat_busy 'Editing PKGBUILD'
-			if [[ -n $GIT_EDITOR ]]; then
-				$GIT_EDITOR PKGBUILD || die
-			elif [[ -n $VISUAL ]]; then
-				$VISUAL PKGBUILD || die
-			elif [[ -n $EDITOR ]]; then
-				$EDITOR PKGBUILD || die
-			elif giteditor=$(git config --get core.editor); then
-				$giteditor PKGBUILD || die
-			else
-				die "No usable editor found (tried \$GIT_EDITOR, \$VISUAL, \$EDITOR, git config [core.editor])."
-			fi
-			stat_done
-		fi
-
-		# update checksums if any sources are declared
-		if (( UPDATE_CHECKSUMS )) && (( ${#source[@]} >= 1 )); then
-			if ! result=$(pkgbuild_update_checksums /dev/stderr); then
-				die "${result}"
-			fi
-		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
-				msg "Building ${pkgbase} for [${pkgrepo}] (${arch})"
-				BUILDTOOL="${pkgrepo}-${arch}-build"
-			else
-				msg "Building ${pkgbase} for [${pkgrepo}]"
-				BUILDTOOL="${pkgrepo}-build"
-			fi
-
-			if (( OFFLOAD )); then
-				offload-build --repo "${pkgrepo}" -- "${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[@]}"
-		fi
-
-		# reset common PKGBUILD variables
-		unset pkgbase pkgname arch pkgrepo source pkgver pkgrel validpgpkeys
-		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
-		pkgctl_db_update
-	fi
-}

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/config.sh

@@ -1,48 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_CONFIG_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_CONFIG_SH=1
-
-set -e
-
-readonly XDG_DEVTOOLS_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/devtools"
-readonly XDG_DEVTOOLS_GITLAB_CONFIG="${XDG_DEVTOOLS_DIR}/gitlab.conf"
-
-# default config variables
-export GITLAB_TOKEN=""
-
-load_devtools_config() {
-	# temporary permission fixup
-	if [[ -d "${XDG_DEVTOOLS_DIR}" ]]; then
-		chmod 700 "${XDG_DEVTOOLS_DIR}"
-	fi
-	if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
-		chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	fi
-	if [[ -n "${DEVTOOLS_GITLAB_TOKEN}" ]]; then
-		GITLAB_TOKEN="${DEVTOOLS_GITLAB_TOKEN}"
-		return
-	fi
-	if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
-		GITLAB_TOKEN=$(grep GITLAB_TOKEN "${XDG_DEVTOOLS_GITLAB_CONFIG}"|cut -d= -f2|cut -d\" -f2)
-		return
-	fi
-	GITLAB_TOKEN=""
-}
-
-save_devtools_config() {
-	# temporary permission fixup
-	if [[ -d "${XDG_DEVTOOLS_DIR}" ]]; then
-		chmod 700 "${XDG_DEVTOOLS_DIR}"
-	fi
-	if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
-		chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	fi
-	(
-		umask 0077
-		mkdir -p "${XDG_DEVTOOLS_DIR}"
-		printf 'GITLAB_TOKEN="%s"\n' "${GITLAB_TOKEN}" > "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	)
-}

src/lib/db.sh

@@ -1,80 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_DB_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_DB_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-set -e
-
-
-pkgctl_db_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-		Pacman database modification for package update, move etc
-
-		COMMANDS
-		    move      Move packages between pacman repositories
-		    remove    Remove packages from pacman repositories
-		    update    Update the pacman database as final release step
-
-		OPTIONS
-		    -h, --help    Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} move extra-staging extra-testing libfoo libbar
-		    $ ${COMMAND} remove core-testing libfoo libbar
-		    $ ${COMMAND} update
-_EOF_
-}
-
-pkgctl_db() {
-	if (( $# < 1 )); then
-		pkgctl_db_usage
-		exit 0
-	fi
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_db_usage
-				exit 0
-				;;
-			move)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/db/move.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/move.sh
-				pkgctl_db_move "$@"
-				exit 0
-				;;
-			remove)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/db/remove.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/remove.sh
-				pkgctl_db_remove "$@"
-				exit 0
-				;;
-			update)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/db/update.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
-				pkgctl_db_update "$@"
-				exit 0
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				die "invalid command: %s" "$1"
-				;;
-		esac
-	done
-}