From efc82b90c18d363116b5d8f6b8860b0e3791c4e4 Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Wed, 24 Oct 2018 23:00:32 +0200
Subject: [PATCH] update Makefile and s3sync scripts

---
 Makefile          | 27 +++++++++++++++++++--
 scripts/s3sync.sh | 60 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 66 insertions(+), 21 deletions(-)
 mode change 100644 => 100755 scripts/s3sync.sh

diff --git a/Makefile b/Makefile
index b9aabd01..e40ce5de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,28 @@
+# Run docker build
+# usage: 
+# make build-beta
+# make build-stable
 build-%:
 	./scripts/docker-build.sh $*
 
-sync-%:
-	./scripts/s3sync.sh $*
\ No newline at end of file
+# s3sync with stage.mytrezor.com
+# Upload requested build for testing purposes
+# usage:
+# make stage-beta
+# make stage-stable
+stage-%:
+	./scripts/s3sync.sh stage $*
+
+# s3sync with beta.mytrezor.com
+# Upload build/beta only
+# usage:
+# make beta
+beta:
+	./scripts/s3sync.sh beta beta
+
+# s3sync with wallet.mytrezor.com
+# Upload build/stable only
+# usage:
+# make stable
+stable:
+	./scripts/s3sync.sh stable stable
\ No newline at end of file
diff --git a/scripts/s3sync.sh b/scripts/s3sync.sh
old mode 100644
new mode 100755
index 44a141a2..a4904366
--- a/scripts/s3sync.sh
+++ b/scripts/s3sync.sh
@@ -13,41 +13,63 @@ function confirm {
     fi
 }
 
-if [ "x$1" == "x" ]; then
-    echo "./s3sync.sh stage|beta|wallet [-d]"
+
+# Validate params
+if [ "x$1" == "x" ] || [ "x$2" == "x" ]; then
+    echo "Invalid params"
+    echo "./s3sync.sh beta|stable stage|beta|stable [clear]"
     exit 1
 fi
 
+# Validate destination param
+if [ "x$1" != "xstage" ] && [ "x$1" != "xbeta" ] && [ "x$1" != "xstable" ]; then
+    echo "Invalid destination: "$1
+    echo "use: stage|beta|stable"
+    exit 1
+fi
+
+# Validate source param
+if [ "x$2" != "xbeta" ] && [ "x$2" != "xstable" ]; then
+    echo "Invalid source: "$2
+    echo "use: beta|stable"
+    exit 1
+fi
+
+# Set source directory
+if [ "x$2" == "xbeta" ]; then
+    SOURCE=../build/beta
+
+elif [ "x$2" == "xstable" ]; then
+    SOURCE=../build/stable
+fi
+
+# Set destination
 if [ "x$1" == "xstage" ]; then
-    DIST=../build/beta
     BUCKET=stage.mytrezor.com
     DISTRIBUTION_ID="E24M0QWO692FQL"
-
 elif [ "x$1" == "xbeta" ]; then
-    DIST=../build/beta
     BUCKET=beta.mytrezor.com
     DISTRIBUTION_ID="E1PONNHWUNCQ9M"
-
-    confirm
-
-elif [ "x$1" == "xwallet" ]; then
-    DIST=../build/prod
+elif [ "x$2" == "xstable" ]; then
     BUCKET=wallet.mytrezor.com
     DISTRIBUTION_ID="EZM01GFTITGVD"
+fi
 
-    confirm
+echo "sync "$SOURCE" with "$BUCKET"/next"
 
+if [ "x$1" == "xbeta" ] || [ "x$1" == "xstable" ]; then
+    confirm
 fi
 
-set -e
-cd `dirname $0`
+# set -e
+# cd `dirname $0`
 
-if [ "x$2" == "x-d" ]; then
-    aws s3 sync --delete --cache-control 'public, max-age=3600' $DIST s3://$BUCKET/next
-else
-    aws s3 sync --cache-control 'public, max-age=3600' $DIST s3://$BUCKET/next
-fi
+# if [ "x$3" == "x-d" ]; then
+#     aws s3 sync --delete --cache-control 'public, max-age=3600' $SOURCE s3://$BUCKET/next
+# else
+#     aws s3 sync --cache-control 'public, max-age=3600' $SOURCE s3://$BUCKET/next
+# fi
 
-aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --paths '/*'
+# aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --paths '/next/*'
 
 echo "DONE"
\ No newline at end of file