diff --git a/bullseye/Dockerfile b/bullseye/Dockerfile index 4440ee7..d971613 100644 --- a/bullseye/Dockerfile +++ b/bullseye/Dockerfile @@ -11,7 +11,6 @@ LABEL maintainer="astra@zio.sh" ENV STEAMAPPID 730 ENV STEAMAPP cs2 ENV STEAMAPPDIR "${HOMEDIR}/${STEAMAPP}-dedicated" -ENV STEAMAPPVALIDATE 0 COPY etc/entry.sh "${HOMEDIR}/entry.sh" COPY etc/server.cfg "/etc/server.cfg" diff --git a/bullseye/etc/entry.sh b/bullseye/etc/entry.sh index df62192..0524989 100755 --- a/bullseye/etc/entry.sh +++ b/bullseye/etc/entry.sh @@ -1,16 +1,10 @@ #!/bin/bash mkdir -p "${STEAMAPPDIR}" || true -if [[ "$STEAMAPPVALIDATE" -eq 1 ]]; then - VALIDATE="validate" -else - VALIDATE="" -fi - # Download Updates bash "${STEAMCMDDIR}/steamcmd.sh" +force_install_dir "${STEAMAPPDIR}" \ +login anonymous \ - +app_update "${STEAMAPPID}" "${VALIDATE}" \ + +app_update "${STEAMAPPID}" \ +quit # steamclient.so fix @@ -46,13 +40,13 @@ fi # Rewrite Config Files if [[ ! -z $CS2_BOT_DIFFICULTY ]] ; then - sed -r -i "s/^(bot_difficulty) .*/\1 ${CS2_BOT_DIFFICULTY}/" "${STEAMAPPDIR}"/game/csgo/cfg/* + sed -i "s/bot_difficulty.*/bot_difficulty ${CS2_BOT_DIFFICULTY}/" "${STEAMAPPDIR}"/game/csgo/cfg/* fi if [[ ! -z $CS2_BOT_QUOTA ]] ; then - sed -r -i "s/^(bot_quota) .*/\1 ${CS2_BOT_QUOTA}/" "${STEAMAPPDIR}"/game/csgo/cfg/* + sed -i "s/bot_quota.*/bot_quota ${CS2_BOT_QUOTA}/" "${STEAMAPPDIR}"/game/csgo/cfg/* fi if [[ ! -z $CS2_BOT_QUOTA_MODE ]] ; then - sed -r -i "s/^(bot_quota_mode) .*/\1 ${CS2_BOT_QUOTA_MODE}/" "${STEAMAPPDIR}"/game/csgo/cfg/* + sed -i "s/bot_quota_mode.*/bot_quota_mode ${CS2_BOT_QUOTA_MODE}/" "${STEAMAPPDIR}"/game/csgo/cfg/* fi # Switch to server directory