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-31 16:09:42 +0200
commit70e938432e7042e9e6be49294e85c3a2e89c7603 (patch)
tree9a1a2660a15543c76cad764aebbc95f8efa9692d
parentd490d1c32839308782b15d988cb742419a39a910 (diff)
downloaddevtools32-70e938432e7042e9e6be49294e85c3a2e89c7603.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')