From a1c035a80a6bb82e9d83269b57a4bdcadebd23d9 Mon Sep 17 00:00:00 2001 From: Lucas Briese Date: Tue, 15 Oct 2019 12:38:54 +0200 Subject: [PATCH] ~ added / changed only commentary / log output --- gmod/forceWorkshopDownload.sh | 3 ++- gmod/installAndMountAddons.sh | 8 ++++---- lgsm/Dockerfile | 1 + lgsm/entrypoint.sh | 5 ++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gmod/forceWorkshopDownload.sh b/gmod/forceWorkshopDownload.sh index edb132f..2c7043f 100644 --- a/gmod/forceWorkshopDownload.sh +++ b/gmod/forceWorkshopDownload.sh @@ -20,8 +20,9 @@ else fi if [ "$WORKSHOP_COLLECTION_ID" = "0" ] || [ "$WORKSHOP_COLLECTION_ID" = "" ] || [ "$WORKSHOP_AUTOLOAD" != "true" ]; then - echo "No auto workshop download" + echo "[forceWorkshopDownload.sh]No auto workshop download" else + echo "[forceWorkshopDownload.sh]processing workshop collection ${WORKSHOP_COLLECTION_ID}" touch "$LUA_FILE" arr=$(wget -q -O - https://steamcommunity.com/sharedfiles/filedetails/?id="${WORKSHOP_COLLECTION_ID}" | tr '\n' ' ' | grep -Po '"workshopItem"[^"]+"https://steamcommunity.com/sharedfiles/filedetails/\?id=(\d+)' | grep -Po '\d\d\d+' ) str="" diff --git a/gmod/installAndMountAddons.sh b/gmod/installAndMountAddons.sh index d62e460..15f855a 100644 --- a/gmod/installAndMountAddons.sh +++ b/gmod/installAndMountAddons.sh @@ -10,7 +10,7 @@ set -o pipefail cd "$STEAM_CMD" mount='"mountcfg"'$'\n{\n' if [ "$INSTALL_CSS" = "true" ]; then - echo "installing & mounting css" + echo "[installAndMountAddons.sh]installing & mounting css" ./steamcmd.sh +login anonymous +force_install_dir "$CSS_PATH" +app_update 232330 validate +quit mount=${mount}' "cstrike" "'"${CSS_PATH}/cstrike"$'"\n' if [ "$INSTALL_HL2" != "true" ]; then @@ -18,13 +18,13 @@ if [ "$INSTALL_CSS" = "true" ]; then fi fi if [ "$INSTALL_HL2" = "true" ]; then - echo "installing & mounting hl2" + echo "[installAndMountAddons.sh]installing & mounting hl2" ./steamcmd.sh +login anonymous +force_install_dir "$HL2_PATH" +app_update 232370 validate +quit mount=${mount}' "hl2" "'"${HL2_PATH}/hl2"$'"\n' mount=${mount}' "hl2mp" "'"${HL2_PATH}/hl2mp"$'"\n' fi if [ "$INSTALL_TF2" = "true" ]; then - echo "installing & mounting tf2" + echo "[installAndMountAddons.sh]installing & mounting tf2" ./steamcmd.sh +login anonymous +force_install_dir "$TF2_PATH" +app_update 232250 validate +quit mount=${mount}' "tf2" "'"${TF2_PATH}/tf"$'"\n' if [ "$INSTALL_CSS" != "true" ] && [ "$INSTALL_HL2" != "true" ]; then @@ -32,7 +32,7 @@ if [ "$INSTALL_TF2" = "true" ]; then fi fi if [ "$INSTALL_HLDM" = "true" ]; then - echo "installing & mounting hldm" + echo "[installAndMountAddons.sh]installing & mounting hldm" ./steamcmd.sh +login anonymous +force_install_dir "$HLDM_PATH" +app_update 255470 validate +quit mount=${mount}' "hl1" "'"${HLDM_PATH}/hl1"$'"\n' mount=${mount}' "hldm" "'"${HLDM_PATH}/hldm"$'"\n' diff --git a/lgsm/Dockerfile b/lgsm/Dockerfile index 6456419..8babb8b 100644 --- a/lgsm/Dockerfile +++ b/lgsm/Dockerfile @@ -1,6 +1,7 @@ FROM debian:stretch-slim # Const \\ Overwrite Env \\ Configs possible \\ Configs needed +# C.UTF-8 -> en_US.UTF-8 ENV STEAM_PATH="/home/steam" \ SERVER_PATH="/home/steam/serverfiles" \ STEAM_CMD="/home/steam/steamcmd" \ diff --git a/lgsm/entrypoint.sh b/lgsm/entrypoint.sh index 4888c51..1d3ae57 100644 --- a/lgsm/entrypoint.sh +++ b/lgsm/entrypoint.sh @@ -8,7 +8,7 @@ set -o errexit set -o nounset set -o pipefail -echo "starting entrypoint.sh" +echo "[entrypoint.sh]starting entrypoint.sh" set -e @@ -19,12 +19,15 @@ set -e # --- Install / Update --- cd "$STEAM_PATH" if [ -n "$SERVER_EXECUTABLE" ] && [ -e "${STEAM_PATH}/$SERVER_EXECUTABLE" ]; then + echo "[entrypoint.sh]updating..." ./"$SERVER_EXECUTABLE" update-lgsm ./"$SERVER_EXECUTABLE" update else + echo "[entrypoint.sh]installing..." bash linuxgsm.sh "$SERVER_GAME" ./"$SERVER_EXECUTABLE" auto-install fi +echo "[entrypoint.sh]update / installation done!" if [ -e "/home/prepareServer.sh" ]; then cd /home