From 18a8d31a40794fa685f4c2e316a8cf5b8b0544e7 Mon Sep 17 00:00:00 2001
From: CerberusV1 <jurkfranzalexander@gmail.com>
Date: Tue, 15 Oct 2024 14:49:18 +0200
Subject: [PATCH] made it better i guess

---
 deploy.sh         | 6 +++---
 server_manager.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 4a2d859..9b784c7 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -170,7 +170,7 @@ echo "There is for now only a headles version available!"
 sleep 5
 touch $server_dir/start_server.sh
 echo "#!/bin/bash" > "${server_dir}/start_server.sh"
-echo "tmux new -d -s ${name} '"java -Djava.awt.headless=true @user_jvm_args.txt @libraries/net/minecraftforge/forge/${version}/user_jvm_args.txt"' >> ${management_logs}/tmux_server.log 2>&1" >> "${server_dir}/start_server.sh"
+echo "java -Djava.awt.headless=true @user_jvm_args.txt @libraries/net/minecraftforge/forge/${version}/unix_args.txt >> ${management_logs}/tmux_server.log 2>&1" >> "${server_dir}/start_server.sh"
 chmod +x $server_dir/start_server.sh
 
 
@@ -181,8 +181,8 @@ chmod +x $server_dir/start_server.sh
 touch $management_dir/.env
 chmod 600 $management_dir/.env
 echo "# General Information" >> $management_dir/.env
-echo "server_name=${version}" >> $management_dir/.env
-echo "version=${name}" >> $management_dir/.env
+echo "server_name=${name}" >> $management_dir/.env
+echo "version=${version}" >> $management_dir/.env
 echo " " >> $management_dir/.env
 echo "# Paths" >> $management_dir/.env
 echo "main=${working_dir}" >> $management_dir/.env
diff --git a/server_manager.sh b/server_manager.sh
index 0a5a455..8d9c6ba 100644
--- a/server_manager.sh
+++ b/server_manager.sh
@@ -39,7 +39,7 @@ while true; do
                     condition=$(cat "${server}/eula.txt" | grep -c "eula=true")
                     if [[ ${condition} -eq 1 ]]; then
                         echo "Starting Server...."
-                        .${s_start}
+                        tmux new -d -s "${server_name}" "${s_start}"
                         elif [[ ${condition} -eq 0 ]]; then
                         echo "Before starting the server, please accept the EULA"
                     else
@@ -55,7 +55,7 @@ while true; do
                 clear
                 echo "Launch Menu"
                 echo "------------------------------------------------------------"
-                tmux a -t ${server_name}
+                tmux a -t "${server_name}"
                 read -p "Press Enter to continue..."
                 break
             ;;