From 19a812f02bd181e9b6f6ef3f0af4ac46f7b9a41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=3D=3DTIM=2E=C2=A9=2EB=20=20=3D=3D?= <gummiflip@outlook.de>
Date: Sun, 16 Mar 2025 19:01:07 +0100
Subject: [PATCH] Update setup_bedrock.sh

---
 setup_bedrock.sh | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/setup_bedrock.sh b/setup_bedrock.sh
index 9bc9589..d2e92cb 100644
--- a/setup_bedrock.sh
+++ b/setup_bedrock.sh
@@ -4,23 +4,15 @@
 # Tested on Debian 11/12 and Ubuntu 24.04
 # Author: TimInTech
 
-set -e
+set -e  # Exit on any error
 
-# Create a dedicated user for the server
-if ! id -u mcserver > /dev/null 2>&1; then
-  sudo useradd -m -r -d /opt/minecraft-bedrock mcserver
-fi
-
-# Install required dependencies if not already installed
-for pkg in unzip wget screen curl; do
-  if ! dpkg -l | grep -qw $pkg; then
-    sudo apt update
-    sudo apt install -y $pkg
-  fi
-done
+# Install required dependencies
+sudo apt update && sudo apt upgrade -y
+sudo apt install -y unzip wget screen curl
 
 # Set up server directory
-sudo -u mcserver mkdir -p /opt/minecraft-bedrock
+sudo mkdir -p /opt/minecraft-bedrock
+sudo chown $(whoami):$(whoami) /opt/minecraft-bedrock
 cd /opt/minecraft-bedrock
 
 # Fetch the latest Bedrock server URL
@@ -49,7 +41,7 @@ if ! unzip -tq bedrock-server.zip >/dev/null; then
 fi
 
 # Extract the server files
-sudo -u mcserver unzip -o bedrock-server.zip
+unzip -o bedrock-server.zip
 rm -f bedrock-server.zip
 
 # Make sure the server binary exists
@@ -65,9 +57,14 @@ LD_LIBRARY_PATH=. ./bedrock_server
 EOF
 
 chmod +x start.sh
-chown mcserver:mcserver start.sh
+
+# Ensure screen is installed before starting the server
+if ! command -v screen &> /dev/null; then
+  echo "ERROR: 'screen' is not installed. Install it with 'sudo apt install screen'."
+  exit 1
+fi
 
 # Start the server in a detached screen session
-sudo -u mcserver screen -dmS bedrock ./start.sh
+screen -dmS bedrock ./start.sh
 
-echo "Setup complete! Use 'sudo -u mcserver screen -r bedrock' to open the console."
+echo "Setup complete! Use 'screen -r bedrock' to open the console."