Compare commits

...

2 Commits

Author SHA1 Message Date
Clemens Schwaighofer
e1787fcfb3 Add missing DEBUG var setting for borg update wrapper script 2022-03-28 12:37:33 +09:00
Clemens Schwaighofer
0ce5442bcf Bug fix for update fix script
Add missing / for BASE_FOLDER if not set.

Dropped old file module borg name
2022-03-28 11:54:21 +09:00
2 changed files with 9 additions and 11 deletions

View File

@@ -9,6 +9,7 @@
# zabbix-settings-
export BORG_BASE_DIR="borg/";
DEBUG=0;
DRYRUN=0;
TARGET_USER="";
TARGET_HOST="";
@@ -25,7 +26,7 @@ MODULE_LIST="file gitea mysql pgsql zabbix"
while getopts ":c:nd" opt; do
case "${opt}" in
c|config)
BASE_FOLDER=${OPTARG};
BASE_FOLDER=${OPTARG}"/";
;;
d|debug)
DEBUG=1;
@@ -44,25 +45,22 @@ while getopts ":c:nd" opt; do
esac;
done;
[[ "${BASE_FOLDER}" != */ ]] && BASE_FOLDER=${BASE_FOLDER}"/";
if [ ! -d "${BASE_FOLDER}" ]; then
echo "Base folder not found: ${BASE_FOLDER}";
exit 1;
fi;
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}";
ORIG_BACKUPFILE=${BACKUP_FILE};
for MODULE in ${MODULE_LIST}; do
echo "************* MODULE: ${MODULE}";
BACKUP_FILE=${ORIG_BACKUPFILE};
# if [ -f "${BASE_FOLDER}${SETTINGS_FILE_SUB}" ]; then
# . "${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;
BACKUP_FILE=${BACKUP_FILE/.borg/-${MODULE,,}.borg};
TARGET_FOLDER=${TARGET_FOLDER%/}
TARGET_FOLDER=${TARGET_FOLDER#/}
# and add slash front and back and escape the path

View File

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