diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 7b31dce80..7413532ab 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -17,7 +17,8 @@ steamuser="username" steampass="password" # Start Variables -ip="0.0.0.0" # can leave to answer on any IP +ip="0.0.0.0" +updateonstart="no" # Mod Variables diff --git a/Arma3/arma3server b/Arma3/arma3server index bc8c297d8..feab9e5d1 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -4,7 +4,7 @@ # Author: Daniel Gibbs # Contributor: Scarsz # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -17,8 +17,9 @@ email="email@example.com" steamuser="username" steampass="password" -# Server IP +# Start Variables ip="0.0.0.0" +updateonstart="no" fn_parms(){ parms="-netlog -ip=${ip} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods}" diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 18735f9e6..5a7940c97 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/CounterStrike/csserver b/CounterStrike/csserver index 83d39c4d3..7664e1c85 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 98e1de402..a78fc5fa9 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index f3bf39b25..492e6f912 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -34,6 +34,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # Optional: Workshop Parameters # https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators # To get an authkey visit - http://steamcommunity.com/dev/apikey @@ -111,12 +112,5 @@ fn_runfunction fn_functions -# init the getopt function variables getopt=$1 - -# init the select function variables -usesrvcfg=1 -getsrvcfg=$2 - -fn_select -fn_getopt +fn_getopt \ No newline at end of file diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 7b15c2a60..30a359787 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index 910c771db..a360939a4 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 76a1db9d0..10624293a 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index d83287c3c..ebaac87c1 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index dcdf65ac8..9a84ef2e0 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index a73136137..c3f8c4f25 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 52fcc34af..75a97aac3 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -29,6 +29,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index e6355526b..af8e2f301 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index a531413f4..ef651d7da 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index ebf180efa..b8fdb4476 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 050515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/Insurgency/insserver b/Insurgency/insserver index 2eb1f84ab..f9fe3f0dc 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/JustCause2/jc2server b/JustCause2/jc2server index 760865f1e..d17378233 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -20,6 +20,7 @@ steampass="" maxplayers="10" port="7777" ip="0.0.0.0" +updateonstart="no" fn_parms(){ parms="--maxplayers ${maxplayers} --bindip ${ip} --bindport ${port}" diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index f58c20e9a..e5cea676c 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -19,6 +19,7 @@ steampass="password" # Start Variables defaultmap="KF-BioticsLab.rom" ip="0.0.0.0" +updateonstart="no" fn_parms(){ parms="server ${defaultmap}?game=KFmod.KFGameType?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}" diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index d31922233..80eec42ab 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -4,7 +4,7 @@ # Author: Daniel Gibbs # Contributor: Summit Singh Thakur # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ maxplayers="8" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 0f8862f9d..89d5e6738 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="8" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index baf1a24aa..55fef25c6 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -21,6 +21,7 @@ defaultmap="co_core" port="27015" maxplayers="24" ip="0.0.0.0" +updateonstart="no" servername="NS2C Server" webadminuser="admin" webadminpass="admin" diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index b5cd9f8b7..15002709b 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -21,6 +21,7 @@ defaultmap="ns2_summit" port="27015" maxplayers="24" ip="0.0.0.0" +updateonstart="no" servername="NS2 Server" webadminuser="admin" webadminpass="admin" diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index a9fe51db0..4a10e416d 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 076b15820..68fc372fb 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 8a3448065..d32f05769 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -18,6 +18,7 @@ steampass="" # Start Variables ip="0.0.0.0" +updateonstart="no" fn_parms(){ parms="" diff --git a/README.md b/README.md index ea31d8b0d..a0bc59711 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

Linux Game Server Managers_

