summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-05-13 20:11:21 +0200
committerErich Eckner <git@eckner.net>2018-05-29 08:54:22 +0200
commit6b2c62ff702a37132ce7f16ae417c03abfc45058 (patch)
tree043989c8ae5a5c1f9435d15cd0edfd610b6a00b2
parent8150a5767e7ed98e92e7404cba0b0c365b548c61 (diff)
downloaddevtools-6b2c62ff702a37132ce7f16ae417c03abfc45058.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 51f3e29..8182120 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -60,7 +60,7 @@ fi
pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
# shellcheck disable=2016
-host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
+host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#;s#(.*/)[^/]+/extra/[^/]+#\1$arch/$repo#')
# shellcheck disable=2016
[[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')