Fix Gentoo tarball download regex to handle spurious file.

lavabit · Oct 16, 2023 · 6c998a0 · 6c998a0
1 parent be46b06
commit 6c998a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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