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 21:11:14 +0200
commitb2fbb6a8476f3fb0cadc24c2b278f9bd17d4d422 (patch)
tree743b73a10944c40ebf2ec1346c64caf985e89a99
parent2c1965614264a8550f843bbc18234aa2ae5f6122 (diff)
downloaddevtools32-b2fbb6a8476f3fb0cadc24c2b278f9bd17d4d422.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 929a6f5..d8990e5 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}" \