Compare commits

...

2 Commits

2 changed files with 23 additions and 12 deletions

View File

@ -329,7 +329,7 @@ else
fi fi
done done
fi fi
BORG_REPO="${FQPN_BORG_REPO%%.*}" BORG_REPO="${FQPN_BORG_REPO}"
LIST_OF_FILES_TO_RESTORE= LIST_OF_FILES_TO_RESTORE=
@ -407,6 +407,8 @@ if [[ ! ${FQHN_BORG_HOSTNAME} =~ ^127 ]] && [[ ! "${FQHN_BORG_HOSTNAME,,}" = "
BORG_RSH="${_BORG_RSH}" BORG_RSH="${_BORG_RSH}"
fi fi
done done
export BORG_RSH
fi fi
blank_line blank_line
@ -414,6 +416,10 @@ blank_line
echo -e "\033[32m--\033[m" echo -e "\033[32m--\033[m"
echo "" echo ""
export BORG_HOST
export BORG_PASSPHRASE
export BORG_REPO
# List Borg Backups # List Borg Backups
# #
( (
@ -437,9 +443,6 @@ done
echo -e " \033[33m---------------------------------------------\033[m" echo -e " \033[33m---------------------------------------------\033[m"
echo "" echo ""
export BORG_PASSPHRASE
export BORG_REPO
export BORG_RSH
_BORG_RESTORE_PATH="/data/RESTORE/$(basename "${BORG_REPO}")/${BORG_BACKUP_ID}" _BORG_RESTORE_PATH="/data/RESTORE/$(basename "${BORG_REPO}")/${BORG_BACKUP_ID}"

View File

@ -225,10 +225,10 @@ DEFAULT_BORG_RSH='ssh -i /root/.ssh/id_ed25519-borg-backup'
# ---------- # ----------
if [[ -f "$conf_file" ]]; then if [[ -z "${BORG_HOST}" ]] || [[ -z "${BORG_REPO}" ]] || [[ -z "${BORG_PASSPHRASE}" ]] ; then
if [[ -f "$conf_file" ]]; then
source "$conf_file" source "$conf_file"
else else
if [[ -z "${BORG_HOST}" ]] || [[ -z "${BORG_REPO}" ]] || [[ -z "${BORG_PASSPHRASE}" ]] ; then
fatal "No configuration file '$conf_file' present!" fatal "No configuration file '$conf_file' present!"
fi fi
fi fi
@ -280,10 +280,18 @@ export BORG_RELOCATED_REPO_ACCESS_IS_OK
echo -e " \033[1mDate\033[33GBorg Backup ID\033[m\n" echo -e " \033[1mDate\033[33GBorg Backup ID\033[m\n"
while read -r _borg_id _date_weekday _date_date _date_time _time_stamp_borg_backup || [[ -n $_line ]] ; do if [[ ${BORG_HOST} =~ ^127 ]] || [[ "${BORG_HOST,,}" =~ "localhost" ]] ; then
while read -r _borg_id _date_weekday _date_date _date_time _time_stamp_borg_backup || [[ -n $_line ]] ; do
echo -e " ${_date_weekday} ${_date_date} ${_date_time} [ \033[33m${_borg_id}\033[m ]" echo -e " ${_date_weekday} ${_date_date} ${_date_time} [ \033[33m${_borg_id}\033[m ]"
done < <(borg list ${BORG_URL} 2> /dev/null) done < <(borg list ${BORG_REPO} 2> /dev/null)
else
while read -r _borg_id _date_weekday _date_date _date_time _time_stamp_borg_backup || [[ -n $_line ]] ; do
echo -e " ${_date_weekday} ${_date_date} ${_date_time} [ \033[33m${_borg_id}\033[m ]"
done < <(borg list ${BORG_URL} 2> /dev/null)
fi
clean_up 0 clean_up 0