diff options
| author | Allan McRae <allan@archlinux.org> | 2010-02-13 10:21:04 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2010-02-13 15:55:23 +0100 |
| commit | 7a8130fec8121b777b1ee878c6f5947ef25a0d11 (patch) | |
| tree | 37f46a3f9eccaace66ef8f1151f408985dc9377b | |
| parent | a6e1f8cfd300ce591c279f7e1093ca059ae6b56e (diff) | |
| download | devtools-7a8130fec8121b777b1ee878c6f5947ef25a0d11.tar.gz devtools-7a8130fec8121b777b1ee878c6f5947ef25a0d11.tar.xz | |
Further fixes to cache_dir handling
1) Typo cachedir -> cache_dir
2) Use $cache_dir when calling pacman
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
| -rwxr-xr-x | mkarchroot | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |