From 7042b437791b9537558948d5cbfd9b32c798eb6f Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 21:24:45 -0400 Subject: [PATCH 01/11] Add DepotDownloader to Dockerfile and add USE_DEPOT_DOWNLOADER env var --- Dockerfile | 16 +++++++++++++++- scripts/helper_install.sh | 26 +++++++++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a65d0da6d..3e8df3855 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,10 +38,12 @@ LABEL maintainer="thijs@loef.dev" \ # set envs # SUPERCRONIC: Latest releases available at https://github.com/aptible/supercronic/releases # RCON: Latest releases available at https://github.com/gorcon/rcon-cli/releases +# DEPOT_DOWNLOADER: Latest releases available at https://github.com/SteamRE/DepotDownloader/releases # NOTICE: edit RCON_MD5SUM SUPERCRONIC_SHA1SUM when using binaries of another version or arch. ARG SUPERCRONIC_SHA1SUM_ARM64="d5e02aa760b3d434bc7b991777aa89ef4a503e49" ARG SUPERCRONIC_SHA1SUM_AMD64="9f27ad28c5c57cd133325b2a66bba69ba2235799" ARG SUPERCRONIC_VERSION="0.2.30" +ARG DEPOT_DOWNLOADER_VERSION="2.6.0" # update and install dependencies # hadolint ignore=DL3008 @@ -53,6 +55,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ jo=1.9-1 \ jq=1.6-2.1 \ netcat-traditional=1.10-47 \ + libicu72=72.1-3 \ + unzip=6.0-28 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -69,7 +73,16 @@ RUN case ${TARGETARCH} in \ && wget --progress=dot:giga https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${TARGETARCH} -O supercronic \ && echo "${SUPERCRONIC_SHA1SUM}" supercronic | sha1sum -c - \ && chmod +x supercronic \ - && mv supercronic /usr/local/bin/supercronic + && mv supercronic /usr/local/bin/supercronic \ + && case ${TARGETARCH} in \ + "amd64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-x64.zip ;; \ + "arm64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-arm64.zip ;; \ + esac \ + && wget --progress=dot:giga https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_${DEPOT_DOWNLOADER_VERSION}/${DEPOT_DOWNLOADER_FILENAME} -O DepotDownloader.zip \ + && unzip DepotDownloader.zip \ + && rm -rf DepotDownloader.xml \ + && chmod +x DepotDownloader \ + && mv DepotDownloader /usr/local/bin/DepotDownloader # hadolint ignore=DL3044 ENV HOME=/home/steam \ @@ -147,6 +160,7 @@ ENV HOME=/home/steam \ ARM_COMPATIBILITY_MODE=false \ DISABLE_GENERATE_ENGINE=true \ ALLOW_CONNECT_PLATFORM=Steam \ + USE_DEPOT_DOWNLOADER=false \ INSTALL_BETA_INSIDER=false # Passed from Github Actions diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index 46dc92273..a0c730c7a 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -125,8 +125,9 @@ InstallServer() { kernel_page_size=$(getconf PAGESIZE) # Check kernel page size for arm64 hosts before running steamcmd - if [ "$architecture" == "arm64" ] && [ "$kernel_page_size" != "4096" ]; then - LogWarn "WARNING: Only ARM64 hosts with 4k page size is supported when running steamcmd. Expect server installation to fail." + if [ "$architecture" == "arm64" ] && [ "$kernel_page_size" != "4096" ] && [ "${USE_DEPOT_DOWNLOADER}" != true ]; then + LogWarn "WARNING: Only ARM64 hosts with 4k page size is supported when running steamcmd. Please set USE_DEPOT_DOWNLOADER to true." + return 1 fi if [ -z "${TARGET_MANIFEST_ID}" ]; then @@ -134,9 +135,19 @@ InstallServer() { ## If INSTALL_BETA_INSIDER is set to true, install the latest beta version if [ "${INSTALL_BETA_INSIDER}" == true ]; then LogWarn "Installing latest beta version" - /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 -beta insiderprogram validate +quit + if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then + LogWarn "Downloading server files using DepotDownloader" + DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /palworld -beta insiderprogram -validate + else + /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 -beta insiderprogram validate +quit + fi else - /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 validate +quit + if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then + LogWarn "Downloading server files using DepotDownloader" + DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /palworld -validate + else + /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 validate +quit + fi fi DiscordMessage "Install" "${DISCORD_POST_UPDATE_BOOT_MESSAGE}" "success" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_ENABLED}" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_URL}" return @@ -147,7 +158,12 @@ InstallServer() { LogWarn "Installing Target Version: $targetManifest" DiscordMessage "Install" "${DISCORD_PRE_UPDATE_BOOT_MESSAGE}" "in-progress" "${DISCORD_PRE_UPDATE_BOOT_MESSAGE_ENABLED}" "${DISCORD_PRE_UPDATE_BOOT_MESSAGE_URL}" - /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +download_depot 2394010 2394012 "$targetManifest" +quit + if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then + LogWarn "Downloading server files using DepotDownloader" + DepotDownloader -app 2394010 -depot 2394012 -manifest "$targetManifest" -osarch 64 -dir /palworld -validate + else + /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +download_depot 2394010 2394012 "$targetManifest" +quit + fi cp -vr "/home/steam/steamcmd/linux32/steamapps/content/app_2394010/depot_2394012/." "/palworld/" CreateACFFile "$targetManifest" DiscordMessage "Install" "${DISCORD_POST_UPDATE_BOOT_MESSAGE}" "success" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_ENABLED}" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_URL}" From 9f026888199e52970209c9a39747077b0c770f70 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 21:28:43 -0400 Subject: [PATCH 02/11] Add documentations for USE_DEPOT_DOWNLOADER --- README.md | 1 + docusaurus/docs/getting-started/configuration/server-settings.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 34b50c4ed..9a63b8d9c 100644 --- a/README.md +++ b/README.md @@ -286,6 +286,7 @@ It is highly recommended you set the following environment values before startin | ENABLE_PLAYER_LOGGING | Enables Logging and announcing when players join and leave | true | true/false | 0.31.0 | | PLAYER_LOGGING_POLL_PERIOD | Polling period (in seconds) to check for players who have joined or left | 5 | !0 | 0.31.0 | | ARM_COMPATIBILITY_MODE | Switches the compatibility layer from Box86 to QEMU when executing steamcmd for server updates. This setting is only applicable for ARM64 hosts. | false | true/false | 0.30.0 | +| USE_DEPOT_DOWNLOADER | Uses DepotDownloader to download game server files instead of steamcmd. This will help hosts incompatible with steamcmd (e.g. M-series Mac) | false | true/false | 0.39.0 | *highly recommended to set diff --git a/docusaurus/docs/getting-started/configuration/server-settings.md b/docusaurus/docs/getting-started/configuration/server-settings.md index 7330cc512..628784aab 100644 --- a/docusaurus/docs/getting-started/configuration/server-settings.md +++ b/docusaurus/docs/getting-started/configuration/server-settings.md @@ -102,6 +102,7 @@ It is highly recommended you set the following environment values before startin | ENABLE_PLAYER_LOGGING | Enables Logging and announcing when players join and leave | true | true/false | 0.31.0 | | PLAYER_LOGGING_POLL_PERIOD | Polling period (in seconds) to check for players who have joined or left | 5 | !0 | 0.31.0 | | ARM_COMPATIBILITY_MODE | Switches the compatibility layer from Box86 to QEMU when executing steamcmd for server updates. This setting is only applicable for ARM64 hosts. | false | true/false | 0.30.0 | +| USE_DEPOT_DOWNLOADER | Uses DepotDownloader to download game server files instead of steamcmd. This will help hosts incompatible with steamcmd (e.g. M-series Mac) | false | true/false | 0.39.0 | *highly recommended to set From ec78311b088d516ba4e0b51da43433cb3d560100 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 21:36:15 -0400 Subject: [PATCH 03/11] Fix linting error --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e8df3855..b77614ec3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] COPY --from=rcon-cli_builder /build/gorcon /usr/bin/rcon-cli ARG TARGETARCH -RUN case ${TARGETARCH} in \ +RUN case "${TARGETARCH}" in \ "amd64") SUPERCRONIC_SHA1SUM=${SUPERCRONIC_SHA1SUM_AMD64} ;; \ "arm64") SUPERCRONIC_SHA1SUM=${SUPERCRONIC_SHA1SUM_ARM64} ;; \ esac \ @@ -74,7 +74,7 @@ RUN case ${TARGETARCH} in \ && echo "${SUPERCRONIC_SHA1SUM}" supercronic | sha1sum -c - \ && chmod +x supercronic \ && mv supercronic /usr/local/bin/supercronic \ - && case ${TARGETARCH} in \ + && case "${TARGETARCH}" in \ "amd64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-x64.zip ;; \ "arm64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-arm64.zip ;; \ esac \ From a9e377107ed0cf5f97eed783a31f1c9715a08a2c Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 21:38:39 -0400 Subject: [PATCH 04/11] Separate run layer for depot downloader --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b77614ec3..ab8265942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,15 +66,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] COPY --from=rcon-cli_builder /build/gorcon /usr/bin/rcon-cli ARG TARGETARCH -RUN case "${TARGETARCH}" in \ +RUN case ${TARGETARCH} in \ "amd64") SUPERCRONIC_SHA1SUM=${SUPERCRONIC_SHA1SUM_AMD64} ;; \ "arm64") SUPERCRONIC_SHA1SUM=${SUPERCRONIC_SHA1SUM_ARM64} ;; \ esac \ && wget --progress=dot:giga https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${TARGETARCH} -O supercronic \ && echo "${SUPERCRONIC_SHA1SUM}" supercronic | sha1sum -c - \ && chmod +x supercronic \ - && mv supercronic /usr/local/bin/supercronic \ - && case "${TARGETARCH}" in \ + && mv supercronic /usr/local/bin/supercronic + +RUN case ${TARGETARCH} in \ "amd64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-x64.zip ;; \ "arm64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-arm64.zip ;; \ esac \ From ef191f26fa302e3eadc6041deb8a3a20db43d42b Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 21:41:40 -0400 Subject: [PATCH 05/11] Fix linting --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab8265942..1c8409b7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,20 +66,20 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] COPY --from=rcon-cli_builder /build/gorcon /usr/bin/rcon-cli ARG TARGETARCH -RUN case ${TARGETARCH} in \ +RUN case "${TARGETARCH}" in \ "amd64") SUPERCRONIC_SHA1SUM=${SUPERCRONIC_SHA1SUM_AMD64} ;; \ "arm64") SUPERCRONIC_SHA1SUM=${SUPERCRONIC_SHA1SUM_ARM64} ;; \ esac \ - && wget --progress=dot:giga https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${TARGETARCH} -O supercronic \ + && wget --progress=dot:giga "https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${TARGETARCH}" -O supercronic \ && echo "${SUPERCRONIC_SHA1SUM}" supercronic | sha1sum -c - \ && chmod +x supercronic \ && mv supercronic /usr/local/bin/supercronic -RUN case ${TARGETARCH} in \ +RUN case "${TARGETARCH}" in \ "amd64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-x64.zip ;; \ "arm64") DEPOT_DOWNLOADER_FILENAME=DepotDownloader-linux-arm64.zip ;; \ esac \ - && wget --progress=dot:giga https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_${DEPOT_DOWNLOADER_VERSION}/${DEPOT_DOWNLOADER_FILENAME} -O DepotDownloader.zip \ + && wget --progress=dot:giga "https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_${DEPOT_DOWNLOADER_VERSION}/${DEPOT_DOWNLOADER_FILENAME}" -O DepotDownloader.zip \ && unzip DepotDownloader.zip \ && rm -rf DepotDownloader.xml \ && chmod +x DepotDownloader \ From f1f556248749fae42a1b671076b057113626bf55 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 21:58:05 -0400 Subject: [PATCH 06/11] Include depot 1006 for steamclient.so dependency --- scripts/helper_install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index a0c730c7a..91eeaf4cb 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -138,6 +138,7 @@ InstallServer() { if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then LogWarn "Downloading server files using DepotDownloader" DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /palworld -beta insiderprogram -validate + DepotDownloader -app 2394010 -depot 1006 -osarch 64 -dir /palworld -validate else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 -beta insiderprogram validate +quit fi @@ -145,6 +146,7 @@ InstallServer() { if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then LogWarn "Downloading server files using DepotDownloader" DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /palworld -validate + DepotDownloader -app 2394010 -depot 1006 -osarch 64 -dir /palworld -validate else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 validate +quit fi @@ -161,6 +163,7 @@ InstallServer() { if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then LogWarn "Downloading server files using DepotDownloader" DepotDownloader -app 2394010 -depot 2394012 -manifest "$targetManifest" -osarch 64 -dir /palworld -validate + DepotDownloader -app 2394010 -depot 1006 -osarch 64 -dir /palworld -validate else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +download_depot 2394010 2394012 "$targetManifest" +quit fi From a49ba1c11e9aa7cb654ac59df422bf7093874d13 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 22:31:49 -0400 Subject: [PATCH 07/11] Merge unnecessary DepotDownloader lines --- scripts/helper_install.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index 91eeaf4cb..aae84a271 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -137,16 +137,14 @@ InstallServer() { LogWarn "Installing latest beta version" if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then LogWarn "Downloading server files using DepotDownloader" - DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /palworld -beta insiderprogram -validate - DepotDownloader -app 2394010 -depot 1006 -osarch 64 -dir /palworld -validate + DepotDownloader -app 2394010 -osarch 64 -dir /palworld -beta insiderprogram -validate else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 -beta insiderprogram validate +quit fi else if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then LogWarn "Downloading server files using DepotDownloader" - DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /palworld -validate - DepotDownloader -app 2394010 -depot 1006 -osarch 64 -dir /palworld -validate + DepotDownloader -app 2394010 -osarch 64 -dir /palworld -validate else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 validate +quit fi @@ -166,8 +164,8 @@ InstallServer() { DepotDownloader -app 2394010 -depot 1006 -osarch 64 -dir /palworld -validate else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +download_depot 2394010 2394012 "$targetManifest" +quit + cp -vr "/home/steam/steamcmd/linux32/steamapps/content/app_2394010/depot_2394012/." "/palworld/" fi - cp -vr "/home/steam/steamcmd/linux32/steamapps/content/app_2394010/depot_2394012/." "/palworld/" CreateACFFile "$targetManifest" DiscordMessage "Install" "${DISCORD_POST_UPDATE_BOOT_MESSAGE}" "success" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_ENABLED}" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_URL}" } From 9dd9c57719c84a1494ce07284cfa8474519b00c5 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 23:14:45 -0400 Subject: [PATCH 08/11] Add creation of ACF file for better compatibility with the rest of the script --- scripts/helper_install.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index aae84a271..d953dec7d 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -138,6 +138,7 @@ InstallServer() { if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then LogWarn "Downloading server files using DepotDownloader" DepotDownloader -app 2394010 -osarch 64 -dir /palworld -beta insiderprogram -validate + DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /tmp -beta insiderprogram -manifest-only else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 -beta insiderprogram validate +quit fi @@ -145,10 +146,34 @@ InstallServer() { if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then LogWarn "Downloading server files using DepotDownloader" DepotDownloader -app 2394010 -osarch 64 -dir /palworld -validate + DepotDownloader -app 2394010 -depot 2394012 -osarch 64 -dir /tmp -manifest-only else /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 validate +quit fi fi + + # Create ACF file for DepoDownloader downloads for script compatibility + if [ "${USE_DEPOT_DOWNLOADER}" == true ]; then + local manifestFile + manifestFile=$(find /tmp -type f -name "manifest_2394012_*.txt" | head -n 1) + + if [ -z "$manifestFile" ]; then + echo "DepotDownloader manifest file not found." + else + local manifestId + manifestId=$(grep -oP 'Manifest ID / date\s*:\s*\K[0-9]+' "$manifestFile") + + if [ -z "$manifestId" ]; then + echo "Manifest ID not found in DepotDownloader manifest file." + else + mkdir -p /palworld/steamapps + CreateACFFile "$manifestId" + fi + + rm -rf "$manifestfile" + fi + fi + DiscordMessage "Install" "${DISCORD_POST_UPDATE_BOOT_MESSAGE}" "success" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_ENABLED}" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_URL}" return fi From 68f785155f06bd5f47a9a7d60f06e14ffd62c334 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 23:15:24 -0400 Subject: [PATCH 09/11] Fix manifestFile typo --- scripts/helper_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index d953dec7d..1289634da 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -170,7 +170,7 @@ InstallServer() { CreateACFFile "$manifestId" fi - rm -rf "$manifestfile" + rm -rf "$manifestFile" fi fi From 0b09a4c9cd1288e2b5a4fa26166b9aed5b604e33 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 23:27:48 -0400 Subject: [PATCH 10/11] Remove return and attempt anyways --- scripts/helper_install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index 1289634da..d141f6877 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -127,7 +127,6 @@ InstallServer() { # Check kernel page size for arm64 hosts before running steamcmd if [ "$architecture" == "arm64" ] && [ "$kernel_page_size" != "4096" ] && [ "${USE_DEPOT_DOWNLOADER}" != true ]; then LogWarn "WARNING: Only ARM64 hosts with 4k page size is supported when running steamcmd. Please set USE_DEPOT_DOWNLOADER to true." - return 1 fi if [ -z "${TARGET_MANIFEST_ID}" ]; then From 0511d8e095b0503fc7e06895f0c062b018c6a283 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 4 Jul 2024 23:29:39 -0400 Subject: [PATCH 11/11] Add env var to .env.example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index b0a320824..a2fe636e9 100644 --- a/.env.example +++ b/.env.example @@ -91,4 +91,5 @@ SHOW_PLAYER_LIST=True # ALLOW_CONNECT_PLATFORM Defaults to "Steam" if not set, set this to "Xbox" if you want to host a server for Xbox players. CROSSPLAY BETWEEN XBOX-STEAM IS NOT YET SUPPORTED ALLOW_CONNECT_PLATFORM=Steam USE_BACKUP_SAVE_DATA=True +USE_DEPOT_DOWNLOADER=False INSTALL_BETA_INSIDER=False