martinan/vaultwarden-backup
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix the restore failure problem

Browse Source
This commit is contained in:
ttionya committed 2021-03-03 01:06:28 +08:00
1 parent 61a53d0d0c
commit 3205724bc9
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scripts/includes.sh
+1 -1
View File
@@ -287,7 +287,7 @@ function init_env_dir() {
# DATA_ATTACHMENTS # DATA_ATTACHMENTS
get_env DATA_ATTACHMENTS get_env DATA_ATTACHMENTS
DATA_ATTACHMENTS="$(realpath "${DATA_ATTACHMENTS:-"${DATA_DIR}/attachments"}")" DATA_ATTACHMENTS="$(dirname "${DATA_ATTACHMENTS:-"${DATA_DIR}/attachments"}/useless")"
DATA_ATTACHMENTS_DIRNAME="$(dirname "${DATA_ATTACHMENTS}")" DATA_ATTACHMENTS_DIRNAME="$(dirname "${DATA_ATTACHMENTS}")"
DATA_ATTACHMENTS_BASENAME="$(basename "${DATA_ATTACHMENTS}")" DATA_ATTACHMENTS_BASENAME="$(basename "${DATA_ATTACHMENTS}")"
} }
scripts/restore.sh
+6 -6
View File
@@ -34,15 +34,15 @@ function restore_zip() {
fi fi
# get restore db file # get restore db file
FIND_FILE_DB="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/db.*.sqlite3) 2>/dev/null" )" FIND_FILE_DB="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/db.*.sqlite3 2>/dev/null)" )"
RESTORE_FILE_DB="${FIND_FILE_DB:-}" RESTORE_FILE_DB="${FIND_FILE_DB:-}"
# get restore config file # get restore config file
FIND_FILE_CONFIG="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/config.*.json) 2>/dev/null" )" FIND_FILE_CONFIG="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/config.*.json 2>/dev/null)" )"
RESTORE_FILE_CONFIG="${FIND_FILE_CONFIG:-}" RESTORE_FILE_CONFIG="${FIND_FILE_CONFIG:-}"
# get restore attachments file # get restore attachments file
FIND_FILE_ATTACHMENTS="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/attachments.*.tar) 2>/dev/null" )" FIND_FILE_ATTACHMENTS="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/attachments.*.tar 2>/dev/null)" )"
RESTORE_FILE_ATTACHMENTS="${FIND_FILE_ATTACHMENTS:-}" RESTORE_FILE_ATTACHMENTS="${FIND_FILE_ATTACHMENTS:-}"
RESTORE_FILE_ZIP="" RESTORE_FILE_ZIP=""
@@ -79,14 +79,14 @@ function restore_attachments() {
# When customizing the attachments folder, the root directory of the tar file # When customizing the attachments folder, the root directory of the tar file
# is the directory name at the time of packing # is the directory name at the time of packing
local RESTORE_FILE_ATTACHMENTS_DIRNAME=$(tar -tf "${DATA_ATTACHMENTS}" | head -n 1 | xargs basename) local RESTORE_FILE_ATTACHMENTS_DIRNAME=$(tar -tf "${RESTORE_FILE_ATTACHMENTS}" | head -n 1 | xargs basename)
local DATA_ATTACHMENTS_EXTRACT="${DATA_ATTACHMENTS}.extract" local DATA_ATTACHMENTS_EXTRACT="${DATA_ATTACHMENTS}.extract"
rm -rf "${DATA_ATTACHMENTS}" rm -rf "${DATA_ATTACHMENTS}" "${DATA_ATTACHMENTS_EXTRACT}"
mkdir "${DATA_ATTACHMENTS_EXTRACT}" mkdir "${DATA_ATTACHMENTS_EXTRACT}"
tar -x -C "${DATA_ATTACHMENTS_EXTRACT}" -f "${RESTORE_FILE_ATTACHMENTS}" tar -x -C "${DATA_ATTACHMENTS_EXTRACT}" -f "${RESTORE_FILE_ATTACHMENTS}"
mv "${DATA_ATTACHMENTS_EXTRACT}/${RESTORE_FILE_ATTACHMENTS_DIRNAME}" "${DATA_ATTACHMENTS}" mv "${DATA_ATTACHMENTS_EXTRACT}/${RESTORE_FILE_ATTACHMENTS_DIRNAME}" "${DATA_ATTACHMENTS}"
rf -rf "${DATA_ATTACHMENTS_EXTRACT}" rm -rf "${DATA_ATTACHMENTS_EXTRACT}"
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
color green "restore bitwarden_rs attachments successful" color green "restore bitwarden_rs attachments successful"