From f366e7d97b11c00f5021723707dd952075aa5954 Mon Sep 17 00:00:00 2001 From: Christoph Date: Tue, 2 Jul 2024 23:05:19 +0200 Subject: [PATCH] Fix error lpoading configuration file. --- borg-delete-archive.sh | 7 ++++++- borg-list-backups.sh | 6 +++++- borg-mount-archiv.sh | 7 ++++++- borg-umount-archiv.sh | 7 ++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/borg-delete-archive.sh b/borg-delete-archive.sh index 3f86dd9..254981c 100755 --- a/borg-delete-archive.sh +++ b/borg-delete-archive.sh @@ -3,7 +3,12 @@ script_name="$(basename $(realpath $0))" working_dir="$(dirname $(realpath $0))" -conf_file="${working_dir}/conf/borg-backup-nc.conf" + +if [[ -f "${working_dir}/conf/borg-backup-nc.conf" ]] ; then + conf_file="${working_dir}/conf/borg-backup-nc.conf" +else + conf_file="${working_dir}/conf/borg-backup.conf" +fi LOCK_DIR="/tmp/${script_name%%.*}.LOCK" log_file="${LOCK_DIR}/${script_name%%.*}.log" diff --git a/borg-list-backups.sh b/borg-list-backups.sh index 356882a..99e4dd3 100755 --- a/borg-list-backups.sh +++ b/borg-list-backups.sh @@ -3,7 +3,11 @@ script_name="$(basename $(realpath $0))" working_dir="$(dirname $(realpath $0))" -conf_file="${working_dir}/conf/borg-backup-nc.conf" +if [[ -f "${working_dir}/conf/borg-backup-nc.conf" ]] ; then + conf_file="${working_dir}/conf/borg-backup-nc.conf" +else + conf_file="${working_dir}/conf/borg-backup.conf" +fi LOCK_DIR="/tmp/${script_name%%.*}.LOCK" log_file="${LOCK_DIR}/${script_name%%.*}.log" diff --git a/borg-mount-archiv.sh b/borg-mount-archiv.sh index 1878da3..42a1b21 100755 --- a/borg-mount-archiv.sh +++ b/borg-mount-archiv.sh @@ -3,7 +3,12 @@ script_name="$(basename $(realpath $0))" working_dir="$(dirname $(realpath $0))" -conf_file="${working_dir}/conf/borg-backup-nc.conf" + +if [[ -f "${working_dir}/conf/borg-backup-nc.conf" ]] ; then + conf_file="${working_dir}/conf/borg-backup-nc.conf" +else + conf_file="${working_dir}/conf/borg-backup.conf" +fi LOCK_DIR="/tmp/${script_name%%.*}.LOCK" log_file="${LOCK_DIR}/${script_name%%.*}.log" diff --git a/borg-umount-archiv.sh b/borg-umount-archiv.sh index a98f837..fd3f0cc 100755 --- a/borg-umount-archiv.sh +++ b/borg-umount-archiv.sh @@ -3,7 +3,12 @@ script_name="$(basename $(realpath $0))" working_dir="$(dirname $(realpath $0))" -conf_file="${working_dir}/conf/borg-backup-nc.conf" + +if [[ -f "${working_dir}/conf/borg-backup-nc.conf" ]] ; then + conf_file="${working_dir}/conf/borg-backup-nc.conf" +else + conf_file="${working_dir}/conf/borg-backup.conf" +fi LOCK_DIR="/tmp/${script_name%%.*}.LOCK" log_file="${LOCK_DIR}/${script_name%%.*}.log"