From bbeefe5ef86b7947c780fac9509fbcd5070f3862 Mon Sep 17 00:00:00 2001 From: Minecraftschurli Date: Sun, 19 Jul 2020 23:27:06 +0200 Subject: [PATCH 1/3] Update restart.sh --- restart.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/restart.sh b/restart.sh index 9633a8b..b9b96e7 100755 --- a/restart.sh +++ b/restart.sh @@ -3,7 +3,7 @@ # More information at https://jamesachambers.com/raspberry-pi-minecraft-server-script-with-startup-service/ # Check if server is running -if ! screen -list | grep -q "minecraft"; then +if ! screen -list | grep -q "\.minecraft"; then echo "Server is not currently running!" exit 1 fi @@ -34,7 +34,7 @@ screen -Rd minecraft -X stuff "stop $(printf '\r')" echo "Closing server..." StopChecks=0 while [ $StopChecks -lt 30 ]; do - if ! screen -list | grep -q "minecraft"; then + if ! screen -list | grep -q "\.minecraft"; then break fi sleep 1; From 8e46d5cfd76197e53eeda3b54dbc15ca2c88aaff Mon Sep 17 00:00:00 2001 From: Minecraftschurli Date: Sun, 19 Jul 2020 23:28:03 +0200 Subject: [PATCH 2/3] Update stop.sh --- stop.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stop.sh b/stop.sh index 9a74e20..9b693d8 100644 --- a/stop.sh +++ b/stop.sh @@ -4,7 +4,7 @@ # Minecraft Server stop script - primarily called by minecraft service but can be ran manually # Check if server is running -if ! screen -list | grep -q "minecraft"; then +if ! screen -list | grep -q "\.minecraft"; then echo "Server is not currently running!" exit 1 fi @@ -17,7 +17,7 @@ screen -Rd minecraft -X stuff "stop$(printf '\r')" # Wait up to 30 seconds for server to close StopChecks=0 while [ $StopChecks -lt 30 ]; do - if ! screen -list | grep -q "minecraft"; then + if ! screen -list | grep -q "\.minecraft"; then break fi sleep 1; @@ -25,7 +25,7 @@ while [ $StopChecks -lt 30 ]; do done # Force quit if server is still open -if screen -list | grep -q "minecraft"; then +if screen -list | grep -q "\.minecraft"; then echo "Minecraft server still hasn't closed after 30 seconds, closing screen manually" screen -S minecraft -X quit fi @@ -33,4 +33,4 @@ fi echo "Minecraft server stopped." # Sync all filesystem changes out of temporary RAM -sync \ No newline at end of file +sync From b951c0c007ded63deb07a77a14d88cd4fe4f4dbe Mon Sep 17 00:00:00 2001 From: Minecraftschurli Date: Sun, 19 Jul 2020 23:29:00 +0200 Subject: [PATCH 3/3] Update SetupMinecraft.sh --- SetupMinecraft.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SetupMinecraft.sh b/SetupMinecraft.sh index 721b956..889c18d 100644 --- a/SetupMinecraft.sh +++ b/SetupMinecraft.sh @@ -292,7 +292,7 @@ sudo systemctl start minecraft.service # Wait up to 30 seconds for server to start StartChecks=0 while [ $StartChecks -lt 30 ]; do - if screen -list | grep -q "minecraft"; then + if screen -list | grep -q "\.minecraft"; then screen -r minecraft break fi