|
|
@@ -3,7 +3,7 @@
|
|
|
# Server Management Script
|
|
|
# Author: Daniel Gibbs
|
|
|
# Website: http://gameservermanagers.com
|
|
|
-version="040715"
|
|
|
+version="121215"
|
|
|
|
|
|
#### Variables ####
|
|
|
|
|
|
@@ -27,6 +27,13 @@ parms="server ${defaultmap}?game=ROGame.ROTeamGame?VACSecured=true -nohomedir in
|
|
|
|
|
|
#### Advanced Variables ####
|
|
|
|
|
|
+# Github Branch Select
|
|
|
+# Allows for the use of different function files
|
|
|
+# from a different repo and/or branch.
|
|
|
+githubuser="dgibbs64"
|
|
|
+githubrepo="linuxgsm"
|
|
|
+githubbranch="master"
|
|
|
+
|
|
|
# Server Details
|
|
|
servicename="ro-server"
|
|
|
gamename="Red Orchestra: Ostfront 41-45"
|
|
|
@@ -36,8 +43,8 @@ engine="unreal2"
|
|
|
appid="223250"
|
|
|
|
|
|
# Directories
|
|
|
-rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
|
-selfname="$(basename $0)"
|
|
|
+rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
|
|
|
+selfname=$(basename $(readlink -f "${BASH_SOURCE[0]}"))
|
|
|
lockselfname=".${servicename}.lock"
|
|
|
filesdir="${rootdir}/serverfiles"
|
|
|
systemdir="${filesdir}/system"
|
|
|
@@ -68,20 +75,45 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-
|
|
|
##### Script #####
|
|
|
# Do not edit
|
|
|
|
|
|
-fn_runfunction(){
|
|
|
-# Functions are downloaded and run with this function
|
|
|
-if [ ! -f "${rootdir}/functions/${functionfile}" ]; then
|
|
|
- cd "${rootdir}"
|
|
|
- if [ ! -d "functions" ]; then
|
|
|
- mkdir functions
|
|
|
+fn_getgithubfile(){
|
|
|
+filename=$1
|
|
|
+exec=$2
|
|
|
+fileurl=${3:-$filename}
|
|
|
+filepath="${rootdir}/${filename}"
|
|
|
+filedir=$(dirname "${filepath}")
|
|
|
+# If the function file is missing, then download
|
|
|
+if [ ! -f "${filepath}" ]; then
|
|
|
+ if [ ! -d "${filedir}" ]; then
|
|
|
+ mkdir "${filedir}"
|
|
|
fi
|
|
|
- cd functions
|
|
|
- echo -e " loading ${functionfile}...\c"
|
|
|
- wget -N /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/functions/${functionfile} 2>&1 | grep -F HTTP | cut -c45-
|
|
|
- chmod +x "${functionfile}"
|
|
|
- cd "${rootdir}"
|
|
|
+ githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${fileurl}"
|
|
|
+ echo -e " fetching ${filename}...\c"
|
|
|
+ if [ "$(command -v curl)" ]||[ "$(which curl >/dev/null 2>&1)" ]||[ -f "/usr/bin/curl" ]||[ -f "/bin/curl" ]; then
|
|
|
+ echo -e "\e[0;31mFAIL\e[0m\n"
|
|
|
+ echo "Curl is not installed!"
|
|
|
+ echo -e ""
|
|
|
+ exit
|
|
|
+ fi
|
|
|
+ CURL=$(curl --fail -o "${filepath}" "${githuburl}" 2>&1)
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
+ echo -e "\e[0;31mFAIL\e[0m\n"
|
|
|
+ echo " $CURL"|grep "curl:"
|
|
|
+ echo -e "${githuburl}\n"
|
|
|
+ exit
|
|
|
+ else
|
|
|
+ echo -e "\e[0;32mOK\e[0m"
|
|
|
+ fi
|
|
|
+ if [ "${exec}" ]; then
|
|
|
+ chmod +x "${filepath}"
|
|
|
+ fi
|
|
|
+fi
|
|
|
+if [ "${exec}" ]; then
|
|
|
+ source "${filepath}"
|
|
|
fi
|
|
|
-source "${rootdir}/functions/${functionfile}"
|
|
|
+}
|
|
|
+
|
|
|
+fn_runfunction(){
|
|
|
+ fn_getgithubfile "functions/${functionfile}" 1
|
|
|
}
|
|
|
|
|
|
fn_functions(){
|