From 5286c17243824ceecb71f4fd0f38bde7b307d5b8 Mon Sep 17 00:00:00 2001
From: Mar Alegre <mar@mar.alemor.org>
Date: Fri, 28 Aug 2020 21:35:38 -0400
Subject: [PATCH] fixed mcbe-backup script

---
 src/mcbe/assets/bin/maint       |  3 +++
 src/mcbe/assets/bin/mcbe-backup | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/mcbe/assets/bin/maint b/src/mcbe/assets/bin/maint
index b4897c9..07d7b3c 100755
--- a/src/mcbe/assets/bin/maint
+++ b/src/mcbe/assets/bin/maint
@@ -18,6 +18,9 @@ cd /vol/data/backup
 
 # hourly backup
 mcbe-exec say "Autosaving..."
+if [[ -e worlds-hourly-$hour ]]; then
+    rm -r worlds-hourly-$hour
+fi
 mcbe-backup worlds-hourly-$hour
 
 if [[ $hour -eq 1 ]]; then
diff --git a/src/mcbe/assets/bin/mcbe-backup b/src/mcbe/assets/bin/mcbe-backup
index 83db9e8..36f91b0 100755
--- a/src/mcbe/assets/bin/mcbe-backup
+++ b/src/mcbe/assets/bin/mcbe-backup
@@ -28,11 +28,12 @@ if [[ $status != active ]]; then
     exit
 fi
 
-# create backup dir
-if [[ ! -d "$backup_dir" ]]; then
-    echo "Creating directory \"$backup_dir\" ..."
-    mkdir -p "$backup_dir"
+# Check if backup dir already exists
+if [[ -e "$backup_dir" ]]; then
+    echo "Error: backup dir already exists. Delete directory before proceeding or use another directory name."
+    exit 1
 fi
+mkdir -p "$backup_dir"
 cd "$backup_dir"
 
 # prepare backup of active world
@@ -83,5 +84,3 @@ done
 
 # make sure everything is owned by worlds owner
 chown -R "$(stat -c %U:%G $worlds_dir)" ./
-# touch backup dir to update its last-edited date
-touch ./