From 5f8118593008685a7fc239154e1aa84a82a9e680 Mon Sep 17 00:00:00 2001
From: "DESKTOP-D454JC1\\Makaren0" <Makaffe@hotmail.com>
Date: Sun, 22 Jan 2023 00:53:07 +0100
Subject: [PATCH] Updated

---
 entrypoint.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 1f4eb65..721e198 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,17 +1,27 @@
 #!/bin/bash
 cd /home/container
+WORKING_DIR="$PWD"
 
 # Make internal Docker IP address available to processes.
 export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
 
-# Update Rust Server
-./steamcmd/steamcmd.sh +force_install_dir /home/container +login anonymous +app_update 258550 +quit
-
 # Replace Startup Variables
 MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
 echo ":/home/container$ ${MODIFIED_STARTUP}"
 
-# OxideMod has been replaced with uMod
+echo -e "╔═════════════════════╗"
+echo -e "║     Update Sys.     ║"
+echo -e "╚═════════════════════╝\n"
+apt-get update -y && apt-get upgrade -y
+
+echo -e "╔═════════════════════╗"
+echo -e "║     Update Rust     ║"
+echo -e "╚═════════════════════╝\n"
+./steamcmd/steamcmd.sh +force_install_dir /home/container +login anonymous +app_update 258550 +quit
+
+echo -e "╔═════════════════════╗"
+echo -e "║     Update Oxide    ║"
+echo -e "╚═════════════════════╝\n"
 if [ -f OXIDE_FLAG ] || [ "${OXIDE}" = 1 ] || [ "${UMOD}" = 1 ]; then
     echo "Updating uMod..."
     curl -sSL "https://github.com/OxideMod/Oxide.Rust/releases/latest/download/Oxide.Rust-linux.zip" > umod.zip
@@ -20,21 +30,10 @@ if [ -f OXIDE_FLAG ] || [ "${OXIDE}" = 1 ] || [ "${UMOD}" = 1 ]; then
     echo "Done updating uMod!"
 fi
 
+# Run the Server
 # Fix for Rust not starting
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)
-WORKING_DIR="$PWD"
-
 echo -e "╔═════════════════════╗"
-echo -e "║Update AlpineLinux...║"
+echo -e "║  INVOKE WRAPPER...  ║"
 echo -e "╚═════════════════════╝\n"
-apt-get update -y && apt-get upgrade -y
-apt-get install -y unzip apt-utils
-
-echo -e "╔═════════════════════╗"
-echo -e "║Update Steamcmd...   ║"
-echo -e "╚═════════════════════╝\n"
-cd /mnt/server/steamcmd
-./steamcmd +force_install_dir /mnt/server +login anonymous +app_update ${APPID} +quit
-
-# Run the Server
 node /wrapper.js "${MODIFIED_STARTUP}"