From b91e1b963f783edb6b4660f65e8f456794a9e236 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 29 May 2017 08:16:20 +0200
Subject: arch-nspawn: also parse our mirror layout
 (http[s]://mirror.url/path/$arch/$repo)

---
 arch-nspawn.in | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'arch-nspawn.in')

diff --git a/arch-nspawn.in b/arch-nspawn.in
index ca18169..36ccf5b 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -58,7 +58,7 @@ else
 	cache_dirs=("$cache_dir")
 fi
 
-host_mirror=$(pacman --cachedir /doesnt/exist -Sddp extra/devtools 2>/dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
+host_mirror=$(pacman --cachedir /doesnt/exist -Sddp extra/devtools 2>/dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#;s#(.*/)[^/]+/extra/[^/]+#\1$arch/$repo#')
 [[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
 
 # {{{ functions
@@ -108,11 +108,6 @@ copy_hostconf
 
 eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
 
-if [[ "$CARCH" = i*86 ]]; then
-  host_mirror='https://mirror.archlinux32.org/$arch/$repo'
-  copy_hostconf
-fi
-
 [[ -z $nosetarch ]] || unset CARCH
 
 exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
-- 
cgit v1.2.3-70-g09d2