From 37569d1e87a215483daad5d4b077e4d50af3caa7 Mon Sep 17 00:00:00 2001
From: ripps818 <ripps818@gmail.com>
Date: Sat, 24 Feb 2024 11:48:56 -0600
Subject: [PATCH] Fix winetricks

winetricks got left out when merging all the changes to the dockerfile from the recent merges
---
 Dockerfile         | 5 +++++
 includes/server.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b3c9f55..3c7e779 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,6 +64,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GAME_BIN="/palworld/Pal/Binaries/Win64/PalServer-Win64-Test-Cmd.exe" \
 	WINE_BIN="/usr/bin/wine" \
 	WINETRICK_ON_START=true \
+	WINETRICK_BIN="/usr/local/bin/winetricks" \
 	WINEPREFIX=/home/steam/.wine \
 	WINEARCH=win64 \
 	WINEDEBUG=-all \
@@ -220,6 +221,10 @@ RUN dpkg --add-architecture i386 && \
     apt-get update
 RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH}
 
+# Install winetricks
+RUN wget -nv -O ${WINETRICK_BIN} https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+    && chmod +x ${WINETRICK_BIN}
+
 # Install Windows version of SteamCmd
 ENV STEAMCMD_URL="http://media.steampowered.com/installer/steamcmd.zip"
 RUN mkdir -p ${STEAMCMD_PATH}
diff --git a/includes/server.sh b/includes/server.sh
index e3eb479..c3f6733 100644
--- a/includes/server.sh
+++ b/includes/server.sh
@@ -70,7 +70,7 @@ function update_server() {
 
 function winetricks_install() {
 	ei ">>> Installing Visual C++ Runtime 2022"
-	trickscmd=("/usr/bin/winetricks")
+	trickscmd=("${WINETRICK_BIN}")
 	trickscmd+=("--optout" "-f" "-q" "vcrun2022")
 	echo "${trickscmd[*]}"
 	"${trickscmd[@]}"