ScriptsCollections/BorgBackupWrapper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix for update fix script

Browse Source 
Add missing / for BASE_FOLDER if not set.

Dropped old file module borg name
This commit is contained in:
Clemens Schwaighofer
2022-03-28 11:54:21 +09:00
parent d9346c84a7
commit 2a53188aed
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
_borg_backup_set_prefix_cleanup.sh
View File

@@ -25,7 +25,7 @@ MODULE_LIST="file gitea mysql pgsql zabbix"
while getopts ":c:nd" opt; do while getopts ":c:nd" opt; do
case "${opt}" in case "${opt}" in
c|config) c|config)
BASE_FOLDER=${OPTARG}; BASE_FOLDER=${OPTARG}"/";
;; ;;
d|debug) d|debug)
DEBUG=1; DEBUG=1;
@@ -44,25 +44,22 @@ while getopts ":c:nd" opt; do
esac; esac;
done; done;
[[ "${BASE_FOLDER}" != */ ]] && BASE_FOLDER=${BASE_FOLDER}"/";
if [ ! -d "${BASE_FOLDER}" ]; then if [ ! -d "${BASE_FOLDER}" ]; then
echo "Base folder not found: ${BASE_FOLDER}"; echo "Base folder not found: ${BASE_FOLDER}";
exit 1; exit 1;
fi; fi;
SETTINGS_FILE="borg.backup.settings"; SETTINGS_FILE="borg.backup.settings";
if [ ! -f "${BASE_FOLDER}${SETTINGS_FILE}" ]; then
echo "Could not find: ${BASE_FOLDER}${SETTINGS_FILE}";
exit;
fi;
. "${BASE_FOLDER}${SETTINGS_FILE}"; . "${BASE_FOLDER}${SETTINGS_FILE}";
ORIG_BACKUPFILE=${BACKUP_FILE}; ORIG_BACKUPFILE=${BACKUP_FILE};
for MODULE in ${MODULE_LIST}; do for MODULE in ${MODULE_LIST}; do
echo "************* MODULE: ${MODULE}"; echo "************* MODULE: ${MODULE}";
BACKUP_FILE=${ORIG_BACKUPFILE}; BACKUP_FILE=${ORIG_BACKUPFILE};
# if [ -f "${BASE_FOLDER}${SETTINGS_FILE_SUB}" ]; then BACKUP_FILE=${BACKUP_FILE/.borg/-${MODULE,,}.borg};
# . "${BASE_FOLDER}${SETTINGS_FILE_SUB}";
# fi;
# SETTINGS_FILE_SUB=$(echo "${SETTINGS_FILE}" | sed -e "s/\.settings/\.${MODULE,,}\.settings/");
if [ "${MODULE,,}" != "file" ]; then
BACKUP_FILE=${BACKUP_FILE/.borg/-${MODULE,,}.borg};
fi;
TARGET_FOLDER=${TARGET_FOLDER%/} TARGET_FOLDER=${TARGET_FOLDER%/}
TARGET_FOLDER=${TARGET_FOLDER#/} TARGET_FOLDER=${TARGET_FOLDER#/}
# and add slash front and back and escape the path # and add slash front and back and escape the path

2
borg.backup.functions.init.sh
View File

@@ -19,7 +19,7 @@ function version {
} }
# version for all general files # version for all general files
VERSION="4.1.0"; VERSION="4.1.1";
# borg version and borg comamnd # borg version and borg comamnd
BORG_VERSION=""; BORG_VERSION="";