From 590169bb2f66abc3682399d455c6c4cb7c815bb3 Mon Sep 17 00:00:00 2001 From: Daniel Vu Date: Fri, 29 Sep 2023 19:48:44 -0400 Subject: [PATCH] Fixes rsync destinations --- gcp.sh | 4 ++-- release-ci.sh | 5 ++--- update.sh | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gcp.sh b/gcp.sh index 517d775e86f..76ec0ebb785 100755 --- a/gcp.sh +++ b/gcp.sh @@ -1,5 +1,5 @@ #!/bin/bash # You need GCloud Access to the dropbox to run this script -gcloud storage rsync --project=roll20-actual "$1/dist" "$3" --delete-unmatched-destination-objects --cache-control='no-cache' --no-clobber -gcloud storage rsync --project=roll20-actual "$1/translations" "$4" --delete-unmatched-destination-objects --cache-control='no-cache' --no-clobber || true +gcloud storage rsync --project=roll20-actual "$1/dist" "$3" --delete-unmatched-destination-objects --cache-control='no-cache' +gcloud storage rsync --project=roll20-actual "$1/translations" "$4" --delete-unmatched-destination-objects --cache-control='no-cache' || true diff --git a/release-ci.sh b/release-ci.sh index 8e82d62d9a6..461fdbfa92e 100755 --- a/release-ci.sh +++ b/release-ci.sh @@ -3,7 +3,6 @@ CURRENT_DIR=$(printf '%s\n' "${PWD##*/}") -gcloud storage rsync --project=roll20-actual ./ "gs://roll20-cdn/$CDN_SHEETS_FOLDER/$CURRENT_DIR" --delete-unmatched-destination-objects --cache-control='no-cache' --exclude=".*\.css$|.*\.html$|.*\.md$|.*\.sh$|TODO$" --no-clobber -gcloud storage rsync --project=roll20-actual ./dist "gs://roll20-cdn/$CDN_SHEETS_FOLDER/$CURRENT_DIR/dist" --delete-unmatched-destination-objects --cache-control='no-cache' --no-clobber -gcloud storage rsync --project=roll20-actual ./translations "gs://roll20-cdn/$CDN_SHEETS_FOLDER/$CURRENT_DIR/translations" --delete-unmatched-destination-objects --cache-control='no-cache' --no-clobber || true +gcloud storage rsync --project=roll20-actual ./dist "gs://roll20-cdn/$CDN_SHEETS_FOLDER/$CURRENT_DIR/dist" --delete-unmatched-destination-objects --cache-control='no-cache' +gcloud storage rsync --project=roll20-actual ./translations "gs://roll20-cdn/$CDN_SHEETS_FOLDER/$CURRENT_DIR/translations" --delete-unmatched-destination-objects --cache-control='no-cache' || true diff --git a/update.sh b/update.sh index 3cde83908fa..a01756a8d63 100755 --- a/update.sh +++ b/update.sh @@ -5,4 +5,4 @@ touch sync_sheets.sh echo '#!/bin/bash' > sync_sheets.sh echo 'set -e' >> sync_sheets.sh chmod +x sync_sheets.sh -fd dist --type d --strip-cwd-prefix -j1 --exec bash -c 'echo ./gcp.sh \"$(printf "%s" "{//}")\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s\n" "{//}")\" \"$(printf "%s" "{//}")/dist\" \"$(printf "%s" "{//}")/translations\"' | tee -a sync_sheets.sh +fd dist --type d --strip-cwd-prefix -j1 --exec bash -c 'echo ./gcp.sh \"$(printf "%s" "{//}")\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s\n" "{//}")\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s" "{//}")/dist\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s" "{//}")/translations\"' | tee -a sync_sheets.sh