From 3c0d5be76aa858775a37026828d06667c4d503ed Mon Sep 17 00:00:00 2001
From: Bruno Fontes <developer@brunofontes.net>
Date: Fri, 5 Mar 2021 12:24:30 -0300
Subject: [PATCH] Including temp change to backup main server

---
 Services/minecraft-hour.sh | 106 +++++++++++++++++++++++++------------
 1 file changed, 71 insertions(+), 35 deletions(-)

diff --git a/Services/minecraft-hour.sh b/Services/minecraft-hour.sh
index c1cc69f..044255e 100755
--- a/Services/minecraft-hour.sh
+++ b/Services/minecraft-hour.sh
@@ -1,57 +1,93 @@
-if ! screen -list | grep -q "Minecraft"; then
-  exit 1
+if screen -list | grep -q "MncftPublic"; then
+    publicBackup="true"
+fi
+if screen -list | grep -q "Minecraft"; then
+    otherBackup="true"
+fi
+
+if [[ -z $publicBackup && -z $otherBackup ]] ; then
+    echo "Entrei"
+    exit 1
 fi
 
 BACKUPDIR="/home/bruno/Backups/zBackup-Minecraft/backups"
 SERVERDIR="/home/bruno/Apps/Minecraft"
+PUBLICDIR="$SERVERDIR/BedrockServer_Public_19132"
 SURVIVALDIR="$SERVERDIR/BedrockServer_Survival_19132"
 CREATIVEDIR="$SERVERDIR/BedrockServer_Creative_19134"
 LogFile="log.txt"
 
+BACKUPDATE=$(date +"%Y-%m-%d_%H-%M-%S")
+mkdir "$BACKUPDIR/$BACKUPDATE"
+
 alias run='screen -S Minecraft -X'
 alias runSurvival='run at Survival stuff'
 alias runCreative='run at Creative stuff'
+alias runPublic='screen -S MncftPublic -X at Server stuff'
 alias runAllWorlds='run at "#" stuff'
 
 cd /home/bruno/Apps/Minecraft
 
 runAllWorlds "^u"
-runAllWorlds "say $(date +%l:%M) - Saving worlds\n"
-runAllWorlds "save hold\n"
+# runAllWorlds "say $(date +%l:%M) - Saving worlds\n"
+runPublic "say ^usave hold\n"
+runAllWorlds "^usave hold\n"
 sleep 2s
 
-finishedCreative=""
-timeout=30
-while [[ $finishedCreative != *"Data saved."* ]]; do
-    if [[ $timeout -lt 1 ]]; then
-        notify-send "Error backuping Creative world"
-        exit 1
-    fi
-    (( timeout-- ))
-    sleep 1s
+
+if [[ $publicBackup ]]; then
+    echo Preparing public
+    finishedPublic=""
+    timeout=30
+    while [[ $finishedPublic != *"Data saved."* ]]; do
+        if [[ $timeout -lt 1 ]]; then
+            notify-send "Error backuping Creative world"
+            exit 1
+        fi
+        (( timeout-- ))
+        sleep 1s
+        runPublic "say ^usave query\n"
+        finishedPublic=$(tail -n 4 "$PUBLICDIR/$LogFile")
+    done
+    /bin/tar c "$PUBLICDIR/worlds" | zbackup --non-encrypted backup "$BACKUPDIR/$BACKUPDATE/MncftPublic" 
+    runPublic "say ^usave resume\n"
+fi
+
+if [[ $otherBackup ]]; then
+    echo Preparing others
+    finishedCreative=""
+    timeout=30
+    while [[ $finishedCreative != *"Data saved."* ]]; do
+        if [[ $timeout -lt 1 ]]; then
+            notify-send "Error backuping Creative world"
+            exit 1
+        fi
+        (( timeout-- ))
+        sleep 1s
+        runCreative "^u"
+        runCreative "save query\n"
+        finishedCreative=$(tail -n 4 "$CREATIVEDIR/$LogFile")
+    done
     runCreative "^u"
-    runCreative "save query\n"
-    finishedCreative=$(tail -n 4 "$CREATIVEDIR/$LogFile")
-done
+    runCreative "save resume\n"
 
-timeout=30
-finishedSurvival=""
-while [[ $finishedSurvival != *"Data saved."* ]]; do
-    if [[ $timeout -lt 1 ]]; then
-        notify-send "Error backuping Survival world"
-        exit 1
-    fi
-    (( timeout-- ))
-    sleep 1s
+    timeout=30
+    finishedSurvival=""
+    while [[ $finishedSurvival != *"Data saved."* ]]; do
+        if [[ $timeout -lt 1 ]]; then
+            notify-send "Error backuping Survival world"
+            exit 1
+        fi
+        (( timeout-- ))
+        sleep 1s
+        runSurvival "^u"
+        runSurvival "save query\n"
+        finishedSurvival=$(tail -n 4 "$SURVIVALDIR/$LogFile")
+    done
+
+    /bin/tar c "$SURVIVALDIR/worlds" | zbackup --non-encrypted backup "$BACKUPDIR/$BACKUPDATE/Survival" 
+    /bin/tar c "$CREATIVEDIR/worlds" | zbackup --non-encrypted backup "$BACKUPDIR/$BACKUPDATE/Creative" 
     runSurvival "^u"
-    runSurvival "save query\n"
-    finishedSurvival=$(tail -n 4 "$SURVIVALDIR/$LogFile")
-done
+    runSurvival "save resume\n"
+fi
 
-BACKUPDATE=$(date +"%Y-%m-%d_%H-%M-%S")
-mkdir "$BACKUPDIR/$BACKUPDATE"
-/bin/tar c --exclude=behavior_packs/* --exclude=resource_packs/* "$SURVIVALDIR/worlds/Survival" | zbackup --non-encrypted backup "$BACKUPDIR/$BACKUPDATE-Survival" 
-/bin/tar c --exclude=behavior_packs/* --exclude=resource_packs/* "$CREATIVEDIR/worlds/Creative" | zbackup --non-encrypted backup "$BACKUPDIR/$BACKUPDATE-Creative" 
-
-runAllWorlds "^u"
-runAllWorlds "save resume\n"