From 13f3043c8a267c21e948eb8414d5b7cc835527c8 Mon Sep 17 00:00:00 2001
From: sakridge <sakridge@gmail.com>
Date: Fri, 13 Nov 2020 19:56:37 -0800
Subject: [PATCH] tell curl to follow redirects to fix net scripts (#13589)

---
 net/net.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/net.sh b/net/net.sh
index 1009b0ffbe..196bb53305 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -498,11 +498,13 @@ prepareDeploy() {
   case $deployMethod in
   tar)
     if [[ -n $releaseChannel ]]; then
+      echo "Downloading release from channel: $releaseChannel"
       rm -f "$SOLANA_ROOT"/solana-release.tar.bz2
       declare updateDownloadUrl=http://release.solana.com/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2
       (
         set -x
-        curl --retry 5 --retry-delay 2 --retry-connrefused \
+        curl -L -I "$updateDownloadUrl"
+        curl -L --retry 5 --retry-delay 2 --retry-connrefused \
           -o "$SOLANA_ROOT"/solana-release.tar.bz2 "$updateDownloadUrl"
       )
       tarballFilename="$SOLANA_ROOT"/solana-release.tar.bz2
@@ -510,7 +512,7 @@ prepareDeploy() {
     (
       set -x
       rm -rf "$SOLANA_ROOT"/solana-release
-      (cd "$SOLANA_ROOT"; tar jxv) < "$tarballFilename"
+      cd "$SOLANA_ROOT"; tar jfxv "$tarballFilename"
       cat "$SOLANA_ROOT"/solana-release/version.yml
     )
     ;;