[devtools] mkarchroot: use pacman-conf for obtaining CacheDir

Message ID 20190219195404.5764-1-jelle@vdwaa.nl
State New
Headers show
Series
  • [devtools] mkarchroot: use pacman-conf for obtaining CacheDir
Related show

Commit Message

Jelle van der Waa Feb. 19, 2019, 7:54 p.m. UTC
Instead of using sed/grep and relying on the output of 'pacman -v' use
pacman-conf for obtaining the configuration value of the CacheDir.

Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
---
 mkarchroot.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eli Schwartz via arch-projects Feb. 20, 2019, 6:21 a.m. UTC | #1
On 2/19/19 2:54 PM, Jelle van der Waa wrote:
> Instead of using sed/grep and relying on the output of 'pacman -v' use
> pacman-conf for obtaining the configuration value of the CacheDir.

Misses the same change in arch-nspawn, see for example
https://github.com/eli-schwartz/devtools/commit/2bfe582bee3c4d17314e46bb15c03f75cc269dc8

Patch

diff --git a/mkarchroot.in b/mkarchroot.in
index 52e363f..bae6b5a 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -52,7 +52,7 @@  shift 1
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
 if [[ -z $cache_dir ]]; then
-	cache_dirs=($(pacman -v "$cache_conf" 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+	cache_dirs=($(pacman-conf CacheDir))
 else
 	cache_dirs=(${cache_dir})
 fi