From 79250cd0ec139b3cd62d2ecdce7ccf5f0d5ee78c Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@forwardbias.in>
Date: Wed, 11 Feb 2015 10:54:36 -0800
Subject: [PATCH] Use s3cmd instead of s3-cli since we can pass keys as arg

---
 package.json                | 1 -
 scripts/createSourceTarball | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0ee7251b4..3c7a1959c 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,6 @@
     "mocha": "*",
     "nock": "~0.43.1",
     "redis": "~0.12.1",
-    "s3-cli": "~0.11.1",
     "sinon": "~1.10.3"
   },
   "scripts": {
diff --git a/scripts/createSourceTarball b/scripts/createSourceTarball
index b9df5be20..a45cdd106 100755
--- a/scripts/createSourceTarball
+++ b/scripts/createSourceTarball
@@ -2,7 +2,12 @@
 
 set -eu
 
-[[ ! -f "${HOME}/.s3cfg" ]] && echo "~/.s3cfg missing" && exit 1
+: ${AWS_BOX_RELEASE_ACCESS_KEY:=}
+: ${AWS_BOX_RELEASE_SECRET_KEY:=}
+if [[ -z "${AWS_BOX_RELEASE_ACCESS_KEY}" || -z "${AWS_BOX_RELEASE_SECRET_KEY}" ]]; then
+    echo "AWS_BOX_RELEASE_ACCESS_KEY and AWS_BOX_RELEASE_SECRET_KEY env is not set"
+    exit 1
+fi
 
 # Only GNU getopt supports long options. OS X comes bundled with the BSD getopt
 # brew install gnu-getopt to get the GNU getopt on OS X
@@ -39,7 +44,7 @@ cd "${bundle_dir}" && npm install --production
 cd "${bundle_dir}" && tar czvf "${bundle_file}" .
 
 echo "Uploading bundle to S3"
-${SOURCE_DIR}/node_modules/.bin/s3-cli put --acl-public "${bundle_file}" "s3://cloudron-releases/box-${version}.tar.gz"
+s3cmd --acl-public --access_key="${AWS_BOX_RELEASE_ACCESS_KEY}" --secret_key="${AWS_BOX_RELEASE_SECRET_KEY}" --no-mime-magic put "${bundle_file}" "s3://cloudron-releases/box-${version}.tar.gz"
 
 echo "Cleaning up ${bundle_dir}"
 rm -rf "${bundle_dir}" "${bundle_file}"