From 11b8c468e24ba6bf694e3dc9cd629fbd7e61ba01 Mon Sep 17 00:00:00 2001
From: Robert Kruszewski <robertk@palantir.com>
Date: Wed, 16 Nov 2016 13:57:01 +0000
Subject: [PATCH 1/2] make dist land in maven style directory pattern

---
 circle.yml               | 7 ++++---
 dev/make-distribution.sh | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index b8d1a36da76c9..36d076002bd70 100644
--- a/circle.yml
+++ b/circle.yml
@@ -36,10 +36,11 @@ test:
           make_dist() {
             dist_name="$1"
             build_flags="$2"
-            file_name="spark-${version}-bin-${dist_name}.tgz"
-            sudo apt-get --assume-yes install r-base r-base-dev 
+            dist_version="${version}-${dist_name}"
+            file_name="spark-dist-${dist_version}.tgz"
+            sudo apt-get --assume-yes install r-base r-base-dev
             ./dev/make-distribution.sh --name $dist_name --tgz $build_flags
-            curl -u $BINTRAY_USERNAME:$BINTRAY_PASSWORD -T $file_name "https://api.bintray.com/content/palantir/releases/spark/${version}/org/apache/spark/dist/${file_name}"
+            curl -u $BINTRAY_USERNAME:$BINTRAY_PASSWORD -T $file_name "https://api.bintray.com/content/palantir/releases/spark/${version}/org/apache/spark/spark-dist/${dist_version}/${file_name}"
           }
 
           case $CIRCLE_NODE_INDEX in
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
index 2a8e1f6d93467..fb68d8f814b41 100755
--- a/dev/make-distribution.sh
+++ b/dev/make-distribution.sh
@@ -137,7 +137,7 @@ fi
 echo "Spark version is $VERSION"
 VERSION_SET=$("$MVN" versions:set -DnewVersion=$VERSION | tail -n 1)
 if [ "$MAKE_TGZ" == "true" ]; then
-  echo "Making spark-$VERSION-bin-$NAME.tgz"
+  echo "Making spark-dist-$VERSION-$NAME.tgz"
 else
   echo "Making distribution for Spark $VERSION in $DISTDIR..."
 fi
@@ -216,7 +216,7 @@ if [ -d "$SPARK_HOME"/R/lib/SparkR ]; then
 fi
 
 if [ "$MAKE_TGZ" == "true" ]; then
-  TARDIR_NAME=spark-$VERSION-bin-$NAME
+  TARDIR_NAME=spark-dist-$VERSION-$NAME
   TARDIR="$SPARK_HOME/$TARDIR_NAME"
   rm -rf "$TARDIR"
   cp -r "$DISTDIR" "$TARDIR"

From 2c39532e82cc8a1804b02ac17670389e7524f3da Mon Sep 17 00:00:00 2001
From: Robert Kruszewski <robertk@palantir.com>
Date: Wed, 16 Nov 2016 16:58:01 +0000
Subject: [PATCH 2/2] tar the same thing

---
 dev/make-distribution.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
index fb68d8f814b41..00b1ba201b145 100755
--- a/dev/make-distribution.sh
+++ b/dev/make-distribution.sh
@@ -220,6 +220,6 @@ if [ "$MAKE_TGZ" == "true" ]; then
   TARDIR="$SPARK_HOME/$TARDIR_NAME"
   rm -rf "$TARDIR"
   cp -r "$DISTDIR" "$TARDIR"
-  tar czf "spark-$VERSION-bin-$NAME.tgz" -C "$SPARK_HOME" "$TARDIR_NAME"
+  tar czf "$TARDIR_NAME.tgz" -C "$SPARK_HOME" "$TARDIR_NAME"
   rm -rf "$TARDIR"
 fi