From dfeeba76e928f5f7f21d4e623ac1fab56bd907d8 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Mon, 22 Aug 2016 21:17:43 -0500 Subject: [PATCH 01/10] This fixes an issue where the log file being parsed contains multiple instances of the version number. When the egrep expression returns multiple lines, the formation of the version number around line 133 ( the tr command ) that pulls out everything but numbers generates a (potentially) enormous string. Reference: http://steamcommunity.com/groups/linuxgsm/discussions/0/361798516936473435/ --- lgsm/functions/update_ts3.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index e4ee2ddc6..9a6599942 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -48,7 +48,7 @@ fn_update_ts3_currentbuild(){ fi # Get current build from logs - currentbuild=$(cat $(find ./* -name 'ts3server*_0.log' 2> /dev/null | sort | egrep -E -v '${rootdir}/.ts3version' | tail -1) | egrep -o 'TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | egrep -o '((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}') + currentbuild=$(cat $(find ./* -name 'ts3server*_0.log' 2> /dev/null | sort | egrep -E -v '${rootdir}/.ts3version' | tail -1) | egrep -o 'TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | egrep -o '((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | sort -V | tail -1) if [ -z "${currentbuild}" ]; then fn_print_error_nl "Checking for update: teamspeak.com: Current build version not found" fn_script_log_error "Checking for update: teamspeak.com: Current build version not found" @@ -194,4 +194,4 @@ else fn_update_ts3_currentbuild fn_update_ts3_availablebuild fn_update_ts3_compare -fi \ No newline at end of file +fi From f33bfc19fd61fef8cd3ab22d2a4fd51bd8e43415 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Mon, 22 Aug 2016 21:19:41 -0500 Subject: [PATCH 02/10] Adding the new versus mode option to the configuration file. --- FistfulOfFrags/cfg/lgsm-default.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FistfulOfFrags/cfg/lgsm-default.cfg b/FistfulOfFrags/cfg/lgsm-default.cfg index 81d9929fc..615720feb 100644 --- a/FistfulOfFrags/cfg/lgsm-default.cfg +++ b/FistfulOfFrags/cfg/lgsm-default.cfg @@ -31,6 +31,7 @@ sv_lan 0 // "mapcycle_12.txt" - All 12 slot maps for Shootout/2 Team Shootout/4 Team Shootout // "mapcycle_32.txt" - All 32 slot maps for Shootout/2 Team Shootout/4 Team Shootout // "mapcycle_tp.txt" - All Teamplay maps +// "mapcycle_vs.txt" - All versus mode maps // "mapcycle_gt.txt" - All Ghost Town maps mapcyclefile "mapcycle.txt" @@ -48,11 +49,12 @@ mp_timelimit 15 // 2 = Teamplay // 3 = Break Bad // 4 = Elimination +// 5 = Versus fof_sv_currentmode 1 // Teamplay // 0 = Free-for-all -// 1 = Team Deathmatch +// 1 = Team Deathmatch or Teamplay mode mp_teamplay 0 // Team numbers @@ -121,4 +123,4 @@ sv_logfile 1 // Log server information to only one file. // Default: sv_log_onefile 0 -sv_log_onefile 0 \ No newline at end of file +sv_log_onefile 0 From 215aae3397d6f07bce7b26a1932419c169d127ae Mon Sep 17 00:00:00 2001 From: cedarlug Date: Tue, 23 Aug 2016 06:36:34 -0500 Subject: [PATCH 03/10] mumble's IP address is hard set with the 'host=' setting in the ini file. check_ip's result returns an error due to looking for the ip setting in the server script. This commit bypasses the issue allowing `details` functionality to work once again. --- lgsm/functions/check_ip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 8c1c264c2..0ba8bcbf3 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -8,7 +8,7 @@ local commandname="CHECK" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" -if [ "${gamename}" != "TeamSpeak 3" ]; then +if [ "${gamename}" != "TeamSpeak 3" ] && [ "${gamename}" != "Mumble" ]; then if [ ! -f "/bin/ip" ]; then ipcommand="/sbin/ip" else From 5feb12a846952e2f90547e22521b88d703b05616 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 23 Aug 2016 21:35:15 +0100 Subject: [PATCH 04/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 844d13257..72e57fa62 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ All FAQ can be found here. https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ

Donate

