Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Lucas Briese 2022-01-01 14:56:59 +01:00
commit 419fbeb713

View File

@ -11,7 +11,7 @@ cd "$STEAM_CMD"
mount='"mountcfg"'$'\n{\n' mount='"mountcfg"'$'\n{\n'
if [ "$INSTALL_CSS" = "true" ]; then if [ "$INSTALL_CSS" = "true" ]; then
echo "[installAndMountAddons.sh]installing & mounting css" echo "[installAndMountAddons.sh]installing & mounting css"
./steamcmd.sh +login anonymous +force_install_dir "$CSS_PATH" +app_update 232330 validate +quit ./steamcmd.sh +force_install_dir "$CSS_PATH" +login anonymous +app_update 232330 validate +quit
mount=${mount}' "cstrike" "'"${CSS_PATH}/cstrike"$'"\n' mount=${mount}' "cstrike" "'"${CSS_PATH}/cstrike"$'"\n'
if [ "$INSTALL_HL2" != "true" ]; then if [ "$INSTALL_HL2" != "true" ]; then
mount=${mount}' "hl2" "'"${CSS_PATH}/hl2"$'"\n' mount=${mount}' "hl2" "'"${CSS_PATH}/hl2"$'"\n'
@ -19,13 +19,13 @@ if [ "$INSTALL_CSS" = "true" ]; then
fi fi
if [ "$INSTALL_HL2" = "true" ]; then if [ "$INSTALL_HL2" = "true" ]; then
echo "[installAndMountAddons.sh]installing & mounting hl2" echo "[installAndMountAddons.sh]installing & mounting hl2"
./steamcmd.sh +login anonymous +force_install_dir "$HL2_PATH" +app_update 232370 validate +quit ./steamcmd.sh +force_install_dir "$HL2_PATH" +login anonymous +app_update 232370 validate +quit
mount=${mount}' "hl2" "'"${HL2_PATH}/hl2"$'"\n' mount=${mount}' "hl2" "'"${HL2_PATH}/hl2"$'"\n'
mount=${mount}' "hl2mp" "'"${HL2_PATH}/hl2mp"$'"\n' mount=${mount}' "hl2mp" "'"${HL2_PATH}/hl2mp"$'"\n'
fi fi
if [ "$INSTALL_TF2" = "true" ]; then if [ "$INSTALL_TF2" = "true" ]; then
echo "[installAndMountAddons.sh]installing & mounting tf2" echo "[installAndMountAddons.sh]installing & mounting tf2"
./steamcmd.sh +login anonymous +force_install_dir "$TF2_PATH" +app_update 232250 validate +quit ./steamcmd.sh +force_install_dir "$TF2_PATH" +login anonymous +app_update 232250 validate +quit
mount=${mount}' "tf2" "'"${TF2_PATH}/tf"$'"\n' mount=${mount}' "tf2" "'"${TF2_PATH}/tf"$'"\n'
if [ "$INSTALL_CSS" != "true" ] && [ "$INSTALL_HL2" != "true" ]; then if [ "$INSTALL_CSS" != "true" ] && [ "$INSTALL_HL2" != "true" ]; then
mount=${mount}' "hl2" "'"${TF2_PATH}/hl2"$'"\n' mount=${mount}' "hl2" "'"${TF2_PATH}/hl2"$'"\n'
@ -33,7 +33,7 @@ if [ "$INSTALL_TF2" = "true" ]; then
fi fi
if [ "$INSTALL_HLDM" = "true" ]; then if [ "$INSTALL_HLDM" = "true" ]; then
echo "[installAndMountAddons.sh]installing & mounting hldm" echo "[installAndMountAddons.sh]installing & mounting hldm"
./steamcmd.sh +login anonymous +force_install_dir "$HLDM_PATH" +app_update 255470 validate +quit ./steamcmd.sh +force_install_dir "$HLDM_PATH" +login anonymous +app_update 255470 validate +quit
mount=${mount}' "hl1" "'"${HLDM_PATH}/hl1"$'"\n' mount=${mount}' "hl1" "'"${HLDM_PATH}/hl1"$'"\n'
mount=${mount}' "hldm" "'"${HLDM_PATH}/hldm"$'"\n' mount=${mount}' "hldm" "'"${HLDM_PATH}/hldm"$'"\n'
if [ "$INSTALL_CSS" != "true" ] && [ "$INSTALL_HL2" != "true" ] && [ "$INSTALL_TF2" != "true" ]; then if [ "$INSTALL_CSS" != "true" ] && [ "$INSTALL_HL2" != "true" ] && [ "$INSTALL_TF2" != "true" ]; then
@ -51,4 +51,3 @@ if [ -e "${SERVER_PATH}/garrysmod/cfg/mount.cfg" ]; then
fi fi
touch "${SERVER_PATH}/garrysmod/cfg/mount.cfg" touch "${SERVER_PATH}/garrysmod/cfg/mount.cfg"
echo "$mount" > "${SERVER_PATH}/garrysmod/cfg/mount.cfg" echo "$mount" > "${SERVER_PATH}/garrysmod/cfg/mount.cfg"