summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-02 11:25:54 +0200
committerErich Eckner <git@eckner.net>2019-08-18 20:19:42 +0200
commitbe0276828983d636d97b5ee478c0e9477b5dcfb8 (patch)
tree1584c0f329df13217107de31a5e32cac2d9f8c35
parent12ad3f96cfa0b0ab54fd4201c774fa0f3eca76ea (diff)
downloaddevtools32-be0276828983d636d97b5ee478c0e9477b5dcfb8.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 9c8880d..0e7fe20 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -63,7 +63,7 @@ if (( ${#cache_dirs[@]} == 0 )); then
fi
# shellcheck disable=2016
-host_mirrors=($($pacconf_cmd --conf "$pac_conf" --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
+host_mirrors=($($pacconf_cmd --conf "$pac_conf" --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#;t;s#(.*/)[^/]+/extra$#\1$arch/$repo#'))
while read -r line; do
mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \