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

Merge pull request #10 from Dh0mp5eur/master

Checked code and tested csgoserver. This works. Confirmed would fix a few more bugs with tmux. Thank you
Daniel Gibbs 12 лет назад
Родитель
Сommit
6a81eacc33

+ 6 - 6
CounterStrike/csserver

@@ -154,12 +154,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -194,7 +194,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -407,11 +407,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -435,7 +435,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./hlds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
CounterStrikeGlobalOffensive/csgoserver

@@ -154,12 +154,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -194,7 +194,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -407,11 +407,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -435,7 +435,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
CounterStrikeSource/cssserver

@@ -153,12 +153,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -193,7 +193,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -406,11 +406,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -434,7 +434,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
DayOfDefeatSource/dodsserver

@@ -153,12 +153,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -193,7 +193,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -404,11 +404,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -432,7 +432,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
HalfLife2Deathmatch/hl2dmserver

@@ -153,12 +153,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -193,7 +193,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -406,11 +406,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -434,7 +434,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
KillingFloor/kfserver

@@ -214,12 +214,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -254,7 +254,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -505,11 +505,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -534,7 +534,7 @@ mv ${consolelog} ${consolelogdate}
 cd ${systemdir}
 
 tmux new-session -d -s ${servicename} "./ucc-bin ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
Left4Dead2/l4d2server

@@ -153,12 +153,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -193,7 +193,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -406,11 +406,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -434,7 +434,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
NaturalSelection2/ns2server

@@ -159,12 +159,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -199,7 +199,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -405,11 +405,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -433,7 +433,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./server_linux32 ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
RedOrchestra/roserver

@@ -214,12 +214,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -254,7 +254,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -503,11 +503,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -532,7 +532,7 @@ mv ${consolelog} ${consolelogdate}
 cd ${systemdir}
 
 tmux new-session -d -s ${servicename} "./ucc-bin ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
TeamFortress2/tf2server

@@ -154,12 +154,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -194,7 +194,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -407,11 +407,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -435,7 +435,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
TheHiddenSource/thsserver

@@ -148,12 +148,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -188,7 +188,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -401,11 +401,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -429,7 +429,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
UnrealTournament2004/ut2k4server

@@ -172,12 +172,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -212,7 +212,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -436,11 +436,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -464,7 +464,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${systemdir}
 tmux new-session -d -s ${servicename} "./ucc-bin ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"

+ 6 - 6
UnrealTournament99/ut99server

@@ -172,12 +172,12 @@ esac
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
 	sleep 1
-	tmux attach-session -t $(tmux list-sessions|awk '{print $1}')
+	tmux attach-session -t ${servicename}
 else
 	echo -e "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename} console: ${servername} not running"
 	sleep 0.5
@@ -212,7 +212,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 esac
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
@@ -436,11 +436,11 @@ fn_startserver
 fn_stopserver(){
 fn_rootcheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}')
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
-if [ "${pid}" == "failed" ];then
+if [ "${pid}" == "0" ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Stopping ${servicename}: ${servername} is already stopped"
 	echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${scriptlog}
 else
@@ -464,7 +464,7 @@ mv ${scriptlog} ${scriptlogdate}
 mv ${consolelog} ${consolelogdate}
 cd ${systemdir}
 tmux new-session -d -s ${servicename} "./ucc-bin ${parms} |tee -a ${consolelog}"
-tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|wc -l`
+tmuxwc=`tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l`
 sleep 1
 if [ ${tmuxwc} -eq 0 ];then
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"