From 9e04fc1712f369c43489c5045428ef82929ce4e6 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 24 Nov 2025 20:22:55 +0800
Subject: [PATCH 1/2] remove s3:// S3_BUCKET prefix added in error

---
 application/backup.sh  | 6 +++---
 application/restore.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/backup.sh b/application/backup.sh
index 56398c8..96d4724 100755
--- a/application/backup.sh
+++ b/application/backup.sh
@@ -121,7 +121,7 @@ fi
 
 # Upload compressed backup file to S3
 start=$(date +%s);
-aws s3 cp "/tmp/${DB_NAME}.sql.gz" "s3://${S3_BUCKET}/${DB_NAME}.sql.gz" || STATUS=$?
+aws s3 cp "/tmp/${DB_NAME}.sql.gz" "${S3_BUCKET}/${DB_NAME}.sql.gz" || STATUS=$?
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy backup to ${S3_BUCKET} of ${DB_NAME} returned non-zero status ($STATUS) in $(expr ${end} - ${start}) seconds.";
     log "ERROR" "${error_message}";
@@ -130,7 +130,7 @@ if [ $STATUS -ne 0 ]; then
 fi
 
 # Upload checksum file
-aws s3 cp "/tmp/${DB_NAME}.sql.sha256.gz" "s3://${S3_BUCKET}/${DB_NAME}.sql.sha256.gz" || STATUS=$?;
+aws s3 cp "/tmp/${DB_NAME}.sql.sha256.gz" "${S3_BUCKET}/${DB_NAME}.sql.sha256.gz" || STATUS=$?;
 end=$(date +%s);
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy checksum to ${S3_BUCKET} of ${DB_NAME} returned non-zero status ($STATUS).";
@@ -146,7 +146,7 @@ if [ "${B2_BUCKET}" != "" ]; then
     start=$(date +%s);
     AWS_ACCESS_KEY_ID="${B2_APPLICATION_KEY_ID}" \
     AWS_SECRET_ACCESS_KEY="${B2_APPLICATION_KEY}" \
-    aws s3 cp "/tmp/${DB_NAME}.sql.gz" "s3://${B2_BUCKET}/${DB_NAME}.sql.gz" \
+    aws s3 cp "/tmp/${DB_NAME}.sql.gz" "${B2_BUCKET}/${DB_NAME}.sql.gz" \
       --endpoint-url "https://${B2_HOST}"
     STATUS=$?;
     end=$(date +%s);
diff --git a/application/restore.sh b/application/restore.sh
index 8bcd389..10467c0 100755
--- a/application/restore.sh
+++ b/application/restore.sh
@@ -95,7 +95,7 @@ log "INFO" "${MYNAME}: copying database ${DB_NAME} backup and checksum from ${S3
 start=$(date +%s)
 
 # Download database backup
-aws s3 cp s3://${S3_BUCKET}/${DB_NAME}.sql.gz /tmp/${DB_NAME}.sql.gz || STATUS=$?
+aws s3 cp "${S3_BUCKET}/${DB_NAME}.sql.gz" "/tmp/${DB_NAME}.sql.gz" || STATUS=$?
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy backup of ${DB_NAME} from ${S3_BUCKET} returned non-zero status ($STATUS) in $(expr $(date +%s) - ${start}) seconds."
     log "ERROR" "${error_message}"
@@ -104,7 +104,7 @@ if [ $STATUS -ne 0 ]; then
 fi
 
 # Download checksum file
-aws s3 cp s3://${S3_BUCKET}/${DB_NAME}.sql.sha256.gz /tmp/${DB_NAME}.sql.sha256.gz || STATUS=$?
+aws s3 cp "${S3_BUCKET}/${DB_NAME}.sql.sha256.gz" "/tmp/${DB_NAME}.sql.sha256.gz" || STATUS=$?
 end=$(date +%s)
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy checksum of ${DB_NAME} from ${S3_BUCKET} returned non-zero status ($STATUS) in $(expr ${end} - ${start}) seconds."

From ff78d471aaf33536eb15f07cf212ad5086af3394 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 24 Nov 2025 21:11:54 +0800
Subject: [PATCH 2/2] oops, B2_BUCKET does NOT have a s3:// prefix already

---
 application/backup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/backup.sh b/application/backup.sh
index 96d4724..84ce6df 100755
--- a/application/backup.sh
+++ b/application/backup.sh
@@ -146,7 +146,7 @@ if [ "${B2_BUCKET}" != "" ]; then
     start=$(date +%s);
     AWS_ACCESS_KEY_ID="${B2_APPLICATION_KEY_ID}" \
     AWS_SECRET_ACCESS_KEY="${B2_APPLICATION_KEY}" \
-    aws s3 cp "/tmp/${DB_NAME}.sql.gz" "${B2_BUCKET}/${DB_NAME}.sql.gz" \
+    aws s3 cp "/tmp/${DB_NAME}.sql.gz" "s3://${B2_BUCKET}/${DB_NAME}.sql.gz" \
       --endpoint-url "https://${B2_HOST}"
     STATUS=$?;
     end=$(date +%s);