From ecadbb7d1613f8c66f57f085c21f2305c67606d1 Mon Sep 17 00:00:00 2001
From: gOOvER <116325+gOOvER@users.noreply.github.com>
Date: Fri, 27 Dec 2024 10:25:43 +0100
Subject: [PATCH] update a mistake

---
 depotdl/debian/Dockerfile     |  6 +++---
 wine/entrypoint.sh            | 12 +++++++++---
 wine/staging/Dockerfile       |  2 +-
 wine/ubuntustaging/Dockerfile |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/depotdl/debian/Dockerfile b/depotdl/debian/Dockerfile
index c19e82f..738fcc5 100644
--- a/depotdl/debian/Dockerfile
+++ b/depotdl/debian/Dockerfile
@@ -89,9 +89,9 @@ RUN         apt install -y --no-install-recommends \
 RUN             rm -rf /var/lib/apt/lists/*
 
 ## download DepotDownloader
-RUN         curl -sLOJ $(curl -s https://api.github.com/repos/SteamRE/DepotDownloader/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep linux-x64.zip)
-RUN         unzip DepotDownloader-linux-x64.zip -d /usr/local/bin/
-RUN         chmod +x /usr/local/bin/DepotDownloader
+#RUN         curl -sLOJ $(curl -s https://api.github.com/repos/SteamRE/DepotDownloader/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep linux-x64.zip)
+#RUN         unzip DepotDownloader-linux-x64.zip -d /usr/local/bin/
+#RUN         chmod +x /usr/local/bin/DepotDownloader
 
 ## install dotnet to support STEAM dotnet games
 RUN         apt update -y \
diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh
index 8b85781..f21245f 100644
--- a/wine/entrypoint.sh
+++ b/wine/entrypoint.sh
@@ -52,9 +52,15 @@ fi
 
 ## if auto_update is not set or to 1 update
 if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then
-    # Update Source Server
-    ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) $( [[ "${STEAM_SDK}" == "1" ]] && printf %s '+app_update 1007' ) +app_update ${STEAM_APPID} $( [[ -z ${STEAM_BETAID} ]] || printf %s "-beta ${STEAM_BETAID}" ) $( [[ -z ${STEAM_BETAPASS} ]] || printf %s "-betapassword ${STEAM_BETAPASS}" ) ${INSTALL_FLAGS} $( [[ "${VALIDATE}" == "1" ]] && printf %s 'validate' ) +quit
-
+	if [ -f /home/container/depotdownloader ]; then
+		DepotDownloader -dir /home/container $( [[ -z ${STEAM_USER} ]] || printf %s "-username ${STEAM_USER} -password ${STEAM_PASS} -remember-password" ) $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '-os windows' ) -app ${STEAM_APPID} $( [[ -z ${STEAM_BETAID} ]] || printf %s "-beta ${STEAM_BETAID}" ) $( [[ -z ${STEAM_BETAPASS} ]] || printf %s "-betapassword ${STEAM_BETAPASS}" ) -validate
+		mkdir -p /mnt/server/.steam/sdk64
+		DepotDownloader -dir /mnt/server/.steam/sdk64 -app 1007
+		chmod +x $HOME/*
+
+	else
+	   	./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) $( [[ "${STEAM_SDK}" == "1" ]] && printf %s '+app_update 1007' ) +app_update ${STEAM_APPID} $( [[ -z ${STEAM_BETAID} ]] || printf %s "-beta ${STEAM_BETAID}" ) $( [[ -z ${STEAM_BETAPASS} ]] || printf %s "-betapassword ${STEAM_BETAPASS}" ) ${INSTALL_FLAGS} $( [[ "${VALIDATE}" == "1" ]] && printf %s 'validate' ) +quit
+	fi
 else
     echo -e "${BLUE}---------------------------------------------------------------${NC}"
     echo -e "${YELLOW}Not updating game server as auto update was set to 0. Starting Server${NC}"
diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile
index a852756..fee600c 100644
--- a/wine/staging/Dockerfile
+++ b/wine/staging/Dockerfile
@@ -1,4 +1,4 @@
-FROM            ubuntu:24.04
+FROM            debian:bookworm-slim
 
 LABEL           author="Torsten Widmann" maintainer="info@goover.de"
 LABEL           org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
diff --git a/wine/ubuntustaging/Dockerfile b/wine/ubuntustaging/Dockerfile
index aa84606..43b9f98 100644
--- a/wine/ubuntustaging/Dockerfile
+++ b/wine/ubuntustaging/Dockerfile
@@ -1,4 +1,4 @@
-FROM            debian:bookworm-slim
+FROM            ubuntu:24.04
 
 LABEL           author="Torsten Widmann" maintainer="info@goover.de"
 LABEL           org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"