linux Game Server Managers -[![Build Status](https://travis-ci.org/dgibbs64/linuxgsm.svg?branch=development)](https://travis-ci.org/dgibbs64/linuxgsm) +[![Build Status](https://travis-ci.org/dgibbs64/linuxgsm.svg?branch=master)](https://travis-ci.org/dgibbs64/linuxgsm) The Linux Game Server Managers are command line tools for quick, simple deployment and management of various dedicated game servers and voice comms servers. diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 5fea7a39a..823349ba8 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -19,6 +19,7 @@ steampass="password" # Start Variables defaultmap="RO-Arad.rom" ip="0.0.0.0" +updateonstart="no" fn_parms(){ parms="server ${defaultmap}?game=ROGame.ROTeamGame?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}" diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index 04951d876..ce9d707db 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index 3c953b71e..30dfe3c69 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -18,6 +18,7 @@ steampass="password" # Start Variables ip="0.0.0.0" +updateonstart="no" # https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/SeriousSam3BFE/help/DedicatedServer_Readme.txt fn_parms(){ diff --git a/StarBound/sbserver b/StarBound/sbserver index 1aa505da6..9a9aefae0 100644 --- a/StarBound/sbserver +++ b/StarBound/sbserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -18,6 +18,7 @@ steampass="password" # Start Variables ip="0.0.0.0" +updateonstart="no" fn_parms(){ parms="" diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 22d1c372b..9eea49f8f 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -23,6 +23,7 @@ port="27015" sourcetvport="27020" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 5d4132b15..245d7e606 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -22,6 +22,7 @@ maxplayers="16" port="27015" clientport="27005" ip="0.0.0.0" +updateonstart="no" # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index 583f99d80..12e64afa0 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 030515 +# Version: 090515 #### Variables #### @@ -12,6 +12,9 @@ emailnotification="off" email="email@example.com" +# Start Variables +updateonstart="no" + # Server Details gamename="Teamspeak 3" servername="Teamspeak 3 Server" diff --git a/functions/fn_details_distro b/functions/fn_details_distro index ef9b7bfad..174c4c794 100644 --- a/functions/fn_details_distro +++ b/functions/fn_details_distro @@ -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_functions b/functions/fn_functions index 71c8296a3..f43b0a867 100644 --- a/functions/fn_functions +++ b/functions/fn_functions @@ -273,10 +273,5 @@ functionfile="${FUNCNAME}" fn_runfunction } -fn_select(){ -functionfile="${FUNCNAME}" -fn_runfunction -} - # Calls on-screen messages fn_messages diff --git a/functions/fn_getopt b/functions/fn_getopt index 79ef40887..2d0448c2d 100644 --- a/functions/fn_getopt +++ b/functions/fn_getopt @@ -41,7 +41,7 @@ case "$getopt" in auto-install) fn_autoinstall;; *) - echo "Usage: $0 {start|stop|restart|update|force-update|validate|monitor|email-test|details|backup|console|debug|install|auto-install} $appendextra" + echo "Usage: $0 {start|stop|restart|update|force-update|validate|monitor|email-test|details|backup|console|debug|install|auto-install}" exit 1;; esac exit diff --git a/functions/fn_select b/functions/fn_select deleted file mode 100644 index 4976b0a2f..000000000 --- a/functions/fn_select +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -# LGSM fn_select function -# Author: Ilija Matoski (ilijamt@gmail.com) -# Website: https://matoski.com -# Version: 010316 - -# Description: Automatically selects a created server from the available ones defined in the root -# If no server files found . it will default to the data in the game file - -if [ $usesrvcfg -eq 1 ]; then - - if [ -z "$appid" ]; then - fn_printwarn "appid not found for $gamename, this is not supported.\n\n" - exit - fi - - # get all the available configs for the appid - cfgs=() - filelist=(`find $rootdir -type f -name "*.$appid"`) - for file in "${filelist[@]}"; do - cfg=${file:${#rootdir}+1} - cfg=${cfg:0:${#cfg} - 4} - cfgs+=("$cfg") - done - - # create the append extra list for the options - appendextra=$(printf "|%s" "${cfgs[@]}") - appendextra=${appendextra:1} - loadcfg= - invalidcfg=0 - reinit=0 - - # if we don't have any config files proced as normal so skip the next part - if [ ${#cfgs[@]} -eq 1 ]; then - # we have only one config file so we load that one only unless the user specifies it manually, then we verify - loadcfg="${cfgs[0]}"; - if [ ! -z "$getsrvcfg" ] && [ ! -f "${getsrvcfg}.${appid}" ]; then - invalidcfg=1 - fi - elif [ ${#cfgs[@]} -gt 0 ]; then - # we have more than one files available so we continue on the verification if the file is present - loadcfg="$getsrvcfg"; - if [ -z "$getsrvcfg" ] || [ ! -f "${getsrvcfg}.${appid}" ]; then - invalidcfg=1 - fi - else - # we don't have anything so we need to continue on without touching anything - reinit=0 - loadcfg= - fi - - # it's invalid cfg setting - if [ $invalidcfg -eq 1 ]; then - if [ -z "$getsrvcfg" ]; then - fn_printwarn "configuration file not specified, use one of the available ones ($appendextra)\n" - else - fn_printwarn "$getsrvcfg configuration file does not exist, use one of the available ones ($appendextra)\n" - fi - getopt= - fn_getopt - else - if [ ! -z "$loadcfg" ] && [ -f "${getsrvcfg}.${appid}" ]; then - # everything OK, load the config file and reinit the variables - source "${loadcfg}.${appid}" - reinit=1 - fi - fi - - if [ $reinit -eq 1 ]; then - case "$appid" in - *) - lockselfname=".${servicename}.lock" - servercfg="${servicename}.cfg" - servercfgfullpath="${servercfgdir}/${servercfg}" - scriptlog="${scriptlogdir}/${servicename}-script.log" - consolelog="${consolelogdir}/${servicename}-console.log" - emaillog="${scriptlogdir}/${servicename}-email.log" - scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log" - consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log" - ;; - esac - fi - -fi \ No newline at end of file diff --git a/functions/fn_start b/functions/fn_start index c98bbae1b..7bed76b69 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: 070515 +# Version: 090515 # Description: Starts the server. @@ -43,6 +43,12 @@ if [ ! -e "${servercfgfullpath}" ]; then touch "${servercfgfullpath}" fi fn_logs + +# Will check for updates is updateonstart is yes +if [ "${updateonstart}" == "yes" ]||[ "${updateonstart}" == "1" ]; then + fn_update_check +fi + fn_printdots "${servername}" fn_scriptlog "${servername}" sleep 1 @@ -102,6 +108,12 @@ if [ "${tmuxwc}" -eq 1 ]; then echo -en "\n" exit fi + +# Will check for updates is updateonstart is yes +if [ "${updateonstart}" == "yes" ]||[ "${updateonstart}" == "1" ]; then + fn_update_check +fi + # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" @@ -171,7 +183,7 @@ else fn_printok "${servername}" fn_scriptlog "Started ${servername}" fi -#rm "${scriptlogdir}/.${servicename}-tmux-error.tmp" +rm "${scriptlogdir}/.${servicename}-tmux-error.tmp" echo -en "\n" } diff --git a/functions/fn_update_sdtd_allocfixes b/functions/fn_update_sdtd_allocfixes deleted file mode 100644 index fdcd6e44b..000000000 --- a/functions/fn_update_sdtd_allocfixes +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# LGSM fn_sdtd_allocfixes function -# Author: Daniel Gibbs -# Website: http://danielgibbs.co.uk -# Version: 204014 - -# Description: Stops the server. - -if [ "${allocsfixes}" = true ]; then - sleep 5 - fn_scriptlog "Installing Alloc's Server Fixes" - echo -en "\n" - sleep 5 - echo -en "Installing Alloc's Server Fixes\n" - cd "${rootdir}"/serverfiles/ - rm -rf server_fixes.tar.gz - wget http://illy.bz/fi/7dtd/server_fixes.tar.gz - if [ -f "server_fixes.tar.gz" ]; then - tar -xzf server_fixes.tar.gz - rm -rf server_fixes.tar.gz - fn_scriptlog "Server Fixes Installed" - echo -en "Alloc's Server Fixes have been installed.\n" - else - if [ ! -f "server_fixes.tar.gz" ]; then - fn_scriptlog "Error downloading Server Fixes!" - fi - echo -en "There was a problem installing Alloc's Server Fixes!" - fi - - fn_scriptlog "Alloc's Server Fixes installed." - echo -en "FAlloc's Server Fixes installed.\n" -fi -} \ No newline at end of file