summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-02 11:25:54 +0200
committerErich Eckner <git@eckner.net>2021-02-25 12:40:07 +0100
commit60d4fe9c9146c3d548f981b57daadb73f9d3aa19 (patch)
treeac027d9b474e45aa77b356c9a9b0d783976138a6
parent7e0d84530857125da17c7bfd7dc3cea0e147d79c (diff)
downloaddevtools-60d4fe9c9146c3d548f981b57daadb73f9d3aa19.tar.xz
arch-nspawn: also parse our mirror layout (http[s]://mirror.url/path/$arch/$repo)
-rw-r--r--arch-nspawn.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 03abcd8..07ccdc9 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -64,7 +64,7 @@ if (( ${#cache_dirs[@]} == 0 )); then
fi
# shellcheck disable=2016
-host_mirrors=($($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
+host_mirrors=($($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#;t;s#(.*/)[^/]+/extra(/?)$#\1$arch/$repo\2#'))
for host_mirror in "${host_mirrors[@]}"; do
if [[ $host_mirror == *file://* ]]; then