Updated the installer for kfserver and ut2k4server

-Removed charset fix as it appears to not be needed anymore (I can
re-add this if this is not the case.
-Tidied up the installer
- added serverquery.py function - ut2k4server
- modified fn_syscheck - ut2k4server
- moved Notification email to the top in line with other scripts -
ut2k4server

KillingFloor/kfserver

@@ -3,10 +3,15 @@
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-# Version: 010813
+# Version: 180813
 
 #### Variables ####
 
+# Notification Email
+# (on|off)
+emailnotification="off"
+email="email@example.com"
+
 # Steam login
 steamuser="username"
 steampass="password"
@@ -14,11 +19,6 @@ steampass="password"
 # Steam
 appid="215360"
 
-# Notification Email
-# (on|off)
-emailnotification="off"
-email="email@example.com"
-
 # Directorys
 rootdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
@@ -438,7 +438,6 @@ echo "Installing ${gamename} Server"
 echo "================================="
 	cd ${rootdir}/steamcmd
 	mkdir -v ${filesdir}
-	mkdir -v ${logdir}
 	touch install.txt
 	chmod 0600 install.txt
 	echo "login ${steamuser} ${steampass}" > install.txt
@@ -460,34 +459,34 @@ echo "================================="
 echo ""
 echo "Configuring ${gamename} Server"
 echo "================================="
+	sleep 1
 	echo "Copying ${systemdir}/default.ini to ${systemdir}/${ini}"
 	cp ${systemdir}/Default.ini ${systemdir}/${ini}
 	sleep 1
 	echo ""
-	echo "Applying WebAdmin CharSet fix!"
+	echo "Creating log directory"
-	echo "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1"
+	mkdir -v ${logdir}
 	sleep 1
 	echo ""
 	echo "Applying WebAdmin ROOst.css fix!"
 	echo "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
+	sed -i 's/none}/none;/g' ${filesdir}/Web/ServerAdmin/ROOst.css
+	sed -i 's/underline}/underline;/g' ${filesdir}/Web/ServerAdmin/ROOst.css
 	sleep 1
 	echo ""
 	echo "Setting WebAdmin username and password"
-	sleep 1
-	echo ""
-	echo "Enabling Web Interface"
-	sleep 2
-	sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' ${systemdir}/UWeb.int
-	sed -i 's/none}/none;/g' ${filesdir}/Web/ServerAdmin/ROOst.css
-	sed -i 's/underline}/underline;/g' ${filesdir}/Web/ServerAdmin/ROOst.css
 	sed -i 's/AdminName=/AdminName=admin/g' ${systemdir}/${ini}
 	sed -i 's/AdminPassword=/AdminPassword=kfpass/g' ${systemdir}/${ini}
+	sleep 1
+	echo ""
+	echo "Enabling WebAdmin"
 	sed -i 's/bEnabled=False/bEnabled=True/g' ${systemdir}/${ini}
-	mkdir ${logdir}
+	sleep 1
-	cd ${rootdir}
 	echo ""
+	cd ${rootdir}
 	echo "Default Settings"
 	echo "=============================="
+	sleep 1
 	echo "WebAdmin Details:"
 	echo "Url: http://localhost:8075"
 	echo "Username: admin"

UnrealTournament2004/ut2k4server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-# Version: 110813
+# Version: 180813
 
 #### Variables ####
 
@@ -48,16 +48,43 @@ fi
 }
 
 fn_syscheck(){
-if [ ! -e ${filesdir} ];then
+if [ ! -e ${systemdir} ];then
-	echo -e "[\e[0;31m FAIL \e[0;39m] Cannot access ${filesdir}: No such directory"
+	echo -e "[\e[0;31m FAIL \e[0;39m] Cannot access ${systemdir}: No such directory"
 	exit
 fi
 }
 
