Jelajahi Sumber

improved console logging removed +servercfgfile,

improved console logging so now does not require you to press return to
output the console to a log file.

removed +servercfgfile as was not required
Daniel Gibbs 12 tahun lalu
induk
melakukan
20448a537f

+ 4 - 28
CounterStrike/csserver

@@ -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 ####
 
 
@@ -25,7 +25,7 @@ ip="0.0.0.0"
 
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 fn_parms(){
-parms="-game cstrike -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game cstrike -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
 }
 
 
 #### Advanced Variables ####
 #### Advanced 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
@@ -648,27 +649,6 @@ echo ""
 ## Installer
 ## Installer
 #
 #
 
 
-fn_csappmanifest(){
-appdir="${filesdir}/ec5da605084840d3d7b3ed355e48c098b28a1bd5"
-if [ ${pass} == 1 ]; then
-	echo "Creating appmanifest directory. (app 90 fix)"
-	sleep 2
-	mkdir -v "${filesdir}"
-	mkdir -v "${appdir}"
-	cd "${appdir}"
-	echo "Removing any existing appmanifest files. (app 90 fix)"
-	sleep 2
-	rm -f appmanifest_10.acf appmanifest_70.acf appmanifest_90.acf
-elif [ ${pass} == 2 ]; then
-	echo "Downloading HLDS appmanifest files. (app 90 fix)"
-	sleep 2
-	cd "${appdir}"
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_10.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_70.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_90.acf
-fi
-}
-
 fn_header(){
 fn_header(){
 clear
 clear
 echo "================================="
 echo "================================="
@@ -793,10 +773,6 @@ fn_header
 fn_steamdl
 fn_steamdl
 echo "Installing ${gamename} Server"
 echo "Installing ${gamename} Server"
 echo "================================="
 echo "================================="
-pass=1
-fn_csappmanifest
-pass=2
-fn_csappmanifest
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall

+ 4 - 3
CounterStrikeConditionZero/csczserver

@@ -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 ####
 
 
@@ -25,7 +25,7 @@ ip="0.0.0.0"
 
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 fn_parms(){
-parms="-game czero -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game czero -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
 }
 
 
 #### Advanced Variables ####
 #### Advanced 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

+ 4 - 36
DayOfDefeat/dodserver

@@ -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 ####
 
 
@@ -25,7 +25,7 @@ ip="0.0.0.0"
 
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 fn_parms(){
-parms="-game dod -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game dod -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
 }
 
 
 #### Advanced Variables ####
 #### Advanced 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
@@ -648,33 +649,6 @@ echo ""
 ## Installer
 ## Installer
 #
 #
 
 
-fn_dodappmanifest(){
-appdir="${filesdir}/8afa93e01174026686b12fbaf9ff54e7bffbe8fc"
-if [ ${pass} == 1 ]; then
-	echo "Creating appmanifest directory. (app 90 fix)"
-	sleep 2
-	mkdir -v "${filesdir}"
-	mkdir -v "${appdir}"
-	cd "${appdir}"
-	echo "Removing any existing appmanifest files. (app 90 fix)"
-	sleep 2
-	rm -f appmanifest_10.acf appmanifest_70.acf appmanifest_90.acf
-elif [ ${pass} == 2 ]; then
-	echo "Downloading HLDS appmanifest files. (app 90 fix)"
-	sleep 2
-	cd "${appdir}"
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_10.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_70.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_90.acf
-elif [ ${pass} == 3 ]; then
-	echo "Downloading ${gamename} appmanifest files. (app 90 fix)"
-	sleep 2
-	cd "${appdir}"
-	rm -f appmanifest_90.acf
-	wget https://raw2.github.com/dgibbs64/linuxgameservers/master/appmanifest/dod/appmanifest_90.acf
-fi
-}
-
 fn_header(){
 fn_header(){
 clear
 clear
 echo "================================="
 echo "================================="
@@ -799,14 +773,8 @@ fn_header
 fn_steamdl
 fn_steamdl
 echo "Installing ${gamename} Server"
 echo "Installing ${gamename} Server"
 echo "================================="
 echo "================================="
-pass=1
-fn_dodappmanifest
-pass=2
-fn_dodappmanifest
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
-pass=3
-fn_dodappmanifest
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall

+ 4 - 28
HalfLifeDeathmatchClassic/hldmcserver

@@ -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 ####
 
 
@@ -25,7 +25,7 @@ ip="0.0.0.0"
 
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 fn_parms(){
-parms="-game valve -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game valve -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
 }
 
 
 #### Advanced Variables ####
 #### Advanced 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
@@ -648,27 +649,6 @@ echo ""
 ## Installer
 ## Installer
 #
 #
 
 
-fn_hldmcappmanifest(){
-appdir="${filesdir}/91aa146f9fda7056098af2c7015b8fb308bf1ce2"
-if [ ${pass} == 1 ]; then
-	echo "Creating appmanifest directory. (app 90 fix)"
-	sleep 2
-	mkdir -v "${filesdir}"
-	mkdir -v "${appdir}"
-	cd "${appdir}"
-	echo "Removing any existing appmanifest files. (app 90 fix)"
-	sleep 2
-	rm -f appmanifest_10.acf appmanifest_70.acf appmanifest_90.acf
-elif [ ${pass} == 2 ]; then
-	echo "Downloading HLDS appmanifest files. (app 90 fix)"
-	sleep 2
-	cd "${appdir}"
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_10.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_70.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_90.acf
-fi
-}
-
 fn_header(){
 fn_header(){
 clear
 clear
 echo "================================="
 echo "================================="
@@ -793,10 +773,6 @@ fn_header
 fn_steamdl
 fn_steamdl
 echo "Installing ${gamename} Server"
 echo "Installing ${gamename} Server"
 echo "================================="
 echo "================================="
-pass=1
-fn_hldmcappmanifest
-pass=2
-fn_hldmcappmanifest
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall

+ 4 - 36
TeamFortressClassic/tfcserver

@@ -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 ####
 
 
@@ -25,7 +25,7 @@ ip="0.0.0.0"
 
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 fn_parms(){
-parms="-game tfc -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game tfc -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
 }
 
 
 #### Advanced Variables ####
 #### Advanced 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
@@ -648,33 +649,6 @@ echo ""
 ## Installer
 ## Installer
 #
 #
 
 
-fn_tfcappmanifest(){
-appdir="${filesdir}/5cf8446bee28893dd1ff1867b48c26ae8f14e1e7"
-if [ ${pass} == 1 ]; then
-	echo "Creating appmanifest directory. (app 90 fix)"
-	sleep 2
-	mkdir -v "${filesdir}"
-	mkdir -v "${appdir}"
-	cd "${appdir}"
-	echo "Removing any existing appmanifest files. (app 90 fix)"
-	sleep 2
-	rm -f appmanifest_10.acf appmanifest_70.acf appmanifest_90.acf
-elif [ ${pass} == 2 ]; then
-	echo "Downloading HLDS appmanifest files. (app 90 fix)"
-	sleep 2
-	cd "${appdir}"
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_10.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_70.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/appmanifest_90.acf
-elif [ ${pass} == 3 ]; then
-	echo "Downloading ${gamename} appmanifest files. (app 90 fix)"
-	sleep 2
-	cd "${appdir}"
-	rm -f appmanifest_90.acf
-	wget https://raw.github.com/dgibbs64/linuxgameservers/master/appmanifest/tfc/appmanifest_90.acf
-fi
-}
-
 fn_header(){
 fn_header(){
 clear
 clear
 echo "================================="
 echo "================================="
@@ -799,14 +773,8 @@ fn_header
 fn_steamdl
 fn_steamdl
 echo "Installing ${gamename} Server"
 echo "Installing ${gamename} Server"
 echo "================================="
 echo "================================="
-pass=1
-fn_tfcappmanifest
-pass=2
-fn_tfcappmanifest
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
-pass=3
-fn_tfcappmanifest
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall
 fn_steaminstall