tell curl to follow redirects to fix net scripts (solana-labs#13589)

nexstone68 · Nov 14, 2020 · 13f3043 · 13f3043
1 parent 34bf80b
commit 13f3043
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/net/net.sh b/net/net.sh
@@ -498,19 +498,21 @@ 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
     fi
     (
       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
     )
     ;;