diff --git a/functions/fn_details_config b/functions/fn_details_config index 416d38133..815153f23 100644 --- a/functions/fn_details_config +++ b/functions/fn_details_config @@ -52,7 +52,7 @@ if [ "${engine}" == "avalanche" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "MaxPlayers" "${servercfgfullpath}" | tr -cd "[:digit:]") + slots=$(grep "MaxPlayers" "${servercfgfullpath}" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="NOT SET" fi @@ -62,7 +62,7 @@ if [ "${engine}" == "avalanche" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "BindPort" "${servercfgfullpath}" | tr -cd "[:digit:]") + port=$(grep "BindPort" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -95,7 +95,7 @@ elif [ "${engine}" == "dontstarve" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "max_players" "${servercfgfullpath}" | grep -v "#" | tr -cd "[:digit:]") + slots=$(grep "max_players" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="NOT SET" fi @@ -115,7 +115,7 @@ elif [ "${engine}" == "dontstarve" ]; then # tickrate if [ -f "${servercfgfullpath}" ]; then - tickrate=$(grep "tick_rate" "${servercfgfullpath}" | grep -v "#" | tr -cd "[:digit:]") + tickrate=$(grep "tick_rate" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') if [ ! -n "${tickrate}" ]; then tickrate="NOT SET" fi @@ -125,7 +125,7 @@ elif [ "${engine}" == "dontstarve" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "server_port" "${servercfgfullpath}" | grep -v "#" | tr -cd "[:digit:]") + port=$(grep "server_port" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -148,7 +148,7 @@ elif [ "${engine}" == "projectzomboid" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "MaxPlayers=" "${servercfgfullpath}" | grep -v "#" | tr -cd "[:digit:]") + slots=$(grep "MaxPlayers=" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="NOT SET" fi @@ -158,7 +158,7 @@ elif [ "${engine}" == "projectzomboid" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "DefaultPort=" "${servercfgfullpath}" | tr -cd "[:digit:]") + port=$(grep "DefaultPort=" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -201,7 +201,7 @@ elif [ "${engine}" == "realvirtuality" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "maxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd "[:digit:]") + slots=$(grep "maxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="NOT SET" fi @@ -211,7 +211,7 @@ elif [ "${engine}" == "realvirtuality" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "serverport=" "${servercfgfullpath}" | grep -v // | tr -d '\r' | tr -cd "[:digit:]") + port=$(grep "serverport=" "${servercfgfullpath}" | grep -v // | tr -d '\r' | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -219,7 +219,7 @@ elif [ "${engine}" == "realvirtuality" ]; then # query port if [ -f "${servercfgfullpath}" ]; then - queryport=$(grep "steamqueryport=" "${servercfgfullpath}" | grep -v // | tr -d '\r' | tr -cd "[:digit:]") + queryport=$(grep "steamqueryport=" "${servercfgfullpath}" | grep -v // | tr -d '\r' | tr -cd '[:digit:]') fi if [ ! -n "${queryport}" ]; then queryport="0" @@ -227,7 +227,7 @@ elif [ "${engine}" == "realvirtuality" ]; then # master port if [ -f "${servercfgfullpath}" ]; then - masterport=$(grep "steamport=" "${servercfgfullpath}" | grep -v // | tr -d '\r' | tr -cd "[:digit:]") + masterport=$(grep "steamport=" "${servercfgfullpath}" | grep -v // | tr -d '\r' | tr -cd '[:digit:]') fi if [ ! -n "${masterport}" ]; then masterport="0" @@ -259,7 +259,7 @@ elif [ "${engine}" == "seriousengine35" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "gam_ctMaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd "[:digit:]") + slots=$(grep "gam_ctMaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="NOT SET" fi @@ -279,7 +279,7 @@ elif [ "${engine}" == "seriousengine35" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "prj_uwPort" "${servercfgfullpath}" | tr -d '\r' | tr -cd "[:digit:]") + port=$(grep "prj_uwPort" "${servercfgfullpath}" | tr -d '\r' | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -364,7 +364,7 @@ elif [ "${gamename}" == "Teamspeak 3" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "default_voice_port=" "${servercfgfullpath}" | tr -cd "[:digit:]") + port=$(grep "default_voice_port=" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="9987" @@ -372,7 +372,7 @@ elif [ "${gamename}" == "Teamspeak 3" ]; then # query port if [ -f "${servercfgfullpath}" ]; then - queryport=$(grep "query_port=" "${servercfgfullpath}" | tr -cd "[:digit:]") + queryport=$(grep "query_port=" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${queryport}" ]; then queryport="10011" @@ -380,7 +380,7 @@ elif [ "${gamename}" == "Teamspeak 3" ]; then # file port if [ -f "${servercfgfullpath}" ]; then - fileport=$(grep "filetransfer_port=" "${servercfgfullpath}" | tr -cd "[:digit:]") + fileport=$(grep "filetransfer_port=" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${fileport}" ]; then fileport="30033" @@ -422,7 +422,7 @@ elif [ "${engine}" == "teeworlds" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "sv_port" "${servercfgfullpath}" | tr -cd "[:digit:]") + port=$(grep "sv_port" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="8303" @@ -430,7 +430,7 @@ elif [ "${engine}" == "teeworlds" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "sv_max_clients" "${servercfgfullpath}" | tr -cd "[:digit:]") + slots=$(grep "sv_max_clients" "${servercfgfullpath}" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="12" fi @@ -444,7 +444,7 @@ elif [ "${engine}" == "terraria" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "port=" "${servercfgfullpath}" | tr -cd "[:digit:]") + port=$(grep "port=" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -484,7 +484,7 @@ elif [ "${engine}" == "unity3d" ]; then # webadmin port if [ -f "${servercfgfullpath}" ]; then - webadminport=$(grep "ControlPanelPort" "${servercfgfullpath}" | tr -cd "[:digit:]") + webadminport=$(grep "ControlPanelPort" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${webadminport}" ]; then webadminport="0" @@ -522,7 +522,7 @@ elif [ "${engine}" == "unity3d" ]; then # telnet port if [ -f "${servercfgfullpath}" ]; then - telnetport=$(grep "TelnetPort" "${servercfgfullpath}" | tr -cd "[:digit:]") + telnetport=$(grep "TelnetPort" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${telnetport}" ]; then telnetport="0" @@ -540,7 +540,7 @@ elif [ "${engine}" == "unity3d" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "ServerMaxPlayerCount" "${servercfgfullpath}" | tr -cd "[:digit:]") + slots=$(grep "ServerMaxPlayerCount" "${servercfgfullpath}" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="NOT SET" fi @@ -570,7 +570,7 @@ elif [ "${engine}" == "unity3d" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "sv_port" "${servercfgfullpath}" | tr -cd "[:digit:]") + port=$(grep "sv_port" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -620,7 +620,7 @@ elif [ "${engine}" == "unreal" ] || [ "${engine}" == "unreal2" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "Port=" "${servercfgfullpath}" | grep -v "Master" | grep -v "LAN" | grep -v "Proxy" | grep -v "Listen" | tr -d '\r' | tr -cd "[:digit:]") + port=$(grep "Port=" "${servercfgfullpath}" | grep -v "Master" | grep -v "LAN" | grep -v "Proxy" | grep -v "Listen" | tr -d '\r' | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -636,7 +636,7 @@ elif [ "${engine}" == "unreal" ] || [ "${engine}" == "unreal2" ]; then # gamespy query port if [ -f "${servercfgfullpath}" ]; then - gsqueryport=$(grep "OldQueryPortNumber=" "${servercfgfullpath}" | tr -d '\r' | tr -cd "[:digit:]") + gsqueryport=$(grep "OldQueryPortNumber=" "${servercfgfullpath}" | tr -d '\r' | tr -cd '[:digit:]') fi if [ ! -n "${gsqueryport}" ]; then gsqueryport="0" @@ -662,7 +662,7 @@ elif [ "${engine}" == "unreal" ] || [ "${engine}" == "unreal2" ]; then # webadmin port if [ -f "${servercfgfullpath}" ]; then - webadminport=$(grep "ListenPort=" "${servercfgfullpath}" | tr -d '\r' | tr -cd "[:digit:]") + webadminport=$(grep "ListenPort=" "${servercfgfullpath}" | tr -d '\r' | tr -cd '[:digit:]') fi if [ ! -n "${webadminport}" ]; then webadminport="0" @@ -750,7 +750,7 @@ elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then # slots if [ -f "${servercfgfullpath}" ]; then - slots=$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd "[:digit:]") + slots=$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]') if [ ! -n "${slots}" ]; then slots="NOT SET" fi @@ -760,7 +760,7 @@ elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then # port if [ -f "${servercfgfullpath}" ]; then - port=$(grep "Port=" "${servercfgfullpath}" | grep -v "RCONPort=" | grep -v "QueryPort=" | tr -cd "[:digit:]") + port=$(grep "Port=" "${servercfgfullpath}" | grep -v "RCONPort=" | grep -v "QueryPort=" | tr -cd '[:digit:]') fi if [ ! -n "${port}" ]; then port="0" @@ -768,7 +768,7 @@ elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then # rcon port if [ -f "${servercfgfullpath}" ]; then - rconport=$(grep "RCONPort=" "${servercfgfullpath}" | tr -cd "[:digit:]") + rconport=$(grep "RCONPort=" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${rconport}" ]; then rconport="0" @@ -776,7 +776,7 @@ elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then # query port if [ -f "${servercfgfullpath}" ]; then - queryport=$(grep "QueryPort=" "${servercfgfullpath}" | tr -cd "[:digit:]") + queryport=$(grep "QueryPort=" "${servercfgfullpath}" | tr -cd '[:digit:]') fi if [ ! -n "${queryport}" ]; then queryport="0" diff --git a/functions/fn_details_distro b/functions/fn_details_distro index b438f012f..11122d7f6 100644 --- a/functions/fn_details_distro +++ b/functions/fn_details_distro @@ -2,7 +2,7 @@ # LGSM fn_details_distro function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 270515 +# Version: 301015 # Description: Variables providing useful info on the Operating System such as disk and performace info. # Used for fn_details, fn_debug and fn_email. @@ -29,7 +29,7 @@ glibcv=$(ldd --version |grep ldd|awk '{print $NF}') # e.g: tmux 1.6 if [ -z "$(command -v tmux)" ]; then tmuxv="\e[0;31mNOT INSTALLED!\e[0m" -elif [ "$(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd [:digit:])" -lt "16" ]; then +elif [ "$(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd '[:digit:])' -lt "16" ]; then tmuxv="$(tmux -V) (>= 1.6 required for console log)" else tmuxv=$(tmux -V) diff --git a/functions/fn_install_ts3 b/functions/fn_install_ts3 index 67c6d5c9d..78246c0cf 100644 --- a/functions/fn_install_ts3 +++ b/functions/fn_install_ts3 @@ -2,7 +2,7 @@ # LGSM fn_install_ts3 function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 270715 +# Version: 301015 fn_details_distro # Gets the teamspeak server architecture @@ -19,7 +19,7 @@ fi wget "http://dl.4players.de/ts/releases/?C=M;O=D" -q -O -| grep -i dir | egrep -o '.*\/<\/a>' | egrep -o '[0-9\.?]+'|uniq > .ts3_version_numbers_unsorted.tmp # removes digits to allow sorting of numbers -cat .ts3_version_numbers_unsorted.tmp |tr -cd "[:digit:][*\n]" > .ts3_version_numbers_digit.tmp +cat .ts3_version_numbers_unsorted.tmp |tr -cd '[:digit:][*\n]' > .ts3_version_numbers_digit.tmp # Sorts numbers in to correct order # merges two files in to one with two columns sorts the numbers in to order then only outputs the second to the ts3_version_numbers.tmp paste .ts3_version_numbers_digit.tmp .ts3_version_numbers_unsorted.tmp |sort -rn|awk '{ print $2 }' > .ts3_version_numbers.tmp diff --git a/functions/fn_monitor_query b/functions/fn_monitor_query index e58387cc8..0b575bb42 100644 --- a/functions/fn_monitor_query +++ b/functions/fn_monitor_query @@ -2,7 +2,7 @@ # LGSM fn_monitor_query function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030715 +# Version: 301015 # Description: uses gsquery.py to directly query the server. # Detects if the server has frozen. @@ -10,15 +10,15 @@ local modulename="Monitor" if [ -f "${rootdir}/gsquery.py" ]; then if [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then - gameport=$(grep Port= "${servercfgfullpath}"|grep -v Master|grep -v LAN|grep -v Proxy|grep -v Listen|tr -d '\r'|tr -cd [:digit:]) + gameport=$(grep Port= "${servercfgfullpath}"|grep -v Master|grep -v LAN|grep -v Proxy|grep -v Listen|tr -d '\r'|tr -cd '[:digit:]') port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) elif [ "${engine}" == "realvirtuality" ]; then - queryport=$(grep -s steamqueryport= "${servercfgfullpath}"|grep -v //|tr -d '\r'|tr -cd [:digit:]) + queryport=$(grep -s steamqueryport= "${servercfgfullpath}"|grep -v //|tr -d '\r'|tr -cd '[:digit:]') port=${queryport} elif [ "${engine}" == "unity3d" ]; then - gameport=$(grep ServerPort "${servercfgfullpath}"|tr -cd [:digit:]) + gameport=$(grep ServerPort "${servercfgfullpath}"|tr -cd '[:digit:]') port=$((${gameport} + 1)) fi fn_printinfo "Detected gsquery.py" diff --git a/functions/fn_start b/functions/fn_start index 8bb90da71..66d9ae355 100644 --- a/functions/fn_start +++ b/functions/fn_start @@ -2,7 +2,7 @@ # LGSM fn_start function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 291015 +# Version: 301015 # Description: Starts the server. @@ -126,11 +126,11 @@ date > "${rootdir}/${lockselfname}" cd "${executabledir}" tmux new-session -d -s "${servicename}" "${executable} ${parms}" 2> "${scriptlogdir}/.${servicename}-tmux-error.tmp" # tmux pipe-pane not supported in tmux versions < 1.6 -if [ "$(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd [:digit:])" -lt "16" ]; then +if [ "$(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd '[:digit:]')" -lt "16" ]; then echo "Console logging disabled: Tmux => 1.6 required" >> "${consolelog}" echo "http://gameservermanagers.com/tmux-upgrade" >> "${consolelog}" echo "Currently installed: $(tmux -V)" >> "${consolelog}" -elif [ "$(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd [:digit:])" -eq "18" ]; then +elif [ "$(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd '[:digit:]')" -eq "18" ]; then echo "Console logging disabled: Bug in tmux 1.8 breaks logging" >> "${consolelog}" echo "http://gameservermanagers.com/tmux-upgrade" >> "${consolelog}" echo "Currently installed: $(tmux -V)" >> "${consolelog}" diff --git a/functions/fn_update_check b/functions/fn_update_check index 9f289fe29..f41203b50 100644 --- a/functions/fn_update_check +++ b/functions/fn_update_check @@ -2,7 +2,7 @@ # LGSM fn_update_check function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 281015 +# Version: 301015 # Description: Checks if a server update is available. @@ -219,7 +219,7 @@ ts3arch=$(ls $(find ${filesdir}/ -name 'ts3server_*_*' 2> /dev/null | grep -v 't wget "http://dl.4players.de/ts/releases/?C=M;O=D" -q -O -| grep -i dir | egrep -o '.*\/<\/a>' | egrep -o '[0-9\.?]+'|uniq > .ts3_version_numbers_unsorted.tmp # removes digits to allow sorting of numbers -cat .ts3_version_numbers_unsorted.tmp |tr -cd "[:digit:][*\n]" > .ts3_version_numbers_digit.tmp +cat .ts3_version_numbers_unsorted.tmp |tr -cd '[:digit:][*\n]' > .ts3_version_numbers_digit.tmp # Sorts numbers in to correct order # merges two files in to one with two columns sorts the numbers in to order then only outputs the second to the ts3_version_numbers.tmp paste .ts3_version_numbers_digit.tmp .ts3_version_numbers_unsorted.tmp |sort -rn|awk '{ print $2 }' > .ts3_version_numbers.tmp @@ -253,8 +253,8 @@ else fi # Removes dots so if can compare version numbers -currentbuilddigit=$(echo "${currentbuild}"|tr -cd "[:digit:]") -availablebuilddigit=$(echo "${availablebuild}"|tr -cd "[:digit:]") +currentbuilddigit=$(echo "${currentbuild}"|tr -cd '[:digit:]') +availablebuilddigit=$(echo "${availablebuild}"|tr -cd '[:digit:]') if [ "${currentbuilddigit}" -ne "${availablebuilddigit}" ]; then echo -e "\n" echo -e "Update available:"