ge/baka
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Fix commands executing and test

Browse Source
This commit is contained in:
gd 2022-01-02 22:13:35 +03:00
parent 91d4125f99
commit a151adeda8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/baka
View File

@ -247,7 +247,7 @@ bk_load_entry() {
loaded_entry="$(bk_load_conf "$1")" loaded_entry="$(bk_load_conf "$1")"
# Check required parameters. # Check required parameters.
if ! egrep "archive|copy|database|command" <<< "$loaded_entry" > /dev/null; then if ! egrep "^(archive|copy|database|command)=" <<< "$loaded_entry" > /dev/null; then
bk_err "$1: configuration error: no data to backup." bk_err "$1: configuration error: no data to backup."
fi fi
@ -461,7 +461,7 @@ bk_run_command() {
for cmd in "${entry_command[@]}"; do for cmd in "${entry_command[@]}"; do
bk_log -p "Executing command: $cmd" bk_log -p "Executing command: $cmd"
# Run! # Run!
eval "$(printf "$cmd") &>> "$log"" [ "$dry_run" ] || eval "$(printf "$cmd") &>> "$log""
done done
else else
bk_log -p "ERROR: tried to execute commands: ${entry_command[@]}" bk_log -p "ERROR: tried to execute commands: ${entry_command[@]}"
@ -888,18 +888,14 @@ bk_do_backup() {
bk_log -p "Local storage: $entry_local" bk_log -p "Local storage: $entry_local"
bk_log -p "Remote storage: $entry_remote" bk_log -p "Remote storage: $entry_remote"
#echo "RECOVERED LOCAL: ${entry_local//$dir_per_date/}" [ "${entry_command[@]}" ] && bk_run_command
[ "$dry_run" ] || { [ "$dry_run" ] || {
bk_run_command
bk_do_archive bk_do_archive
bk_do_copy bk_do_copy
bk_backup_database bk_backup_database
} }
[ "$dry_run" ] && { [ "$dry_run" ] && { bk_test_remote; }
bk_test_remote
}
# Backup END # Backup END