fix b2 script

This commit is contained in:
Vassiliy Yegorov
2020-02-26 12:19:21 +07:00
parent 5a5edbfd43
commit 5b830d227a
+6 -11
View File
@@ -1,16 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
B2_BUCKET=${B2_BUCKET:-${REMOTE_DIR%%/*}} B2_REMOTE_DIR=${STORAGE_PATH#*/}
B2_REMOTE_DIR=${REMOTE_DIR#*/} B2_BUCKET=${STORAGE_PATH%%/*}
Var::check B2_BUCKET
# Добавляем в конце '/' # Добавляем в конце '/'
if [[ -n "${B2_REMOTE_DIR}" ]] && [[ ${B2_REMOTE_DIR} != */ ]]; then B2_REMOTE_DIR="${B2_REMOTE_DIR}/"; fi if [[ -n "${B2_REMOTE_DIR}" ]] && [[ ${B2_REMOTE_DIR} != */ ]]; then B2_REMOTE_DIR="${B2_REMOTE_DIR}/"; fi
# Полное имя архива на хранилище # Полное имя архива на хранилище
B2_ARCHIVE=${B2_REMOTE_DIR}${REMOTE_ARCHIVE} B2_ARCHIVE=${B2_REMOTE_DIR}${REMOTE_ARCHIVE}
B2_ACCOUNT_ID=${B2_ACCOUNT_ID} B2_ACCOUNT_ID=${ACCOUNT_ID}
B2_APPLICATION_KEY=${B2_APPLICATION_KEY} B2_APPLICATION_KEY=${APPLICATION_KEY}
B2_CONNECTION= B2_CONNECTION=
@@ -29,8 +28,7 @@ storage_login() {
} }
storage_download() { storage_download() {
if Var::isFalse ${B2_CONNECTION}; then storage_login; fi [ -z ${B2_CONNECTION} ] && storage_login
b2 download-file-by-name ${B2_BUCKET} ${B2_ARCHIVE} ${ARCHIVE} b2 download-file-by-name ${B2_BUCKET} ${B2_ARCHIVE} ${ARCHIVE}
log "Download \"${B2_ARCHIVE}\" from busket \"${B2_BUCKET}\" \n\t as \"${ARCHIVE}\"" log "Download \"${B2_ARCHIVE}\" from busket \"${B2_BUCKET}\" \n\t as \"${ARCHIVE}\""
@@ -38,11 +36,8 @@ storage_download() {
} }
storage_upload() { storage_upload() {
if Var::isFalse ${B2_CONNECTION}; then storage_login; fi [ -z ${B2_CONNECTION} ] && storage_login
if Var::isFalse ${DRY_RUN}; then
b2 upload-file ${B2_BUCKET} ${ARCHIVE} ${B2_ARCHIVE} b2 upload-file ${B2_BUCKET} ${ARCHIVE} ${B2_ARCHIVE}
fi
log "Upload \"${ARCHIVE}\" \n\t as \"${B2_ARCHIVE}\" in \"${B2_BUCKET}\"" log "Upload \"${ARCHIVE}\" \n\t as \"${B2_ARCHIVE}\" in \"${B2_BUCKET}\""
return $? return $?