From 7a8130fec8121b777b1ee878c6f5947ef25a0d11 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 13 Feb 2010 19:21:04 +1000 Subject: Further fixes to cache_dir handling 1) Typo cachedir -> cache_dir 2) Use $cache_dir when calling pacman Signed-off-by: Allan McRae Signed-off-by: Pierre Schmitz --- mkarchroot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkarchroot b/mkarchroot index 4ff8993..ae1d294 100755 --- a/mkarchroot +++ b/mkarchroot @@ -66,7 +66,7 @@ shift 1 [ "${working_dir}" = "" ] && echo "error: please specify a working directory" && usage 1 -if [ -z "$cachedir" ]; then +if [ -z "$cache_dir" ]; then cache_conf=${working_dir}/etc/pacman.conf [ ! -f $cache_conf ] && cache_conf=${pac_conf:-/etc/pacman.conf} cache_dir=$((grep -m 1 '^CacheDir' $cache_conf || echo 'CacheDir = /var/cache/pacman/pkg') | sed 's/CacheDir\s*=\s*//') @@ -140,7 +140,7 @@ else pacargs="--noconfirm -v " #--noprogressbar -v pacargs="$pacargs --root=${working_dir}" # pacman takes these as relative to the given root - pacargs="$pacargs --cachedir=/var/cache/pacman/pkg" + pacargs="$pacargs --cachedir=${cache_dir}" if [ "$pac_conf" != "" ]; then pacargs="$pacargs --config=${pac_conf}" fi -- cgit v1.2.3-70-g09d2