From 1e8351bb49787a74db374a3a902cbf2e020d2c5c Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Mon, 25 Jul 2016 16:05:13 +0200 Subject: [PATCH] Fixed typos Teamspeak -> TeamSpeak --- TeamSpeak3/ts3server | 6 +++--- lgsm/functions/alert_email.sh | 2 +- lgsm/functions/check.sh | 2 +- lgsm/functions/check_ip.sh | 2 +- lgsm/functions/check_logs.sh | 2 +- lgsm/functions/check_status.sh | 2 +- lgsm/functions/command_details.sh | 8 ++++---- lgsm/functions/command_install.sh | 4 ++-- lgsm/functions/command_monitor.sh | 2 +- lgsm/functions/command_start.sh | 2 +- lgsm/functions/command_stop.sh | 2 +- lgsm/functions/command_update.sh | 2 +- lgsm/functions/core_getopt.sh | 2 +- lgsm/functions/fix.sh | 2 +- lgsm/functions/info_config.sh | 2 +- lgsm/functions/info_glibc.sh | 2 +- lgsm/functions/install_config.sh | 2 +- lgsm/functions/install_logs.sh | 4 ++-- lgsm/functions/install_server_files.sh | 2 +- tests/tests_ts3server.sh | 6 +++--- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index 7a6491bff..5dd11c323 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -1,5 +1,5 @@ #!/bin/bash -# Teamspeak 3 +# TeamSpeak 3 # Server Management Script # Author: Daniel Gibbs # Website: https://gameservermanagers.com @@ -29,8 +29,8 @@ pushbullettoken="accesstoken" updateonstart="off" # Server Details -gamename="Teamspeak 3" -servername="Teamspeak 3 Server" +gamename="TeamSpeak 3" +servername="TeamSpeak 3 Server" servicename="ts3-server" # Directories diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index e0d84b255..1a60d4d57 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -153,7 +153,7 @@ fn_details_gameserver(){ echo -e "Tick rate: ${tickrate}" fi - # Teamspeak dbplugin + # TeamSpeak dbplugin if [ -n "${dbplugin}" ]; then echo -e "dbplugin: ${dbplugin}" fi diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh index 95e1a92ba..59f44f5b5 100644 --- a/lgsm/functions/check.sh +++ b/lgsm/functions/check.sh @@ -63,7 +63,7 @@ done local allowed_commands_array=( command_console.sh command_start.sh ) for allowed_command in "${allowed_commands_array[@]}" do - if [ "${allowed_command}" == "${function_selfname}" ]||[ "${gamename}" != "Teamspeak 3" ]; then + if [ "${allowed_command}" == "${function_selfname}" ]||[ "${gamename}" != "TeamSpeak 3" ]; then check_tmux.sh fi done diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 5375bcac6..8d4bb4789 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" ]; then if [ ! -f "/bin/ip" ]; then ipcommand="/sbin/ip" else diff --git a/lgsm/functions/check_logs.sh b/lgsm/functions/check_logs.sh index 3012203fb..cb75dd88e 100644 --- a/lgsm/functions/check_logs.sh +++ b/lgsm/functions/check_logs.sh @@ -8,7 +8,7 @@ local commandname="CHECK" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" # Create dir's for the script and console logs -if [ ! -d "${scriptlogdir}" ]||[ ! -d "${consolelogdir}" ]&&[ "${gamename}" != "Teamspeak 3" ]; then +if [ ! -d "${scriptlogdir}" ]||[ ! -d "${consolelogdir}" ]&&[ "${gamename}" != "TeamSpeak 3" ]; then fn_print_dots "Checking for log files" sleep 0.5 fn_print_info_nl "Checking for log files: Creating log files" diff --git a/lgsm/functions/check_status.sh b/lgsm/functions/check_status.sh index f82d75b58..0d699d440 100644 --- a/lgsm/functions/check_status.sh +++ b/lgsm/functions/check_status.sh @@ -7,7 +7,7 @@ local commandname="CHECK" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" -if [ "${gamename}" == "Teamspeak 3" ]; then +if [ "${gamename}" == "TeamSpeak 3" ]; then # 1: Server is running # 0: Server seems to have died # 0: No server running (ts3server.pid is missing) diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index 2072835be..f977aab0f 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -150,7 +150,7 @@ fn_details_gameserver(){ echo -e "${blue}Tick rate:\t${default}${tickrate}" fi - # Teamspeak dbplugin + # TeamSpeak dbplugin if [ -n "${dbplugin}" ]; then echo -e "${blue}dbplugin:\t${default}${dbplugin}" fi @@ -286,7 +286,7 @@ fn_details_ports(){ echo -e "Change ports by editing the parameters in:" parmslocation="${red}UNKNOWN${default}" - local ports_edit_array=( "avalanche" "dontstarve" "projectzomboid" "idtech3" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "Teamspeak 3" "7 Days To Die" ) + local ports_edit_array=( "avalanche" "dontstarve" "projectzomboid" "idtech3" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "TeamSpeak 3" "7 Days To Die" ) for port_edit in "${ports_edit_array[@]}" do if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then @@ -569,7 +569,7 @@ fn_details_gameserver fn_details_script fn_details_backup # Some game servers do not have parms. -if [ "${gamename}" != "Teamspeak 3" ]&&[ "${engine}" != "avalanche" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]; then +if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]; then fn_parms fn_details_commandlineparms fi @@ -606,7 +606,7 @@ elif [ "${gamename}" == "Hurtworld" ]; then fn_details_hurtworld elif [ "${gamename}" == "7 Days To Die" ]; then fn_details_sdtd -elif [ "${gamename}" == "Teamspeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]; then fn_details_teamspeak3 elif [ "${gamename}" == "Rust" ]; then fn_details_rust diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index 6d2bcf40e..33050adc0 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -17,7 +17,7 @@ check_deps.sh if [ "${gamename}" == "Unreal Tournament 2004" ]; then install_server_files.sh install_ut2k4_key.sh -elif [ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Teamspeak 3" ]; then +elif [ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "TeamSpeak 3" ]; then installer=1 install_server_files.sh elif [ -n "${appid}" ]; then @@ -29,7 +29,7 @@ fi install_config.sh if [ "${gamename}" == "Counter Strike: Global Offensive" ]||[ "${gamename}" == "Team Fortress 2" ]||[ "${gamename}" == "BrainBread 2" ]; then install_gslt.sh -elif [ "${gamename}" == "Teamspeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]; then install_ts3db.sh fi diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index 44e8506e7..46f4f9725 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -90,7 +90,7 @@ info_config.sh fn_monitor_check_lockfile fn_monitor_check_update fn_monitor_msg_checking -if [ "${gamename}" == "Teamspeak 3" ]; then +if [ "${gamename}" == "TeamSpeak 3" ]; then fn_monitor_teamspeak3 else fn_monitor_tmux diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 288c79e73..18af0c786 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -177,7 +177,7 @@ if [ "${status}" == "0" ]; then fi fi -if [ "${gamename}" == "Teamspeak 3" ]; then +if [ "${gamename}" == "TeamSpeak 3" ]; then fn_start_teamspeak3 else fn_start_tmux diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh index f1c333dee..aab090c7b 100644 --- a/lgsm/functions/command_stop.sh +++ b/lgsm/functions/command_stop.sh @@ -239,7 +239,7 @@ fn_stop_tmux(){ # checks if the server is already stopped before trying to stop. fn_stop_pre_check(){ - if [ "${gamename}" == "Teamspeak 3" ]; then + if [ "${gamename}" == "TeamSpeak 3" ]; then check_status.sh if [ "${status}" == "0" ]; then fn_print_info_nl "${servername} is already stopped" diff --git a/lgsm/functions/command_update.sh b/lgsm/functions/command_update.sh index e0fde4a0b..794964eeb 100644 --- a/lgsm/functions/command_update.sh +++ b/lgsm/functions/command_update.sh @@ -13,7 +13,7 @@ sleep 0.5 check.sh -if [ "${gamename}" == "Teamspeak 3" ]; then +if [ "${gamename}" == "TeamSpeak 3" ]; then update_ts3.sh else update_steamcmd.sh diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index 772a5a4b3..d64983ee0 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -445,7 +445,7 @@ case "${getopt}" in if [ "${gamename}" == "Mumble" ]; then fn_getopt_mumble -elif [ "${gamename}" == "Teamspeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]; then fn_getopt_teamspeak3 elif [ "${gamename}" == "Garry's Mod" ]; then fn_getopt_gmodserver diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index 6a69bd759..7f27d886c 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -45,7 +45,7 @@ if [ "${function_selfname}" != "command_install.sh" ]; then fix_arma3.sh fi - if [ "${gamename}" != "Teamspeak 3" ]; then + if [ "${gamename}" != "TeamSpeak 3" ]; then fix_glibc.sh fi fi diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 00c9b40b5..043a004c7 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -318,7 +318,7 @@ elif [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]; then # Starbound elif [ "${engine}" == "starbound" ]; then fn_info_config_starbound -elif [ "${gamename}" == "Teamspeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]; then fn_info_config_teamspeak3 # Teeworlds elif [ "${engine}" == "teeworlds" ]; then diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 2a1adc058..31308e947 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -68,7 +68,7 @@ elif [ "${engine}" == "unreal4" ]; then elif [ "${engine}" == "unity3d" ]; then glibcrequired="2.15" glibcfix="no" -elif [ "${gamename}" == "Teamspeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" else diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 7e0438b6b..07bf7bfeb 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -341,7 +341,7 @@ elif [ "${gamename}" == "Starbound" ]; then sleep 1 fn_defaultconfig fn_userinputconfig -elif [ "${gamename}" == "Teamspeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]; then echo -e "downloading lgsm-default.ini...\c" wget -N /dev/null ${githuburl}/TeamSpeak3/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq sleep 1 diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index 59446681a..5c274a491 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -22,8 +22,8 @@ if [ -n "${consolelogdir}" ]; then touch "${consolelog}" fi -# If a server is source or goldsource, Teamspeak 3, Starbound, Project Zomhoid create a symbolic link to the game server logs. -if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]||[ "${gamename}" == "Teamspeak 3" ]||[ "${engine}" == "starbound" ]||[ "${engine}" == "projectzomboid" ]||[ "${engine}" == "unreal" ]; then +# If a server is source or goldsource, TeamSpeak 3, Starbound, Project Zomhoid create a symbolic link to the game server logs. +if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${engine}" == "starbound" ]||[ "${engine}" == "projectzomboid" ]||[ "${engine}" == "unreal" ]; then if [ ! -h "${rootdir}/log/server" ]; then ln -nfsv "${gamelogdir}" "${rootdir}/log/server" fi diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index d881a2717..c9d91e720 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -92,7 +92,7 @@ echo "Installing ${gamename} Server" echo "=================================" sleep 1 -if [ "${gamename}" == "Teamspeak 3" ]; then +if [ "${gamename}" == "TeamSpeak 3" ]; then update_ts3.sh elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]; then fn_install_server_files diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index b83e1169a..b77fbf31f 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -1,5 +1,5 @@ #!/bin/bash -# TravisCI Tests: Teamspeak 3 +# TravisCI Tests: TeamSpeak 3 # Server Management Script # Author: Daniel Gibbs # Website: https://gameservermanagers.com @@ -42,8 +42,8 @@ githubrepo="linuxgsm" githubbranch="$TRAVIS_BRANCH" # Server Details -gamename="Teamspeak 3" -servername="Teamspeak 3 Server" +gamename="TeamSpeak 3" +servername="TeamSpeak 3 Server" servicename="ts3-server" # Directories