tab

functions/check_steamcmd.sh

@@ -8,70 +8,66 @@ lgsm_version="160316"
 
 
 fn_install_steamcmd(){
-if [ ! -d "${steamcmddir}" ]; then
-	mkdir -v "${steamcmddir}"
-fi
-fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${lgsmdir}/tmp" "steamcmd_linux.tar.gz"
-fn_dl_extract "${lgsmdir}/tmp" "steamcmd_linux.tar.gz" "${steamcmddir}"
-chmod +x "${steamcmddir}/steamcmd.sh"
+	if [ ! -d "${steamcmddir}" ]; then
+		mkdir -v "${steamcmddir}"
+	fi
+	fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${lgsmdir}/tmp" "steamcmd_linux.tar.gz"
+	fn_dl_extract "${lgsmdir}/tmp" "steamcmd_linux.tar.gz" "${steamcmddir}"
+	chmod +x "${steamcmddir}/steamcmd.sh"
 }
 
 
 fn_check_steamcmd_user(){
-# Checks steamuser is setup. 
-if [ "${steamuser}" == "username" ]; then
-	fn_print_fail_nl "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
-# Anonymous user is set if steamuser is missing
-if [ -z "${steamuser}" ]; then
-	fn_print_warn_nl "Steam login not set. Using anonymous login."
-	if [ -d "${scriptlogdir}" ]; then
-		fn_scriptlog "Steam login not set. Using anonymous login."
+	# Checks steamuser is setup. 
+	if [ "${steamuser}" == "username" ]; then
+		fn_print_fail_nl "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
-	steamuser="anonymous"
-	steampass=""
-	sleep 2
-fi	
+	# Anonymous user is set if steamuser is missing
+	if [ -z "${steamuser}" ]; then
+		fn_print_warn_nl "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	
 }
 
 fn_check_steamcmd_sh(){
-# Checks if SteamCMD exists when starting or updating a server.
-# Installs if missing.
-steamcmddir="${rootdir}/steamcmd"
-if [ ! -f "${steamcmddir}/steamcmd.sh" ]; then
-	if [ "${function_selfname}" == "command_install.sh" ]; then
-		fn_install_steamcmd
-	else	
-		fn_print_warn_nl "SteamCMD is missing"
-		fn_scriptlog "SteamCMD is missing"
-		sleep 1
-		fn_install_steamcmd
+	# Checks if SteamCMD exists when starting or updating a server.
+	# Installs if missing.
+	steamcmddir="${rootdir}/steamcmd"
+	if [ ! -f "${steamcmddir}/steamcmd.sh" ]; then
+		if [ "${function_selfname}" == "command_install.sh" ]; then
+			fn_install_steamcmd
+		else	
+			fn_print_warn_nl "SteamCMD is missing"
+			fn_scriptlog "SteamCMD is missing"
+			sleep 1
+			fn_install_steamcmd
+		fi
+	elif [ "${function_selfname}" == "command_install.sh" ]; then
+		fn_print_infomation "SteamCMD is already installed..."
+		fn_print_ok_eol_nl
 	fi
-elif [ "${function_selfname}" == "command_install.sh" ]; then
-	fn_print_infomation "SteamCMD is already installed..."
-	fn_print_ok_eol_nl
-fi
 }
 
 fn_check_steamcmd_guard(){
-if [ "${function_selfname}" == "command_update.sh" ]||[ "${function_selfname}" == "command_validate.sh" ]; then
-	# Checks that steamcmd is working correctly and will prompt Steam Guard if required.
-	"${steamcmddir}"/steamcmd.sh +login "${steamuser}" "${steampass}" +quit
-	if [ $? -ne 0 ]; then
-		fn_print_failure_nl "Error running SteamCMD"	
+	if [ "${function_selfname}" == "command_update.sh" ]||[ "${function_selfname}" == "command_validate.sh" ]; then
+		# Checks that steamcmd is working correctly and will prompt Steam Guard if required.
+		"${steamcmddir}"/steamcmd.sh +login "${steamuser}" "${steampass}" +quit
+		if [ $? -ne 0 ]; then
+			fn_print_failure_nl "Error running SteamCMD"	
+		fi		
 	fi		
-fi		
 }
 
-if [ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 2004" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Teamspeak 3" ]; then
-	: # These servers do not require SteamCMD. Check is skipped.
-else
-	fn_check_steamcmd_user
-	fn_check_steamcmd_sh
-	fn_check_steamcmd_guard
-fi
+fn_check_steamcmd_user
+fn_check_steamcmd_sh
+fn_check_steamcmd_guard

functions/command_monitor.sh

@@ -15,7 +15,7 @@ fn_monitor_check_lockfile(){
 	if [ ! -f "${rootdir}/${lockselfname}" ]; then
 		fn_print_info_nl "Disabled: No lock file found"
 		fn_scriptlog "Disabled: No lock file found"
-		echo "To enable monitor run ./${selfname} start"
+		echo "	* To enable monitor run ./${selfname} start"
 		exit 1
 	fi
 }