+fn_serverquery(){
+# uses serverquery.py to directly query the server
+# detects if the server locks up
+if [ -f serverquery.py ];then
+	echo -e "[\e[0;36m INFO \e[0;39m] serverquery.py detected"
+	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: serverquery.py detected" >> ${logfile}
+	echo -e "[\e[0;32m  OK  \e[0;39m] Querying ${servicename}: ${servername}: QUERYING"
+	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Querying ${servername}: QUERYING" >> ${logfile}
+	serverquery=`./serverquery.py 127.0.0.1 ${port} 2>&1`
+	sleep 1
+	if [ "${serverquery}" = "ERROR 1" ]||[ "${serverquery}" = "ERROR 2" ]||[ "${serverquery}" = "ERROR 3" ];then
+		echo -e "[\e[0;31m FAIL \e[0;39m] Querying ${servicename}: ${servername}: ${serverquery}"
+		echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Querying ${servername}: ${serverquery}" >> ${logfile}
+		sleep 1
+		echo -e "[\e[1;33m WARN \e[0;39m] ${servicename}: Monitor detected ${servername} has locked up!"
+		echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Monitor detected ${servername} has locked up!" >> ${logfile}
+		sleep 1
+		fn_restartserver
+	else
+		echo -e "[\e[0;32m  OK  \e[0;39m] Querying ${servicename}: ${servername}: ${serverquery}"
+		echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Querying ${servername}: ${serverquery}" >> ${logfile}
+		sleep 1
+	fi
+fi
+}
+
 fn_runcheck(){
 # already running check
 pidwc=`screen -ls |grep ${servicename} |awk -F . '{print $1}'|awk '{print $1}'|wc -l`
 if [ ${pidwc} -eq 1 ];then
+	fn_serverquery
 	echo -e "[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already running"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already running" >> ${logfile}
 	exit
@@ -335,7 +362,7 @@ done
 fn_install(){
 fn_rootcheck
 fn_header
-if [ -d ${filesdir} ];then
+if [ -d ${systemdir} ];then
 	echo "${gamename} Server is already installed here:"
 	pwd
 	echo ""
@@ -389,36 +416,35 @@ echo "================================="
 echo ""
 echo "Configuring ${gamename} Server"
 echo "================================="
+	sleep 1
 	echo "Copying ${systemdir}/ut2004.ini to ${systemdir}/${ini}"
 	cp ${systemdir}/UT2004.ini ${systemdir}/${ini}
 	sleep 1
 	echo ""
-	echo "Applying WebAdmin CharSet fix!"
+	echo "Creating log directory"
-	echo "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1"
+	mkdir -v ${logdir}
 	sleep 1
 	echo ""
 	echo "Applying WebAdmin ut2003.css fix!"
 	echo "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
-	sleep 1
+	sed -i 's/none}/none;/g' ${filesdir}/Web/ServerAdmin/ut2003.css
-	echo ""
+	sed -i 's/underline}/underline;/g' ${filesdir}/Web/ServerAdmin/ut2003.css
-	echo "Setting WebAdmin port to 8077"
 	sleep 1
 	echo ""
 	echo "Setting WebAdmin username and password"
-	sleep 1
-	echo ""
-	echo "Enabling Web Interface"
-	sleep 2
-	sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' ${systemdir}/UWeb.int
-	sed -i 's/none}/none;/g' ${filesdir}/Web/ServerAdmin/ut2003.css
-	sed -i 's/underline}/underline;/g' ${filesdir}/Web/ServerAdmin/ut2003.css
 	sed -i 's/AdminName=/AdminName=admin/g' ${systemdir}/${ini}
 	sed -i 's/AdminPassword=/AdminPassword=utpass/g' ${systemdir}/${ini}
+	sleep 1
+	echo ""
+	echo "Enabling WebAdmin"
 	sed -i 's/bEnabled=False/bEnabled=True/g' ${systemdir}/${ini}
+	sleep 1
+	echo ""
+	echo "Setting WebAdmin port to 8077"
 	sed -i 's/ListenPort=80/ListenPort=8077/g' ${systemdir}/${ini}
-	mkdir ${logdir}
+	sleep 1
-	cd ${rootdir}
 	echo ""
+	cd ${rootdir}
 	echo "Default Settings"
 	echo "=============================="
 	echo "WebAdmin Details:"
@@ -438,6 +464,7 @@ echo "================================="
 	echo ""
 	echo "To start server type:"
 	echo "${selfname} start"
+	echo ""
 }
 
 case "$1" in