From 252319848c499f5e690769d973b01df459d53dd2 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Wed, 15 Dec 2021 12:50:26 +0900
Subject: [PATCH] Fix zabbix dump var name, remove repository replace

in all BORG_* calls remove the REPOSITORY replace as the repository is
set beforehand for the module

Fix the ZABBIX_DUMP_BIN name in settings and check
---
 borg.backup.gitea.sh                | 9 ++++-----
 borg.backup.zabbix.settings-default | 2 +-
 borg.backup.zabbix.sh               | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/borg.backup.gitea.sh b/borg.backup.gitea.sh
index f00ae08..c038ff3 100755
--- a/borg.backup.gitea.sh
+++ b/borg.backup.gitea.sh
@@ -47,12 +47,11 @@ FILENAME="gitea.backup.zip";
 BACKUP_SET_NAME="gitea-${BACKUP_SET}";
 BACKUP_SET_PREFIX="gitea-";
 
-# borg call, replace ##...## parts
-# _BORG_CALL="borg create ${OPT_REMOTE} -v ${OPT_LIST} ${OPT_PROGRESS} ${OPT_COMPRESSION} -s --stdin-name ##FILENAME## ${REPOSITORY}::##BACKUP_SET## -";
-# _BORG_PRUNE="borg prune ${OPT_REMOTE} -v -s --list ${PRUNE_DEBUG} -P ##BACKUP_SET_PREFIX## ${KEEP_OPTIONS[*]} ${REPOSITORY}";
 # borg call
-BORG_CALL=$(echo "${_BORG_CALL}" | sed -e "s/##FILENAME##/${FILENAME}/" | sed -e "s|##REPOSITORY##|${REPOSITORY}|" | sed -e "s/##BACKUP_SET##/${BACKUP_SET}/");
-BORG_PRUNE=$(echo "${_BORG_PRUNE}" | sed -e "s|##REPOSITORY##|${REPOSITORY}|" | sed -e "s/##BACKUP_SET_PREFIX##/${BACKUP_SET_PREFIX}/");
+# BORG_CALL=$(echo "${_BORG_CALL}" | sed -e "s/##FILENAME##/${FILENAME}/" | sed -e "s|##REPOSITORY##|${REPOSITORY}|" | sed -e "s/##BACKUP_SET##/${BACKUP_SET}/");
+BORG_CALL=$(echo "${_BORG_CALL}" | sed -e "s/##FILENAME##/${FILENAME}/" | sed -e "s/##BACKUP_SET##/${BACKUP_SET}/");
+# BORG_PRUNE=$(echo "${_BORG_PRUNE}" | sed -e "s|##REPOSITORY##|${REPOSITORY}|" | sed -e "s/##BACKUP_SET_PREFIX##/${BACKUP_SET_PREFIX}/");
+BORG_PRUNE=$(echo "${_BORG_PRUNE}" | sed -e "s/##BACKUP_SET_PREFIX##/${BACKUP_SET_PREFIX}/");
 echo "--- [git data and database: $(date +'%F %T')] --[${MODULE}]------------------------------------>";
 if [ ${DEBUG} -eq 1 ] || [ ${DRYRUN} -eq 1 ]; then
 	echo "sudo -u ${GIT_USER} ${GITEA_BIN} dump -c ${GITEA_CONFIG} -w ${GITEA_TMP} -L -f - | ${BORG_CALL}";
diff --git a/borg.backup.zabbix.settings-default b/borg.backup.zabbix.settings-default
index 3847cef..a446ed3 100644
--- a/borg.backup.zabbix.settings-default
+++ b/borg.backup.zabbix.settings-default
@@ -8,7 +8,7 @@
 # location for the zabbix dump script
 # Source: https://github.com/npotorino/zabbix-backup
 # if not set use /usr/local/bin
-ZABBIX_DUMP="";
+ZABBIX_DUMP_BIN="";
 # either psql or mysql, must be set
 ZABBIX_DATABASE="";
 # config location (default /etc/zabbiz/zabbix_server.conf)
diff --git a/borg.backup.zabbix.sh b/borg.backup.zabbix.sh
index a93edf6..8ddb4ee 100755
--- a/borg.backup.zabbix.sh
+++ b/borg.backup.zabbix.sh
@@ -36,8 +36,8 @@ if [ "${ZABBIX_DATABASE}" != "psql" ] && [ "${ZABBIX_DATABASE}" != "mysql" ]; th
 	echo "[! $(date +'%F %T')] Zabbix dump must have database set to either psql or mysql";
 	exit 1;
 fi;
-if [ ! -f "${ZABBIX_DUMP}" ]; then
-	echo "[! $(date +'%F %T')] Zabbix dump script could not be found: ${ZABBIX_DUMP}";
+if [ ! -f "${ZABBIX_DUMP_BIN}" ]; then
+	echo "[! $(date +'%F %T')] Zabbix dump script could not be found: ${ZABBIX_DUMP_BIN}";
 	exit 1;
 fi;
 # -i (ignore)/ -f (backup)
@@ -54,8 +54,8 @@ BACKUP_SET="zabbix-settings-${BACKUP_SET}";
 BACKUP_SET_PREFIX="zabbix-settings-";
 
 # borg call
-BORG_CALL=$(echo "${_BORG_CALL}" | sed -e "s/##FILENAME##/${FILENAME}/" | sed -e "s|##REPOSITORY##|${REPOSITORY}|" | sed -e "s/##BACKUP_SET##/${BACKUP_SET}/");
-BORG_PRUNE=$(echo "${_BORG_PRUNE}" | sed -e "s|##REPOSITORY##|${REPOSITORY}|" | sed -e "s/##BACKUP_SET_PREFIX##/${BACKUP_SET_PREFIX}/");
+BORG_CALL=$(echo "${_BORG_CALL}" | sed -e "s/##FILENAME##/${FILENAME}/" | sed -e "s/##BACKUP_SET##/${BACKUP_SET}/");
+BORG_PRUNE=$(echo "${_BORG_PRUNE}" | sed -e "s/##BACKUP_SET_PREFIX##/${BACKUP_SET_PREFIX}/");
 # if prefix is emtpy remote "-P"
 if [ -z "${BACKUP_SET_PREFIX}" ]; then
 	BORG_PRUNE=$(echo "${BORG_PRUNE}" | sed -e 's/-P //');