From ef47e9e60e942a6063ddbd127d09df6b94e787c1 Mon Sep 17 00:00:00 2001
From: Umberto Baldi <u.baldi@arduino.cc>
Date: Wed, 18 Aug 2021 13:20:29 +0200
Subject: [PATCH 1/2] use s3 sync instead of ugly script to upload index to
 downloads server

---
 .github/workflows/generate-index.yml |  4 +++-
 generator/s3Copy.sh                  | 11 -----------
 2 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100755 generator/s3Copy.sh

diff --git a/.github/workflows/generate-index.yml b/.github/workflows/generate-index.yml
index 377c9fba..c229afe6 100644
--- a/.github/workflows/generate-index.yml
+++ b/.github/workflows/generate-index.yml
@@ -76,7 +76,9 @@ jobs:
         run: gzip --keep boards/module_firmware_index.json
 
       - name: s3 sync
-        run: ./s3Copy.sh . s3://arduino-downloads-prod-beagle/arduino-fwuploader
+        run: |
+          s3 sync boards/ s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-fwuploader/boards
+          s3 sync firmwares/ s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-fwuploader/firmwares
         env:
           AWS_REGION: "us-east-1" # or https://github.com/aws/aws-cli/issues/5623
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/generator/s3Copy.sh b/generator/s3Copy.sh
deleted file mode 100755
index fc6f78a2..00000000
--- a/generator/s3Copy.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-path=$1 # the path of the directory where the files and directories that need to be copied are located
-s3Dir=$2 # the s3 bucket path
-
-for entry in "$path"/*; do
-    name=`echo $entry | sed 's/.*\///'`  # getting the name of the file or directory
-    if [[ -d  $entry ]]; then  # if it is a directory
-        aws s3 cp  --recursive "$name" "$s3Dir/$name/"
-    else  # if it is a file
-        aws s3 cp "$name" "$s3Dir/" --exclude "generator.py" --exclude "raw_boards.json" --exclude "s3Copy.sh"
-    fi
-done

From 5094cd9204972d0c98a335f35a98104fc77de045 Mon Sep 17 00:00:00 2001
From: Umberto Baldi <34278123+umbynos@users.noreply.github.com>
Date: Wed, 18 Aug 2021 15:38:31 +0200
Subject: [PATCH 2/2] Update .github/workflows/generate-index.yml

Co-authored-by: Roberto Sora <r.sora@arduino.cc>
---
 .github/workflows/generate-index.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generate-index.yml b/.github/workflows/generate-index.yml
index c229afe6..3c23012b 100644
--- a/.github/workflows/generate-index.yml
+++ b/.github/workflows/generate-index.yml
@@ -77,8 +77,8 @@ jobs:
 
       - name: s3 sync
         run: |
-          s3 sync boards/ s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-fwuploader/boards
-          s3 sync firmwares/ s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-fwuploader/firmwares
+          aws s3 sync boards/ s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-fwuploader/boards
+          aws s3 sync firmwares/ s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-fwuploader/firmwares
         env:
           AWS_REGION: "us-east-1" # or https://github.com/aws/aws-cli/issues/5623
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}