-If you want to donate to the project you can via PayPal, Flattr or Gratipay. I have had a may kind people show their support by sending me a donation. Any donations you send help cover my server costs and buy me a drink. Cheers! +If you want to donate to the project you can via PayPal. I have had a may kind people show their support by sending me a donation. Any donations you send help cover my server costs and buy me a drink. Cheers! From 4c8081f36556d7e42dbd2e1873285d438c9e4056 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Wed, 24 Aug 2016 13:36:58 +0200 Subject: [PATCH 05/10] Diff between ownership and permissions + wiki link #1023 --- lgsm/functions/check_permissions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index c41f8d67f..b86ea066f 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -11,8 +11,8 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_check_ownership(){ if [ -d "${filesdir}" ]; then if [ $(find "${filesdir}" -not -user $(whoami)|wc -l) -ne "0" ]||[ $(find "${rootdir}/${selfname}" -not -user $(whoami)|wc -l) -ne "0" ]; then - fn_print_fail_nl "Permissions issues found" - fn_script_log_fatal "Permissions issues found" + fn_print_fail_nl "Ownership issues found" + fn_script_log_fatal "Ownership issues found" fn_print_infomation_nl "The current user ($(whoami)) does not have ownership of the following files:" fn_script_log_info "The current user ($(whoami)) does not have ownership of the following files:" { @@ -20,6 +20,8 @@ fn_check_ownership(){ find "${filesdir}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" } | column -s $'\t' -t | tee -a "${scriptlog}" core_exit.sh + fn_print_information_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" + fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" fi fi } From 575d871c61e5cd7d7ebe5517f9735d7d2c229a7f Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Wed, 24 Aug 2016 13:47:59 +0200 Subject: [PATCH 06/10] infomation ?! #1023 --- lgsm/functions/check_permissions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index b86ea066f..79f808fce 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -20,7 +20,7 @@ fn_check_ownership(){ find "${filesdir}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" } | column -s $'\t' -t | tee -a "${scriptlog}" core_exit.sh - fn_print_information_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" + fn_print_infomation_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" fi fi From 03f2b4e0279eb421abf3163cc63340a6d12f39eb Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Wed, 24 Aug 2016 14:08:34 +0200 Subject: [PATCH 07/10] Added selfname check --- lgsm/functions/check_permissions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index 79f808fce..64c3f535a 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -18,6 +18,7 @@ fn_check_ownership(){ { echo -e "User\tGroup\tFile\n" find "${filesdir}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" + find "${rootdir}/${selfname}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" } | column -s $'\t' -t | tee -a "${scriptlog}" core_exit.sh fn_print_infomation_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" From 2ae1c05f4780294f3acd809596da8a043f3f0547 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Wed, 24 Aug 2016 15:32:57 +0200 Subject: [PATCH 08/10] Message location & rework Added functions dir for ownership check And reworked the way checks occur. --- lgsm/functions/check_permissions.sh | 48 +++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index 64c3f535a..04cad1d8a 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -9,22 +9,44 @@ local commandname="CHECK" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_check_ownership(){ + if [ -f "${rootdir}/${selfname}" ]; then + if [ $(find "${rootdir}/${selfname}" -not -user $(whoami)|wc -l) -ne "0" ]; then + selfownissue=1 + fi + fi + if [ -d "${functionsdir}" ]; then + if [ $(find "${functionsdir}" -not -user $(whoami)|wc -l) -ne "0" ]; then + funcownissue=1 + fi + fi if [ -d "${filesdir}" ]; then - if [ $(find "${filesdir}" -not -user $(whoami)|wc -l) -ne "0" ]||[ $(find "${rootdir}/${selfname}" -not -user $(whoami)|wc -l) -ne "0" ]; then - fn_print_fail_nl "Ownership issues found" - fn_script_log_fatal "Ownership issues found" - fn_print_infomation_nl "The current user ($(whoami)) does not have ownership of the following files:" - fn_script_log_info "The current user ($(whoami)) does not have ownership of the following files:" - { - echo -e "User\tGroup\tFile\n" - find "${filesdir}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" - find "${rootdir}/${selfname}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" - } | column -s $'\t' -t | tee -a "${scriptlog}" - core_exit.sh - fn_print_infomation_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" - fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" + if [ $(find "${filesdir}" -not -user $(whoami)|wc -l) -ne "0" ]; then + filesownissue=1 fi fi + if [ "${selfownissue}" == "1" ]||[ "${funcownissue}" == "1" ]||[ "${filesownissue}" == "1" ]; then + fn_print_fail_nl "Ownership issues found" + fn_script_log_fatal "Ownership issues found" + fn_print_infomation_nl "The current user ($(whoami)) does not have ownership of the following files:" + fn_script_log_info "The current user ($(whoami)) does not have ownership of the following files:" + { + echo -e "User\tGroup\tFile\n" + if [ "${selfownissue}" == "1" ]; then + find "${rootdir}/${selfname}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" + fi + if [ "${funcownissue}" == "1" ]; then + find "${functionsdir}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" + fi + if [ "${funcownissue}" == "1" ]; then + find "${filesdir}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n" + fi + + } | column -s $'\t' -t | tee -a "${scriptlog}" + echo "" + fn_print_infomation_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" + fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" + core_exit.sh + fi } fn_check_permissions(){ From 4cdbe2057ca71cc7487f2bb3ac16721f7e3da862 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 24 Aug 2016 15:53:30 +0100 Subject: [PATCH 09/10] updated data --- FistfulOfFrags/cfg/lgsm-default.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FistfulOfFrags/cfg/lgsm-default.cfg b/FistfulOfFrags/cfg/lgsm-default.cfg index 615720feb..39783e9d8 100644 --- a/FistfulOfFrags/cfg/lgsm-default.cfg +++ b/FistfulOfFrags/cfg/lgsm-default.cfg @@ -1,7 +1,7 @@ // **************************************************************************** // * // Fistful of Frags - server.cfg * -// Version 100116 * +// Version 240716 * // * // **************************************************************************** @@ -25,7 +25,7 @@ sv_lan 0 // ............................... Map Cycles ............................... // // info: There are several predefined mapcycles available that are listed below. -// You can also create your own custom mapcycle. +// You can also create your own custom mapcycle. // "mapcycle.txt" - All Shootout/2 Team Shootout/4 Team Shootout maps // "mapcycle_12.txt" - All 12 slot maps for Shootout/2 Team Shootout/4 Team Shootout @@ -50,7 +50,7 @@ mp_timelimit 15 // 3 = Break Bad // 4 = Elimination // 5 = Versus -fof_sv_currentmode 1 +fof_sv_currentmode 1 // Teamplay // 0 = Free-for-all @@ -98,7 +98,7 @@ sv_downloadurl "" // personal banlist based on user IDs. exec banned_user.cfg -// personal banlist based on user IPs. +// personal banlist based on user IPs. exec banned_ip.cfg writeid From 13ed1ea590de95761fcb19666cea92bd0ae84357 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 24 Aug 2016 16:26:42 +0100 Subject: [PATCH 10/10] I cannot spell! updated "Information" --- lgsm/functions/check_deps.sh | 2 +- lgsm/functions/check_glibc.sh | 2 +- lgsm/functions/check_ip.sh | 2 +- lgsm/functions/check_permissions.sh | 8 ++++---- lgsm/functions/check_steamcmd.sh | 2 +- lgsm/functions/command_details.sh | 2 +- lgsm/functions/command_ts3_server_pass.sh | 2 +- lgsm/functions/core_getopt.sh | 14 +++++++------- lgsm/functions/core_messages.sh | 10 +++++----- lgsm/functions/info_distro.sh | 8 ++++---- lgsm/functions/install_server_files.sh | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index e81d34c43..1f9d89488 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -73,7 +73,7 @@ fn_found_missing_deps(){ sleep 1 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then - fn_print_infomation_nl "Automatically installing missing dependencies." + fn_print_information_nl "Automatically installing missing dependencies." fn_script_log_info "Automatically installing missing dependencies." echo -en ".\r" sleep 1 diff --git a/lgsm/functions/check_glibc.sh b/lgsm/functions/check_glibc.sh index 2fcd6e8a1..85caf6d01 100644 --- a/lgsm/functions/check_glibc.sh +++ b/lgsm/functions/check_glibc.sh @@ -35,7 +35,7 @@ elif [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n echo -e " * glibc required: ${glibcrequired}" echo -e " * glibc installed: ${red}${glibcversion}${default}" echo -en "\n" - fn_print_infomation "The game server will probably not work. A distro upgrade is required!" + fn_print_information "The game server will probably not work. A distro upgrade is required!" sleep 5 fi fi \ No newline at end of file diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 0ba8bcbf3..1a64db6bd 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -24,7 +24,7 @@ if [ "${gamename}" != "TeamSpeak 3" ] && [ "${gamename}" != "Mumble" ]; then fn_print_fail "Check IP: Multiple active network interfaces found." sleep 1 echo -en "\n" - fn_print_infomation "Specify the IP you want to use within the ${selfname} script.\n" + fn_print_information "Specify the IP you want to use within the ${selfname} script.\n" echo -en "Set ip=\"0.0.0.0\" to one of the following:\n" echo -en "${getip}\n" echo -en "" diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index 04cad1d8a..297bf16d6 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -27,7 +27,7 @@ fn_check_ownership(){ if [ "${selfownissue}" == "1" ]||[ "${funcownissue}" == "1" ]||[ "${filesownissue}" == "1" ]; then fn_print_fail_nl "Ownership issues found" fn_script_log_fatal "Ownership issues found" - fn_print_infomation_nl "The current user ($(whoami)) does not have ownership of the following files:" + fn_print_information_nl "The current user ($(whoami)) does not have ownership of the following files:" fn_script_log_info "The current user ($(whoami)) does not have ownership of the following files:" { echo -e "User\tGroup\tFile\n" @@ -43,7 +43,7 @@ fn_check_ownership(){ } | column -s $'\t' -t | tee -a "${scriptlog}" echo "" - fn_print_infomation_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" + fn_print_information_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found" core_exit.sh fi @@ -54,7 +54,7 @@ fn_check_permissions(){ if [ $(find "${functionsdir}" -type f -not -executable|wc -l) -ne "0" ]; then fn_print_fail_nl "Permissions issues found" fn_script_log_fatal "Permissions issues found" - fn_print_infomation_nl "The following files are not executable:" + fn_print_information_nl "The following files are not executable:" fn_script_log_info "The following files are not executable:" { echo -e "File\n" @@ -74,7 +74,7 @@ fn_check_permissions(){ if [ "${userrootdirperm}" != "7" ] && [ "${grouprootdirperm}" != "7" ]; then fn_print_fail_nl "Permissions issues found" fn_script_log_fatal "Permissions issues found" - fn_print_infomation_nl "The following directorys does not have the correct permissions:" + fn_print_information_nl "The following directorys does not have the correct permissions:" fn_script_log_info "The following directorys does not have the correct permissions:" ls -l "${rootdir}" core_exit.sh diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index 01da9cda2..1e0f66cd7 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -51,7 +51,7 @@ fn_check_steamcmd_sh(){ fn_install_steamcmd fi elif [ "${function_selfname}" == "command_install.sh" ]; then - fn_print_infomation "SteamCMD is already installed..." + fn_print_information "SteamCMD is already installed..." fn_print_ok_eol_nl fi } diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index cbac77f7a..68680aaf2 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -3,7 +3,7 @@ # Author: Daniel Gibbs # Contributor: UltimateByte # Website: https://gameservermanagers.com -# Description: Displays server infomation. +# Description: Displays server information. local commandname="DETAILS" local commandaction="Details" diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index e260b8a2a..89c3cd036 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -16,7 +16,7 @@ fn_serveradmin_password_prompt(){ echo "=================================" echo "" echo "Press \"CTRL+b d\" to exit console." - fn_print_infomation_nl "You are about to change the ${gamename} ServerAdmin password." + fn_print_information_nl "You are about to change the ${gamename} ServerAdmin password." fn_print_warning_nl "${gamename} will restart during this process." echo "" while true; do diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index 4c6514bdd..afb2dfc2b 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -65,7 +65,7 @@ case "${getopt}" in echo -e "${blue}validate\t${default}v |Validate server files with SteamCMD." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." - echo -e "${blue}details\t${default}dt |Displays useful infomation about the server." + echo -e "${blue}details\t${default}dt |Displays useful information about the server." echo -e "${blue}backup\t${default}b |Create archive of the server." echo -e "${blue}console\t${default}c |Console allows you to access the live view of a server." echo -e "${blue}debug\t${default}d |See the output of the server directly to your terminal." @@ -125,7 +125,7 @@ case "${getopt}" in echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." - echo -e "${blue}details\t${default}dt |Displays useful infomation about the server." + echo -e "${blue}details\t${default}dt |Displays useful information about the server." echo -e "${blue}change-password\t${default}pw |Changes TS3 serveradmin password." echo -e "${blue}backup\t${default}b |Create archive of the server." echo -e "${blue}install\t${default}i |Install the server." @@ -180,7 +180,7 @@ case "${getopt}" in echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." - echo -e "${blue}details\t${default}dt |Displays useful infomation about the server." + echo -e "${blue}details\t${default}dt |Displays useful information about the server." echo -e "${blue}backup\t${default}b |Create archive of the server." echo -e "${blue}install\t${default}i |Install the server." } | column -s $'\t' -t @@ -248,7 +248,7 @@ case "${getopt}" in echo -e "${blue}validate\t${default}v |Validate server files with SteamCMD." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." - echo -e "${blue}details\t${default}dt |Displays useful infomation about the server." + echo -e "${blue}details\t${default}dt |Displays useful information about the server." echo -e "${blue}backup\t${default}b |Create archive of the server." echo -e "${blue}console\t${default}c |Console allows you to access the live view of a server." echo -e "${blue}debug\t${default}d |See the output of the server directly to your terminal." @@ -310,7 +310,7 @@ case "${getopt}" in echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." - echo -e "${blue}details\t${default}dt |Displays useful infomation about the server." + echo -e "${blue}details\t${default}dt |Displays useful information about the server." echo -e "${blue}backup\t${default}b |Create archive of the server." echo -e "${blue}console\t${default}c |Console allows you to access the live view of a server." echo -e "${blue}debug\t${default}d |See the output of the server directly to your terminal." @@ -383,7 +383,7 @@ case "${getopt}" in echo -e "${blue}validate\t${default}v |Validate server files with SteamCMD." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." - echo -e "${blue}details\t${default}dt |Displays useful infomation about the server." + echo -e "${blue}details\t${default}dt |Displays useful information about the server." echo -e "${blue}backup\t${default}b |Create archive of the server." echo -e "${blue}console\t${default}c |Console allows you to access the live view of a server." echo -e "${blue}debug\t${default}d |See the output of the server directly to your terminal." @@ -448,7 +448,7 @@ case "${getopt}" in echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded." echo -e "${blue}monitor\t${default}m |Checks that the server is running." echo -e "${blue}test-alert\t${default}ta |Sends test alert." - echo -e "${blue}details\t${default}dt |Displays useful infomation about the server." + echo -e "${blue}details\t${default}dt |Displays useful information about the server." echo -e "${blue}backup\t${default}b |Create archive of the server." echo -e "${blue}console\t${default}c |Console allows you to access the live view of a server." echo -e "${blue}debug\t${default}d |See the output of the server directly to your terminal." diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index 97f609f50..d23733cde 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -249,13 +249,13 @@ fn_print_warning_nl(){ echo -e "${yellow}Warning!${default} $@" } -# Infomation! -fn_print_infomation(){ - echo -en "${cyan}Infomation!${default} $@" +# Information! +fn_print_information(){ + echo -en "${cyan}Information!${default} $@" } -fn_print_infomation_nl(){ - echo -e "${cyan}Infomation!${default} $@" +fn_print_information_nl(){ + echo -e "${cyan}Information!${default} $@" } # On-Screen End of Line diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 4f3012730..a203a2c47 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -7,7 +7,7 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" -### Distro infomation +### Distro information ## Distro # Returns architecture, kernel and distro/os. @@ -53,12 +53,12 @@ hours=$(( uptime/60/60%24 )) days=$(( uptime/60/60/24 )) -### Performance infomation +### Performance information ## Average server load load=$(uptime|awk -F 'load average: ' '{ print $2 }') -## Memory Infomation +## Memory information # Available RAM and swap. # Older versions of free do not support -h option. @@ -77,7 +77,7 @@ swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}') swapfree=$(free ${humanreadable} | awk '/Swap:/ {print $4}') -### Disk Infomation +### Disk information ## Available disk space on the partition. filesystem=$(df -hP "${rootdir}" | grep -v "Filesystem" | awk '{print $1}') diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index dc9713586..0c33c22e1 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -82,7 +82,7 @@ fn_install_server_files_steamcmd(){ # Goldsource servers commonly fail to download all the server files required. # Validating a few of times may reduce the chance of this issue. if [ "${engine}" == "goldsource" ]; then - fn_print_infomation_nl "Goldsource servers commonly fail to download all the server files required. Validating a few of times may reduce the chance of this issue." + fn_print_information_nl "Goldsource servers commonly fail to download all the server files required. Validating a few of times may reduce the chance of this issue." counter="0" while [ "${counter}" -le "4" ]; do counter=$((counter+1))