Explorar o código

grep -E "^${servicename}:"

Daniel Gibbs %!s(int64=12) %!d(string=hai) anos
pai
achega
628d50d44e
Modificáronse 2 ficheiros con 10 adicións e 10 borrados
  1. 5 5
      CounterStrike/csserver
  2. 5 5
      CounterStrikeGlobalOffensive/csgoserver

+ 5 - 5
CounterStrike/csserver

@@ -72,7 +72,7 @@ fi
 }
 }
 
 
 fn_runcheck(){
 fn_runcheck(){
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 if [ ${tmuxwc} -eq 1 ];then
 	fn_serverquery
 	fn_serverquery
 	echo -en "\r[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already running"
 	echo -en "\r[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already running"
@@ -157,7 +157,7 @@ esac
 done
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	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}
 	echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
@@ -197,7 +197,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 	* ) echo "Please answer yes or no.";;
 esac
 esac
 done
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
 	while true; do
@@ -410,7 +410,7 @@ fn_startserver
 fn_stopserver(){
 fn_stopserver(){
 fn_rootcheck
 fn_rootcheck
 fn_syscheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
 sleep 0.5
@@ -439,7 +439,7 @@ mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./hlds_run ${parms} |tee -a ${consolelog}"
 tmux new-session -d -s ${servicename} "./hlds_run ${parms} |tee -a ${consolelog}"
 sleep 1
 sleep 1
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${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
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"
 	echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: failed to start ${servername}" >> ${scriptlog}
 	echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: failed to start ${servername}" >> ${scriptlog}

+ 5 - 5
CounterStrikeGlobalOffensive/csgoserver

@@ -73,7 +73,7 @@ fi
 }
 }
 
 
 fn_runcheck(){
 fn_runcheck(){
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 if [ ${tmuxwc} -eq 1 ];then
 	fn_serverquery
 	fn_serverquery
 	echo -en "\r[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already running"
 	echo -en "\r[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already running"
@@ -158,7 +158,7 @@ esac
 done
 done
 echo -en "\r[ .... ] Starting ${servicename} console"
 echo -en "\r[ .... ] Starting ${servicename} console"
 sleep 0.5
 sleep 0.5
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\r[\e[0;32m  OK  \e[0;39m] Starting ${servicename} console"
 	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}
 	echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${servername} console accessed" >> ${scriptlog}
@@ -198,7 +198,7 @@ while true; do
 	* ) echo "Please answer yes or no.";;
 	* ) echo "Please answer yes or no.";;
 esac
 esac
 done
 done
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep ${servicename}|wc -l)
+tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l)
 if [ ${tmuxwc} -eq 1 ];then
 if [ ${tmuxwc} -eq 1 ];then
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	echo -e "\e[0;31mWARNING!\e[0;39m ${servicename} is currently running"
 	while true; do
 	while true; do
@@ -411,7 +411,7 @@ fn_startserver
 fn_stopserver(){
 fn_stopserver(){
 fn_rootcheck
 fn_rootcheck
 fn_syscheck
 fn_syscheck
-pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${servicename}|wc -l)
+pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l)
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -en "[ .... ] Stopping ${servicename}: ${servername}"
 echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Stopping ${servername}" >> ${scriptlog}
 sleep 0.5
 sleep 0.5
@@ -440,7 +440,7 @@ mv ${consolelog} ${consolelogdate}
 cd ${filesdir}
 cd ${filesdir}
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
 tmux new-session -d -s ${servicename} "./srcds_run ${parms} |tee -a ${consolelog}"
 sleep 1
 sleep 1
-tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep ${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
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"
 	echo -en "\r[\e[0;31m FAIL \e[0;39m] Starting ${servicename}: Failed to start ${servername}"
 	echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: failed to start ${servername}" >> ${scriptlog}
 	echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: failed to start ${servername}" >> ${scriptlog}