From 0979e8daeeb11c0d0878309219283a2a0e977d07 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sat, 5 Mar 2022 10:48:02 +0100
Subject: [PATCH] Jitsi, Matrix : use generic github tags archive URL and
 follow redirects

---
 podman-jitsi/zz_build-images.sh  | 2 +-
 podman-matrix/zz_build-images.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/podman-jitsi/zz_build-images.sh b/podman-jitsi/zz_build-images.sh
index 4d1f6c1..94bcd5a 100755
--- a/podman-jitsi/zz_build-images.sh
+++ b/podman-jitsi/zz_build-images.sh
@@ -10,7 +10,7 @@ ensure_not_root
 buildfolder=/tmp/docker-jitsi-meet-$$
 
 mkdir ${buildfolder} &&
-curl -s -- "https://codeload.github.com/jitsi/docker-jitsi-meet/tar.gz/refs/tags/${version}" | tar xz --strip-components 1 -C ${buildfolder}/ && {
+curl -sSfL -- "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/${version}.tar.gz" | tar xz --strip-components 1 -C ${buildfolder}/ && {
     podman pull docker.io/library/debian:bullseye-slim
     if ! podman image exists localhost/jitsi/base:${version}; then
         podman build -t localhost/jitsi/base:${version} ${buildfolder}/base/ &&
diff --git a/podman-matrix/zz_build-images.sh b/podman-matrix/zz_build-images.sh
index 24918d7..0e2e8a2 100755
--- a/podman-matrix/zz_build-images.sh
+++ b/podman-matrix/zz_build-images.sh
@@ -11,7 +11,7 @@ buildfolder=/tmp/synapse-$$
 
 if ! podman image exists localhost/matrixdotorg/synapse:${synapse_version}; then
     mkdir ${buildfolder} &&
-    curl -s -- "https://codeload.github.com/matrix-org/synapse/tar.gz/refs/tags/${synapse_version}" | \tar xz --strip-components 1 -C ${buildfolder}/ && {
+    curl -sSfL -- "https://github.com/matrix-org/synapse/archive/refs/tags/${synapse_version}.tar.gz" | \tar xz --strip-components 1 -C ${buildfolder}/ && {
 	podman run -d --name buildkitd --privileged docker.io/moby/buildkit:latest &&
 	curl -sSLf https://github.com/moby/buildkit/releases/download/v0.9.3/buildkit-v0.9.3.linux-amd64.tar.gz | \
 	    tar xz -C ~/ bin/buildctl &&