From 3ca2d094a85f87a9a4aaf4de44c4f24fd53ae007 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 28 Dec 2015 16:58:03 +0000 Subject: [PATCH] Merged check_steamuser.sh added mumble to ignore list --- functions/check.sh | 1 - functions/check_steamcmd.sh | 24 +++++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/functions/check.sh b/functions/check.sh index 53ee4d617..4c0259053 100644 --- a/functions/check.sh +++ b/functions/check.sh @@ -46,7 +46,6 @@ local allowed_commands_array=( debug install start stop update validate ) for allowed_command in "${allowed_commands_array[@]}" do if [ "${allowed_command}" == "${getopt}" ]; then - check_steamuser.sh check_steamcmd.sh fi done diff --git a/functions/check_steamcmd.sh b/functions/check_steamcmd.sh index 049867eda..b2ba69727 100644 --- a/functions/check_steamcmd.sh +++ b/functions/check_steamcmd.sh @@ -2,14 +2,32 @@ # LGSM check_steamcmd.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="271215" +lgsm_version="281215" # Description: Downloads SteamCMD on install and checks if missing before running functions that require SteamCMD -if [ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 2004" ]; then +if [ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 2004" ]||[ "${gamename}" == "Mumble" ]; then : # These servers do not require SteamCMD. Check is skipped. -elif [ "${modulename}" == "Starting" ]||[ "${modulename}" == "Update" ]||[ "${modulename}" == "Validate" ]; then +else + # Checks steamuser is setup. + if [ "${steamuser}" == "username" ]; then + fn_printfailnl "Steam login not set. Update steamuser." + echo " * Change steamuser=\"username\" to a valid steam login." + if [ -d ${scriptlogdir} ]; then + fn_scriptlog "edit ${selfname}. change steamuser=\"username\" to a valid steam login." + exit 1 + fi + fi + if [ -z "${steamuser}" ]; then + fn_printwarnnl "Steam login not set. Using anonymous login." + if [ -d "${scriptlogdir}" ]; then + fn_scriptlog "Steam login not set. Using anonymous login." + fi + steamuser="anonymous" + steampass="" + sleep 2 + fi # Checks if SteamCMD exists when starting or updating a server. # Re-installs if missing. steamcmddir="${rootdir}/steamcmd"