From 6bc2132c51558ae9bcf03224e81a314847a139f9 Mon Sep 17 00:00:00 2001 From: Ilija Matoski Date: Sun, 1 Mar 2015 18:02:56 +0100 Subject: [PATCH 1/7] Added a way to have multiple configuration in the same directory --- CounterStrikeGlobalOffensive/csgoserver | 7 +++ functions/fn_functions | 5 ++ functions/fn_getopt | 10 ++-- functions/fn_select | 80 +++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 5 deletions(-) mode change 100644 => 100755 CounterStrikeGlobalOffensive/csgoserver create mode 100644 functions/fn_select diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver old mode 100644 new mode 100755 index c3f90b476..7a48dcff5 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -111,5 +111,12 @@ fn_runfunction fn_functions +# init the getopt function variables getopt=$1 + +# init the select function variables +usesrvcfg=1 +getsrvcfg=$2 + +fn_select fn_getopt diff --git a/functions/fn_functions b/functions/fn_functions index b0b369436..b605069d7 100644 --- a/functions/fn_functions +++ b/functions/fn_functions @@ -268,5 +268,10 @@ 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 65fc2ad75..eb8e6beec 100644 --- a/functions/fn_getopt +++ b/functions/fn_getopt @@ -42,7 +42,7 @@ case "$getopt" in auto-install) fn_autoinstall;; *) - echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install|auto-install}" + echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install|auto-install} $appendextra" exit 1;; esac exit @@ -67,7 +67,7 @@ case "$getopt" in backup) fn_backup;; *) - echo "Usage: $0 {start|stop|restart|backup|monitor|email-test|details|backup}" + echo "Usage: $0 {start|stop|restart|backup|monitor|email-test|details|backup} $appendextra" exit 1;; esac exit @@ -98,7 +98,7 @@ case "$getopt" in map-compressor) fn_compress_ut99maps;; *) - echo "Usage: $0 {start|stop|restart|monitor|email-test|details|backup|console|debug|install|map-compressor}" + echo "Usage: $0 {start|stop|restart|monitor|email-test|details|backup|console|debug|install|map-compressor} $appendextra" exit 1;; esac exit @@ -143,7 +143,7 @@ case "$getopt" in map-compressor) fn_compress_unreal2maps;; *) - echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install|auto-install|map-compressor}" + echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install|auto-install|map-compressor} $appendextra" exit 1;; esac exit @@ -175,7 +175,7 @@ case "$getopt" in map-compressor) fn_compress_unreal2maps;; *) - echo "Usage: $0 {start|stop|restart|monitor|email-test|details|backup|console|debug|install|map-compressor}" + echo "Usage: $0 {start|stop|restart|monitor|email-test|details|backup|console|debug|install|map-compressor} $appendextra" exit 1;; esac exit diff --git a/functions/fn_select b/functions/fn_select new file mode 100644 index 000000000..8a10f7157 --- /dev/null +++ b/functions/fn_select @@ -0,0 +1,80 @@ +#!/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 + fn_printwarn "$getsrvcfg configuration file doesn't exist, use one of the available ones ($appendextra)\n" + 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 From 217d87f31a87c3ce45af7c2a7d15a14f70b4b403 Mon Sep 17 00:00:00 2001 From: Ilija Matoski Date: Sun, 1 Mar 2015 18:09:36 +0100 Subject: [PATCH 2/7] Added a message to differentiate between specified a config and not --- functions/fn_select | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/functions/fn_select b/functions/fn_select index 8a10f7157..4976b0a2f 100644 --- a/functions/fn_select +++ b/functions/fn_select @@ -51,7 +51,11 @@ if [ $usesrvcfg -eq 1 ]; then # it's invalid cfg setting if [ $invalidcfg -eq 1 ]; then - fn_printwarn "$getsrvcfg configuration file doesn't exist, use one of the available ones ($appendextra)\n" + 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 From 8a714b00cb9052ecf4a772ce4b64525abff558f4 Mon Sep 17 00:00:00 2001 From: Ilija Matoski Date: Sun, 1 Mar 2015 18:19:52 +0100 Subject: [PATCH 3/7] $(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd '[:digit:]') doesn't work on some version of bash unless [:digit:] is enclosed in qoutes --- functions/fn_details_distro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/fn_details_distro b/functions/fn_details_distro index 378146df8..0748fbbad 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) From 354f6e0251e13709de4ac7ce8b670c6cd0e11b80 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 23 Apr 2015 14:51:35 +0100 Subject: [PATCH 4/7] Added fn_update_sdtd_allocfixes --- functions/fn_update_sdtd_allocfixes | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 functions/fn_update_sdtd_allocfixes diff --git a/functions/fn_update_sdtd_allocfixes b/functions/fn_update_sdtd_allocfixes new file mode 100644 index 000000000..fdcd6e44b --- /dev/null +++ b/functions/fn_update_sdtd_allocfixes @@ -0,0 +1,33 @@ +#!/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 From 0cbc6d9f35b67e208dbf398b0f4b124dd015599f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 23 Apr 2015 14:53:40 +0100 Subject: [PATCH 5/7] Added travis-ci image --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9b3f58c56..0339a32b1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@

Linux Game Server Managers_

linux Game Server Managers +[![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.

Hassle Free Dedicated Servers

From 620c51b5af2bad48a0406c195bac24ae9e03d253 Mon Sep 17 00:00:00 2001 From: Ilija Matoski Date: Sat, 9 May 2015 20:31:23 +0200 Subject: [PATCH 6/7] Added gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..485dee64b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea From f1c80c1ebd1b3f9ff31c0f6ad849d98deb9cfe52 Mon Sep 17 00:00:00 2001 From: Scarsz Date: Sat, 9 May 2015 12:10:35 -0700 Subject: [PATCH 7/7] Update development Travis-CI image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0bc59711..ea31d8b0d 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=master)](https://travis-ci.org/dgibbs64/linuxgsm) +[![Build Status](https://travis-ci.org/dgibbs64/linuxgsm.svg?branch=development)](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.