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

fix: fix the wrong rsa_key compressed file name for searching when restoring (fixed #32)

Browse Source
This commit is contained in:
ttionya committed 2021-09-25 00:07:43 +08:00
1 parent 8ce5aecaf4
commit 63224c0f4f
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
scripts/restore.sh
+4 -4
View File
@@ -46,7 +46,7 @@ function restore_zip() {
RESTORE_FILE_CONFIG="${FIND_FILE_CONFIG:-}" RESTORE_FILE_CONFIG="${FIND_FILE_CONFIG:-}"
# get restore rsakey file # get restore rsakey file
FIND_FILE_RSAKEY="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/rsakey.*.json 2>/dev/null)" )" FIND_FILE_RSAKEY="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/rsakey.*.tar 2>/dev/null)" )"
RESTORE_FILE_RSAKEY="${FIND_FILE_RSAKEY:-}" RESTORE_FILE_RSAKEY="${FIND_FILE_RSAKEY:-}"
# get restore attachments file # get restore attachments file
@@ -89,7 +89,7 @@ function restore_config() {
function restore_rsakey() { function restore_rsakey() {
color blue "restore vaultwarden rsakey" color blue "restore vaultwarden rsakey"
mkdir "${DATA_RSAKEY_DIRNAME}" mkdir -p "${DATA_RSAKEY_DIRNAME}"
tar -x -C "${DATA_RSAKEY_DIRNAME}" -f "${RESTORE_FILE_RSAKEY}" tar -x -C "${DATA_RSAKEY_DIRNAME}" -f "${RESTORE_FILE_RSAKEY}"
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
@@ -108,7 +108,7 @@ function restore_attachments() {
local DATA_ATTACHMENTS_EXTRACT="${DATA_ATTACHMENTS}.extract" local DATA_ATTACHMENTS_EXTRACT="${DATA_ATTACHMENTS}.extract"
rm -rf "${DATA_ATTACHMENTS}" "${DATA_ATTACHMENTS_EXTRACT}" rm -rf "${DATA_ATTACHMENTS}" "${DATA_ATTACHMENTS_EXTRACT}"
mkdir "${DATA_ATTACHMENTS_EXTRACT}" mkdir -p "${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}"
rm -rf "${DATA_ATTACHMENTS_EXTRACT}" rm -rf "${DATA_ATTACHMENTS_EXTRACT}"
@@ -129,7 +129,7 @@ function restore_sends() {
local DATA_SENDS_EXTRACT="${DATA_SENDS}.extract" local DATA_SENDS_EXTRACT="${DATA_SENDS}.extract"
rm -rf "${DATA_SENDS}" "${DATA_SENDS_EXTRACT}" rm -rf "${DATA_SENDS}" "${DATA_SENDS_EXTRACT}"
mkdir "${DATA_SENDS_EXTRACT}" mkdir -p "${DATA_SENDS_EXTRACT}"
tar -x -C "${DATA_SENDS_EXTRACT}" -f "${RESTORE_FILE_SENDS}" tar -x -C "${DATA_SENDS_EXTRACT}" -f "${RESTORE_FILE_SENDS}"
mv "${DATA_SENDS_EXTRACT}/${RESTORE_FILE_SENDS_DIRNAME}" "${DATA_SENDS}" mv "${DATA_SENDS_EXTRACT}/${RESTORE_FILE_SENDS_DIRNAME}" "${DATA_SENDS}"
rm -rf "${DATA_SENDS_EXTRACT}" rm -rf "${DATA_SENDS_EXTRACT}"