From 47f599146c19f0d4bedcfba089ec9f31263bec89 Mon Sep 17 00:00:00 2001 From: Mar Alegre Date: Fri, 17 Jul 2020 19:12:14 -0500 Subject: [PATCH 1/2] updated mcbe-backup to not fail if it gets no output from initial command --- src/mcbe/assets/bin/mcbe-backup | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/mcbe/assets/bin/mcbe-backup b/src/mcbe/assets/bin/mcbe-backup index 9c8866d..695a6b6 100755 --- a/src/mcbe/assets/bin/mcbe-backup +++ b/src/mcbe/assets/bin/mcbe-backup @@ -28,12 +28,6 @@ if [[ $status != active ]]; then exit fi -# check if save is currently in progress -if [[ $(mcbe-exec save query) != "A previous save has not been completed." ]]; then - echo "Error: a save seems to be currently in progress. Did the previous save run correctly?" - exit 1 -fi - # create backup dir if [[ ! -d "$backup_dir" ]]; then echo "Creating directory \"$backup_dir\" ..." @@ -42,7 +36,12 @@ fi cd "$backup_dir" # prepare backup of active world -mcbe-exec save hold +status=$(mcbe-exec save hold) +if [[ $status == "The command is already running" ]]; then + echo "Error: a save seems to be currently in progress. Did the previous save run correctly?" + mcbe-exec save resume + exit 1 +fi timeout=0 buffer=$(mcbe-exec save query) until echo "$buffer" | grep -q 'Data saved'; do From acad3ad07e8374ab33023e0b6e542898535b88cf Mon Sep 17 00:00:00 2001 From: Mar Alegre Date: Sat, 18 Jul 2020 10:37:44 -0500 Subject: [PATCH 2/2] updated mcbe backup dir --- src/mcbe/assets/bin/maint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mcbe/assets/bin/maint b/src/mcbe/assets/bin/maint index 68b8905..53d43e4 100755 --- a/src/mcbe/assets/bin/maint +++ b/src/mcbe/assets/bin/maint @@ -16,7 +16,7 @@ year=$(date +%Y) players=$(mcbe-exec list | cut -d ' ' -f 3 | cut -d '/' -f 1) # cd to backup dir -cd /vol/data +cd /vol/data/backup # hourly backup mcbe-exec say "Autosaving..."