diff options
| author | Erich Eckner <git@eckner.net> | 2017-05-29 08:16:20 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-05-29 08:16:20 +0200 |
| commit | b91e1b963f783edb6b4660f65e8f456794a9e236 (patch) | |
| tree | 0c1537d26e8ec3778be3776fbe808d81ce88db3d | |
| parent | c0b3464ef7f35a91f83445f21d3dc51fe074b09d (diff) | |
| download | devtools32-b91e1b963f783edb6b4660f65e8f456794a9e236.tar.xz | |
arch-nspawn: also parse our mirror layout (http[s]://mirror.url/path/$arch/$repo)
| -rw-r--r-- | arch-nspawn.in | 7 |
1 files changed, 1 insertions, 6 deletions
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 \ |