Commit 7a8130fe authored by Allan McRae's avatar Allan McRae Committed by Pierre Schmitz
Browse files

Further fixes to cache_dir handling 



1) Typo cachedir -> cache_dir
2) Use $cache_dir when calling pacman

Signed-off-by: default avatarAllan McRae <allan@archlinux.org>
Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent a6e1f8cf

mkarchroot

+2 −2
Original line number Diff line number Diff line
@@ -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