| index : devtools32 | |
| Archlinux32 fork of devtools | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | arch-nspawn.in | 7 |
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 \ |