msb/bashup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add bashup::set-existing_backups function

Browse Source
This commit is contained in:
Matthew Saunders Brown 2024-08-15 12:58:40 -07:00
parent 3e60032793
commit 8fc3322505
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sbin/bashup-backup-files.sh
View File

@ -8,6 +8,7 @@
source $(dirname $0)/bashup.sh source $(dirname $0)/bashup.sh
bashup::set-retention_array bashup::set-retention_array
bashup::set-existing_backups
# create backup for today # create backup for today
if [[ " ${retention_array[@]} " =~ " ${today} " ]]; then if [[ " ${retention_array[@]} " =~ " ${today} " ]]; then

1
sbin/bashup-list-backups.sh
View File

@ -92,6 +92,7 @@ if [ ! -z "$backup" ]; then
fi fi
else else
# output list of backups (dates) # output list of backups (dates)
bashup::set-existing_backups
for existing_backup in "${existing_backups[@]}"; do for existing_backup in "${existing_backups[@]}"; do
echo $existing_backup echo $existing_backup
done done

2
sbin/bashup-restore-files.sh
View File

@ -52,7 +52,7 @@ while getopts "b:np:h" opt; do
esac esac
done done
bashup::set_existing_backups bashup::set-existing_backups
# prompt if backup was not set on command line # prompt if backup was not set on command line
if [ -z "$backup" ] ; then if [ -z "$backup" ] ; then

2
sbin/bashup-restore-mysql.sh
View File

@ -52,7 +52,7 @@ while getopts "b:d:nh" opt; do
esac esac
done done
bashup::set_existing_backups bashup::set-existing_backups
# prompt if backup was not set on command line # prompt if backup was not set on command line
if [ -z "$backup" ] ; then if [ -z "$backup" ] ; then

2
sbin/bashup-restore-pdns.sh
View File

@ -52,7 +52,7 @@ while getopts "b:nz:h" opt; do
esac esac
done done
bashup::set_existing_backups bashup::set-existing_backups
# prompt if backup was not set on command line # prompt if backup was not set on command line
if [ -z "$backup" ] ; then if [ -z "$backup" ] ; then

16
sbin/bashup.sh
View File

@ -106,14 +106,16 @@ fi
# get todays date (backup dir name) # get todays date (backup dir name)
today=$(date +%Y%m%d) today=$(date +%Y%m%d)
# set existing_backups array function bashup::set-existing_backups () {
existing_backups=($(ls $backup_storage_dir|grep -v lost+found)) # set existing_backups array
# if script is a *-backup-* script remove today from existing backups, if it exists. we do other checks avoid re-doing backups existing_backups=($(ls $backup_storage_dir|grep -v lost+found))
if [[ "$0" == *"-backup-"* ]];then # if script is a *-backup-* script remove today from existing backups, if it exists. we do other checks avoid re-doing backups
if [[ " ${existing_backups[@]} " =~ " ${today} " ]]; then if [[ "$0" == *"-backup-"* ]];then
unset 'existing_backups[-1]'; if [[ " ${existing_backups[@]} " =~ " ${today} " ]]; then
unset 'existing_backups[-1]';
fi
fi fi
fi }
function bashup::set-retention_array () { function bashup::set-retention_array () {