From 6c998a057040a11481424589f9a547659114557a Mon Sep 17 00:00:00 2001 From: Ladar Levison Date: Mon, 16 Oct 2023 16:17:27 -0500 Subject: [PATCH] Fix Gentoo tarball download regex to handle spurious file. --- http/generic.gentoo.docker.sh | 2 +- http/generic.gentoo.vagrant.sh | 2 +- http/magma.gentoo.vagrant.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/http/generic.gentoo.docker.sh b/http/generic.gentoo.docker.sh index 3e2140b22..e677baee5 100644 --- a/http/generic.gentoo.docker.sh +++ b/http/generic.gentoo.docker.sh @@ -951,7 +951,7 @@ cd /mnt/gentoo echo 'Downloading Image Overlay' # host="https://gentoo.osuosl.org" host="https://mirrors.edge.kernel.org/gentoo" -tarball=$(wget -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/ -O - | grep -E -o -e "stage3-amd64-nomultilib-openrc-[0-9]{8}T[0-9]{6}Z.tar.xz" | uniq) +tarball=$(wget -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/ -O - | grep -E -v "tar\.xz\.asc|tar\.xz\.CONTENTS\.gz|tar\.xz\.DIGESTS|tar\.xz\.sha256" | grep -E -o -e "stage3-amd64-nomultilib-openrc-[0-9]{8}T[0-9]{6}Z.tar.xz" | sort -V | uniq | tail -1) wget --tries=5 --progress=dot:binary $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball || exit 1 wget --tries=5 -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball.asc || exit 1 wget --tries=5 -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball.DIGESTS || exit 1 diff --git a/http/generic.gentoo.vagrant.sh b/http/generic.gentoo.vagrant.sh index 4a6b64d23..a1914201b 100644 --- a/http/generic.gentoo.vagrant.sh +++ b/http/generic.gentoo.vagrant.sh @@ -951,7 +951,7 @@ cd /mnt/gentoo echo 'Downloading Image Overlay' # host="https://gentoo.osuosl.org" host="https://mirrors.edge.kernel.org/gentoo" -tarball=$(wget -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/ -O - | grep -E -o -e "stage3-amd64-nomultilib-openrc-[0-9]{8}T[0-9]{6}Z.tar.xz" | uniq) +tarball=$(wget -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/ -O - | grep -E -v "tar\.xz\.asc|tar\.xz\.CONTENTS\.gz|tar\.xz\.DIGESTS|tar\.xz\.sha256" | grep -E -o -e "stage3-amd64-nomultilib-openrc-[0-9]{8}T[0-9]{6}Z.tar.xz" | sort -V | uniq | tail -1) wget --tries=5 --progress=dot:binary $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball || exit 1 wget --tries=5 -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball.asc || exit 1 wget --tries=5 -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball.DIGESTS || exit 1 diff --git a/http/magma.gentoo.vagrant.sh b/http/magma.gentoo.vagrant.sh index 1f427c6b4..f9937e316 100644 --- a/http/magma.gentoo.vagrant.sh +++ b/http/magma.gentoo.vagrant.sh @@ -951,7 +951,7 @@ cd /mnt/gentoo echo 'Downloading Image Overlay' # host="https://gentoo.osuosl.org" host="https://mirrors.edge.kernel.org/gentoo" -tarball=$(wget -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/ -O - | grep -E -o -e "stage3-amd64-nomultilib-openrc-[0-9]{8}T[0-9]{6}Z.tar.xz" | uniq) +tarball=$(wget -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/ -O - | grep -E -v "tar\.xz\.asc|tar\.xz\.CONTENTS\.gz|tar\.xz\.DIGESTS|tar\.xz\.sha256" | grep -E -o -e "stage3-amd64-nomultilib-openrc-[0-9]{8}T[0-9]{6}Z.tar.xz" | sort -V | uniq | tail -1) wget --tries=5 --progress=dot:binary $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball || exit 1 wget --tries=5 -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball.asc || exit 1 wget --tries=5 -q $host/releases/amd64/autobuilds/current-stage3-amd64-nomultilib-openrc/$tarball.DIGESTS || exit 1