From 0b6cb8f16e4c7c649b7400595d47b78bb7016d58 Mon Sep 17 00:00:00 2001 From: ttionya Date: Sun, 8 Nov 2020 13:41:04 +0800 Subject: [PATCH] feat: extract common variables to includes file --- scripts/backup.sh | 6 ------ scripts/includes.sh | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/backup.sh b/scripts/backup.sh index 2bab90d..244308a 100644 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -3,8 +3,6 @@ . /app/includes.sh TODAY=$(date +%Y%m%d) -DATA_DIR="/bitwarden/data/" -BACKUP_DIR="/bitwarden/backup/" # backup bitwarden_rs database file BACKUP_FILE_DB="${BACKUP_DIR}/db.${TODAY}.sqlite3" # backup bitwarden_rs config file @@ -21,8 +19,6 @@ function clear_dir() { function backup_db() { color blue "backup bitwarden_rs sqlite database" - local DATA_DB="${DATA_DIR}/db.sqlite3" - if [[ -f "${DATA_DB}" ]]; then sqlite3 ${DATA_DB} ".backup ${BACKUP_FILE_DB}" else @@ -33,8 +29,6 @@ function backup_db() { function backup_config() { color blue "backup bitwarden_rs config" - local DATA_CONFIG="${DATA_DIR}/config.json" - if [[ -f "${DATA_CONFIG}" ]]; then cp -f ${DATA_DIR}/config.json ${BACKUP_FILE_CONFIG} else diff --git a/scripts/includes.sh b/scripts/includes.sh index d9a2859..88989a5 100644 --- a/scripts/includes.sh +++ b/scripts/includes.sh @@ -1,5 +1,10 @@ #!/bin/sh +DATA_DIR="/bitwarden/data/" +DATA_DB="${DATA_DIR}/db.sqlite3" +DATA_CONFIG="${DATA_DIR}/config.json" +DATA_ATTACHMENTS="${DATA_DIR}/attachments" +BACKUP_DIR="/bitwarden/backup/" #################### Function #################### ######################################## # Print colorful message.