From fd540172335a09a7e1bac41290720504d40b79de Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 11 Sep 2014 11:51:20 -0700
Subject: [PATCH] scripts: reintroduce dist

---
 scripts/build.sh | 21 ------------------
 scripts/dist.sh  | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 21 deletions(-)
 create mode 100755 scripts/dist.sh

diff --git a/scripts/build.sh b/scripts/build.sh
index 1bfeb9208..209f7ad6d 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -71,27 +71,6 @@ for F in $(find ${DEV_PLATFORM} -mindepth 1 -maxdepth 1 -type f); do
     cp ${F} ${MAIN_GOPATH}/bin/
 done
 
-if [ "${TF_DEV}x" = "x" ]; then
-    # Zip and copy to the dist dir
-    echo "==> Packaging..."
-    rm -rf ./pkg/dist
-    mkdir -p ./pkg/dist
-    for PLATFORM in $(find ./pkg -mindepth 1 -maxdepth 1 -type d); do
-        OSARCH=$(basename ${PLATFORM})
-        echo "--> ${OSARCH}"
-
-        pushd $PLATFORM >/dev/null 2>&1
-        zip ../dist/packer_${OSARCH}.zip ./*
-        popd >/dev/null 2>&1
-    done
-
-    # Make the checksums
-    echo "==> Checksumming..."
-    pushd ./pkg/dist >/dev/null 2>&1
-    shasum -a256 * > ./packer_${VERSION}_SHA256SUMS
-    popd >/dev/null 2>&1
-fi
-
 # Done!
 echo
 echo "==> Results:"
diff --git a/scripts/dist.sh b/scripts/dist.sh
new file mode 100755
index 000000000..9533ef285
--- /dev/null
+++ b/scripts/dist.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+set -e
+
+# Get the parent directory of where this script is.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
+DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
+
+# Change into that dir because we expect that
+cd $DIR
+
+# Get the version from the command line
+VERSION=$1
+if [ -z $VERSION ]; then
+    echo "Please specify a version."
+    exit 1
+fi
+
+# Make sure we have a bintray API key
+if [ -z $BINTRAY_API_KEY ]; then
+    echo "Please set your bintray API key in the BINTRAY_API_KEY env var."
+    exit 1
+fi
+
+# Zip and copy to the dist dir
+echo "==> Packaging..."
+rm -rf ./pkg/dist
+mkdir -p ./pkg/dist
+for PLATFORM in $(find ./pkg -mindepth 1 -maxdepth 1 -type d); do
+    OSARCH=$(basename ${PLATFORM})
+
+    if [ $OSARCH = "dist" ]; then
+        continue
+    fi
+
+    echo "--> ${OSARCH}"
+    pushd $PLATFORM >/dev/null 2>&1
+    zip ../dist/packer_${VERSION}_${OSARCH}.zip ./*
+    popd >/dev/null 2>&1
+done
+
+# Make the checksums
+echo "==> Checksumming..."
+pushd ./pkg/dist >/dev/null 2>&1
+shasum -a256 * > ./packer_${VERSION}_SHA256SUMS
+popd >/dev/null 2>&1
+
+echo "==> Uploading..."
+for ARCHIVE in ./pkg/dist/*; do
+    ARCHIVE_NAME=$(basename ${ARCHIVE})
+
+    echo Uploading: $ARCHIVE_NAME
+    curl \
+        -T ${ARCHIVE} \
+        -umitchellh:${BINTRAY_API_KEY} \
+        "https://api.bintray.com/content/mitchellh/packer/packer/${VERSION}/${ARCHIVE_NAME}"
+done