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

Added coloured checking message

Daniel Gibbs 10 лет назад
Родитель
Сommit
3b63636dee
2 измененных файлов с 13 добавлено и 3 удалено
  1. 4 3
      functions/command_monitor.sh
  2. 9 0
      functions/core_messages.sh

+ 4 - 3
functions/command_monitor.sh

@@ -23,7 +23,7 @@ fn_monitor_check_lockfile(){
 fn_monitor_check_update(){
 	# Monitor will not check if update is running.
 	updatecheck=$(ps -ef|grep "${selfname} update"|grep -v grep|wc -l)
-	if [ "${updatecheck}" != "0" ]; then
+	if [ "${updatecheck}" >= "1" ]; then
 		fn_print_info_nl "SteamCMD is currently checking for updates"
 		fn_scriptlog "SteamCMD is currently checking for updates"
 		sleep 1
@@ -32,7 +32,8 @@ fn_monitor_check_update(){
 }
 
 fn_monitor_msg_checking(){
-	fn_print_dots "Checking session: CHECKING"
+	fn_print_dots "Checking session: "
+	fn_print_checking_eol
 	fn_scriptlog "Checking session: CHECKING"
 	sleep 1	
 }
@@ -70,7 +71,7 @@ fn_monitor_tmux(){
 	# checks that tmux session is running
 	tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -Ec "^${servicename}:")
 	if [ "${tmuxwc}" == "1" ]; then
-		fn_print_ok "Checking session"
+		fn_print_ok "Checking session: OK"
 		fn_print_ok_eol_nl
 		fn_scriptlog "Checking session: OK"
 		# runs gsquery check on game with specific engines.

+ 9 - 0
functions/core_messages.sh

@@ -176,6 +176,15 @@ fn_print_querying_eol_nl(){
 	echo -e "\e[0;36mQUERYING\e[0m"
 }
 
+# CHECKING for end of line
+fn_print_checking_eol(){
+	echo -en "\e[0;36mCHECKING\e[0m"
+}
+
+fn_print_checking_eol_nl(){
+	echo -e "\e[0;36mCHECKING\e[0m"
+}
+
 # CANCELED for end of line
 fn_print_canceled_eol(){
 	echo -en "\e[0;33mCANCELED\e[0m"