devbeni/yolks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104 from lilkingjr1/arma3

Browse Source 
[Arma 3] Hot Fix SteamCMD Intermittently Failing Workshop Downloads
This commit is contained in:
Michael (Parker) Parker
2022-11-29 15:07:43 -05:00
committed by GitHub
parent dbdbc2fc1b 5742a2b8d8
commit 0f336f3f95
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
games/arma3/Dockerfile
View File

@@ -17,7 +17,7 @@ RUN dpkg --add-architecture i386 \
iproute2 \ iproute2 \
gettext-base \ gettext-base \
ca-certificates \ ca-certificates \
numactl \ numactl \
libssl-dev \ libssl-dev \
lib32gcc-s1 \ lib32gcc-s1 \
libsdl2-2.0-0 \ libsdl2-2.0-0 \

11
games/arma3/entrypoint.sh
View File

@@ -8,6 +8,7 @@
## === CONSTANTS === ## === CONSTANTS ===
STEAMCMD_DIR="./steamcmd" # SteamCMD's directory containing steamcmd.sh STEAMCMD_DIR="./steamcmd" # SteamCMD's directory containing steamcmd.sh
WORKSHOP_DIR="./Steam/steamapps/workshop" # SteamCMD's directory containing workshop downloads
STEAMCMD_LOG="${STEAMCMD_DIR}/steamcmd.log" # Log file for SteamCMD STEAMCMD_LOG="${STEAMCMD_DIR}/steamcmd.log" # Log file for SteamCMD
GAME_ID=107410 # SteamCMD ID for the Arma 3 GAME (not server). Only used for Workshop mod downloads. GAME_ID=107410 # SteamCMD ID for the Arma 3 GAME (not server). Only used for Workshop mod downloads.
EGG_URL='https://github.com/parkervcp/eggs/tree/master/game_eggs/steamcmd_servers/arma/arma3' # URL for Pterodactyl Egg & Info (only used as info to legacy users) EGG_URL='https://github.com/parkervcp/eggs/tree/master/game_eggs/steamcmd_servers/arma/arma3' # URL for Pterodactyl Egg & Info (only used as info to legacy users)
@@ -105,8 +106,8 @@ function RunSteamCMD { #[Input: int server=0 mod=1 optional_mod=2; int id]
# Move the downloaded mod to the root directory, and replace existing mod if needed # Move the downloaded mod to the root directory, and replace existing mod if needed
mkdir -p ./@$2 mkdir -p ./@$2
rm -rf ./@$2/* rm -rf ./@$2/*
mv -f ./Steam/steamapps/workshop/content/$GAME_ID/$2/* ./@$2 mv -f ${WORKSHOP_DIR}/content/$GAME_ID/$2/* ./@$2
rm -d ./Steam/steamapps/workshop/content/$GAME_ID/$2 rm -d ${WORKSHOP_DIR}/content/$GAME_ID/$2
# Make the mods contents all lowercase # Make the mods contents all lowercase
ModsLowercase @$2 ModsLowercase @$2
# Move any .bikey's to the keys directory # Move any .bikey's to the keys directory
@@ -282,8 +283,12 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then
if [[ -n $latestUpdate ]] && [[ $latestUpdate =~ ^[0-9]+$ ]]; then # Notify last update date, if valid if [[ -n $latestUpdate ]] && [[ $latestUpdate =~ ^[0-9]+$ ]]; then # Notify last update date, if valid
echo -e "\tMod was last updated: ${CYAN}$(date -d @${latestUpdate})${NC}" echo -e "\tMod was last updated: ${CYAN}$(date -d @${latestUpdate})${NC}"
fi fi
# Delete SteamCMD appworkshop cache before running to avoid mod download failures
echo -e "\tClearing SteamCMD appworkshop cache..."
rm -f ${WORKSHOP_DIR}/appworkshop_$GAME_ID.acf
echo -e "\tAttempting mod update/download via SteamCMD...\n" echo -e "\tAttempting mod update/download via SteamCMD...\n"
RunSteamCMD $modType $modID RunSteamCMD $modType $modID
fi fi
fi fi