Просмотр исходного кода

improved console logging

improved console logging so now does not require you to press return to
output the console to a log file
Daniel Gibbs 12 лет назад
Родитель
Сommit
83587560ab

+ 3 - 2
CounterStrikeGlobalOffensive/csgoserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -615,7 +615,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 3 - 2
CounterStrikeSource/cssserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -596,7 +596,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 3 - 2
DayOfDefeatSource/dodsserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -596,7 +596,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 3 - 2
FistfulOfFrags/fofserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -596,7 +596,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 4 - 3
GarrysMod/gmodserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -601,7 +601,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then
@@ -938,4 +939,4 @@ case "$1" in
 	echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install}"
 	echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install}"
 	exit 1;;
 	exit 1;;
 esac
 esac
-exit
+exit

+ 4 - 3
HalfLife2Deathmatch/hl2dmserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -594,9 +594,10 @@ if [ ${tmuxwc} -eq 1 ]; then
 	exit
 	exit
 fi
 fi
 # Create lock file
 # Create lock file
-ldate > ${lockselfname}
+date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 3 - 2
Insurgency/insserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -596,7 +596,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 3 - 2
KillingFloor/kfserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -586,7 +586,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 5 - 5
Left4Dead/l4dserver

@@ -22,13 +22,12 @@ steampass=""
 defaultmap="l4d_hospital01_apartment"
 defaultmap="l4d_hospital01_apartment"
 maxplayers="8"
 maxplayers="8"
 port="27015"
 port="27015"
-sourcetvport="27020"
 clientport="27005"
 clientport="27005"
 ip="0.0.0.0"
 ip="0.0.0.0"
 
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 fn_parms(){
-parms="-game left4dead -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game left4dead -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
 }
 
 
 #### Advanced Variables ####
 #### Advanced Variables ####
@@ -598,7 +597,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then
@@ -656,8 +656,8 @@ clear
 echo "================================="
 echo "================================="
 echo "${gamename}"
 echo "${gamename}"
 echo "Linux Game Server Manager"
 echo "Linux Game Server Manager"
-echo "by Summit Singh Thakur"
-echo "http://www.summit.im"
+echo "by Daniel Gibbs"
+echo "http://danielgibbs.co.uk"
 echo "================================="
 echo "================================="
 echo ""
 echo ""
 }
 }

+ 3 - 2
Left4Dead2/l4d2server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -595,7 +595,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 10 - 4
NaturalSelection2/ns2server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -591,7 +591,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then
@@ -646,11 +647,16 @@ echo ""
 #
 #
 
 
 fn_ns2deps(){
 fn_ns2deps(){
-echo "Downloading libm.so.6 and libstdc++.so.6"
+echo "Downloading libm.so.6"
 echo "================================="
 echo "================================="
 cd "${filesdir}"
 cd "${filesdir}"
 wget https://github.com/dgibbs64/linuxgameservers/raw/master/NaturalSelection2/dependencies/libm.so.6
 wget https://github.com/dgibbs64/linuxgameservers/raw/master/NaturalSelection2/dependencies/libm.so.6
-wget https://github.com/dgibbs64/linuxgameservers/raw/master/NaturalSelection2/dependencies/libstdc++.so.6
+sleep 1
+echo ""
+echo "Copying libstdc++.so.6"
+echo "================================="
+cd "${filesdir}"
+cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}"
 sleep 1
 sleep 1
 echo ""
 echo ""
 }
 }

+ 3 - 2
NoMoreRoomInHell/nmrihserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -595,7 +595,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 3 - 2
RedOrchestra/roserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -582,7 +582,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 4 - 3
TeamFortress2/tf2server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -596,7 +596,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then
@@ -853,4 +854,4 @@ case "$1" in
 	echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install}"
 	echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install}"
 	exit 1;;
 	exit 1;;
 esac
 esac
-exit
+exit

+ 3 - 2
UnrealTournament2004/ut2k4server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -543,7 +543,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then

+ 3 - 2
UnrealTournament99/ut99server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 010814
+# Version: 050814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -542,7 +542,8 @@ fi
 # Create lock file
 # Create lock file
 date > ${lockselfname}
 date > ${lockselfname}
 cd "${executabledir}"
 cd "${executabledir}"
-tmux new-session -d -s ${servicename} "${executable} ${parms}|tee -a '${consolelog}'"
+tmux new-session -d -s ${servicename} "${executable} ${parms}"
+tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'"
 sleep 1
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 0 ]; then
 if [ ${tmuxwc} -eq 0 ]; then