From c225ca3f01afde6f40094528784f14666af08469 Mon Sep 17 00:00:00 2001
From: John Edwards <joedwards32@gmail.com>
Date: Wed, 19 Feb 2025 22:18:42 +0000
Subject: [PATCH] Fix \#142: New steamcmd error handling

---
 bookworm/etc/entry.sh | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/bookworm/etc/entry.sh b/bookworm/etc/entry.sh
index b022e4a..6ec2427 100644
--- a/bookworm/etc/entry.sh
+++ b/bookworm/etc/entry.sh
@@ -24,12 +24,32 @@ else
     VALIDATE=""
 fi
 
-eval bash "${STEAMCMDDIR}/steamcmd.sh" "${STEAMCMD_SPEW}"\
+## SteamCMD can fail to download
+## Retry logic
+MAX_ATTEMPTS=3
+attempt=0
+while [[ $steamcmd_rc != 0 ]] && [[ $attempt -lt $MAX_ATTEMPTS ]]; do
+    ((attempt+=1))
+    if [[ $attempt -gt 1 ]]; then
+        echo "Retrying SteamCMD, attempt ${attempt}"
+        # Stale appmanifest data can lead for HTTP 401 errors when requesting old
+        # files from SteamPipe CDN
+        echo "Removing steamapps (appmanifest data)..."
+        rm -rf "${STEAMAPPDIR}/steamapps"
+    fi
+    eval bash "${STEAMCMDDIR}/steamcmd.sh" "${STEAMCMD_SPEW}"\
                                 +force_install_dir "${STEAMAPPDIR}" \
                                 +@bClientTryRequestManifestWithoutCode 1 \
 				+login anonymous \
 				+app_update "${STEAMAPPID}" "${VALIDATE}"\
-				+quit || exit $?
+				+quit
+    steamcmd_rc=$?
+done
+
+## Exit if steamcmd fails
+if [[ $steamcmd_rc != 0 ]]; then
+    exit $steamcmd_rc
+fi
 
 # steamclient.so fix
 mkdir -p ~/.steam/sdk64