Merge branch 'fix-cachedir-from-custom-pacconf' into 'master'

fix(mkarchroot): query cache_dirs from pac_conf Closes #278 See merge request archlinux/devtools!314
fix(mkarchroot): query cache_dirs from pac_conf
2025-10-23 13:02:03 +02:00 · 2025-08-02 02:36:01 +00:00 · 2025-06-23 20:22:35 +08:00
4 changed files with 2 additions and 4 deletions
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
-	license
 	release
 	repo
 	search
--- a/doc/man/pkgctl-auth.1.asciidoc
+++ b/doc/man/pkgctl-auth.1.asciidoc
@@ -3,7 +3,7 @@ pkgctl-auth(1)

 Name
 ----
-pkgctl-auth - Authenticate with services like GitLab.
+pkgctl-auth - Authenticate with serivces like GitLab.

 Synopsis
 --------
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -188,7 +188,6 @@ path = [
    "README.md",
    "keys/**",
    ".SRCINFO",
-    ".gitignore",
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
--- a/src/mkarchroot.in
+++ b/src/mkarchroot.in
@@ -65,7 +65,7 @@ shift 1


 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+	mapfile -t cache_dirs < <(pacman-conf ${pac_conf:+-c "$pac_conf"} CacheDir)
 fi

 umask 0022