From f4b73c7ebff6603f7418803c7803a2fbb6f21d18 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 11 Sep 2014 11:16:59 -0700
Subject: [PATCH] scripts: build should do everything now

---
 scripts/build.sh | 16 +++++++++++-----
 scripts/dist.sh  | 49 ------------------------------------------------
 2 files changed, 11 insertions(+), 54 deletions(-)
 delete mode 100755 scripts/dist.sh

diff --git a/scripts/build.sh b/scripts/build.sh
index c49b67685..1bfeb9208 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -47,10 +47,8 @@ gox \
 # Make sure "packer-packer" is renamed properly
 for PLATFORM in $(find ./pkg -mindepth 1 -maxdepth 1 -type d); do
     set +e
-    # The asterisk allows for the packer directory to be a symlink
-    # (to a directory that must begin with the word 'packer')
-    mv ${PLATFORM}/packer-packer*.exe ${PLATFORM}/packer.exe 2>/dev/null
-    mv ${PLATFORM}/packer-packer* ${PLATFORM}/packer 2>/dev/null
+    mv ${PLATFORM}/packer-packer.exe ${PLATFORM}/packer.exe 2>/dev/null
+    mv ${PLATFORM}/packer-packer ${PLATFORM}/packer 2>/dev/null
     set -e
 done
 
@@ -76,14 +74,22 @@ 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 ../${OSARCH}.zip ./*
+        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!
diff --git a/scripts/dist.sh b/scripts/dist.sh
deleted file mode 100755
index 2a18c1923..000000000
--- a/scripts/dist.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -e
-
-# 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
-
-# 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
-
-# Zip all the files
-rm -rf ./pkg/dist
-mkdir -p ./pkg/dist
-for FILENAME in $(find ./pkg -mindepth 1 -maxdepth 1 -type f); do
-    FILENAME=$(basename $FILENAME)
-    cp ./pkg/${FILENAME} ./pkg/dist/packer_${VERSION}_${FILENAME}
-done
-
-# Make the checksums
-pushd ./pkg/dist
-shasum -a256 * > ./packer_${VERSION}_SHA256SUMS
-popd
-
-# Upload
-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
-
-exit 0