From 791ead605360cac6ab4d83023552c4acb5401f53 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 20 Mar 2019 13:37:55 -0700
Subject: [PATCH] Include TARGET in release URL to make room for future targets

---
 ci/publish-tarball.sh | 57 +++++++++++++++++++++++--------------------
 net/net.sh            |  3 ++-
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
index 8678744eff..bb2fa5d691 100755
--- a/ci/publish-tarball.sh
+++ b/ci/publish-tarball.sh
@@ -24,6 +24,17 @@ if [[ -z $CHANNEL_OR_TAG ]]; then
   exit 1
 fi
 
+case "$(uname)" in
+Darwin)
+  TARGET=x86_64-apple-darwin
+  ;;
+Linux)
+  TARGET=x86_64-unknown-linux-gnu
+  ;;
+*)
+  TARGET=unknown-unknown-unknown
+  ;;
+esac
 
 echo --- Creating tarball
 (
@@ -31,17 +42,6 @@ echo --- Creating tarball
   rm -rf solana-release/
   mkdir solana-release/
 
-  case "$(uname)" in
-  Darwin)
-    TARGET=x86_64-apple-darwin
-    ;;
-  Linux)
-    TARGET=x86_64-unknown-linux-gnu
-    ;;
-  *)
-    TARGET=unknown-unknown-unknown
-    ;;
-  esac
   COMMIT="$(git rev-parse HEAD)"
 
   (
@@ -62,32 +62,35 @@ echo --- Creating tarball
   )
   cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda
 
-  tar jvcf solana-release.tar.bz2 solana-release/
+  tar jvcf solana-release.tar-$TARGET.bz2 solana-release/
+
+  cp solana-release/bin/solana-install-$TARGET .
 )
 
 echo --- Saving build artifacts
 source ci/upload-ci-artifact.sh
-upload-ci-artifact solana-release.tar.bz2
+upload-ci-artifact solana-release-$TARGET.tar.bz2
 
 if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
   echo Skipped due to DO_NOT_PUBLISH_TAR
   exit 0
 fi
 
-echo --- AWS S3 Store
-(
-  set -x
-  $DRYRUN docker run \
-    --rm \
-    --env AWS_ACCESS_KEY_ID \
-    --env AWS_SECRET_ACCESS_KEY \
-    --volume "$PWD:/solana" \
-    eremite/aws-cli:2018.12.18 \
-    /usr/bin/s3cmd --acl-public put /solana/solana-release.tar.bz2 \
-    s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
+for file in solana-release-$TARGET.tar.bz2 solana-install-$TARGET; do
+  echo --- AWS S3 Store: $file
+  (
+    set -x
+    $DRYRUN docker run \
+      --rm \
+      --env AWS_ACCESS_KEY_ID \
+      --env AWS_SECRET_ACCESS_KEY \
+      --volume "$PWD:/solana" \
+      eremite/aws-cli:2018.12.18 \
+      /usr/bin/s3cmd --acl-public put /solana/"$file" s3://solana-release/"$CHANNEL_OR_TAG"/"$file"
 
-  echo Published to:
-  $DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
-)
+    echo Published to:
+    $DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/"$file"
+  )
+done
 
 echo --- ok
diff --git a/net/net.sh b/net/net.sh
index 2b783e284e..0dd384dc21 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -278,7 +278,8 @@ start() {
       rm -f "$SOLANA_ROOT"/solana-release.tar.bz2
       (
         set -x
-        curl -o "$SOLANA_ROOT"/solana-release.tar.bz2 http://solana-release.s3.amazonaws.com/"$releaseChannel"/solana-release.tar.bz2
+        curl -o "$SOLANA_ROOT"/solana-release.tar.bz2 \
+          http://solana-release.s3.amazonaws.com/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2
       )
       tarballFilename="$SOLANA_ROOT"/solana-release.tar.bz2
     fi