Daniel Gibbs 1 год назад
Родитель
Сommit
b5620f5fde
2 измененных файлов с 15 добавлено и 15 удалено
  1. 10 10
      lgsm/modules/core_messages.sh
  2. 5 5
      linuxgsm.sh

+ 10 - 10
lgsm/modules/core_messages.sh

@@ -486,56 +486,56 @@ fn_print_info_eol_nl() {
 
 # QUERYING
 fn_print_querying_eol() {
-	echo -en "${cyan}QUERYING${default}"
+	echo -en " ... ${cyan}QUERYING${default}"
 	fn_sleep_time_1
 }
 
 fn_print_querying_eol_nl() {
-	echo -e "${cyan}QUERYING${default}"
+	echo -e " ... ${cyan}QUERYING${default}"
 	fn_sleep_time_1
 }
 
 # CHECKING
 fn_print_checking_eol() {
-	echo -en "${cyan}CHECKING${default}"
+	echo -en " ... ${cyan}CHECKING${default}"
 	fn_sleep_time_1
 }
 
 fn_print_checking_eol_nl() {
-	echo -e "${cyan}CHECKING${default}"
+	echo -e " ... ${cyan}CHECKING${default}"
 	fn_sleep_time_1
 }
 
 # DELAY
 fn_print_delay_eol() {
-	echo -en "${green}DELAY${default}"
+	echo -en " ... ${green}DELAY${default}"
 	fn_sleep_time_1
 }
 
 fn_print_delay_eol_nl() {
-	echo -e "${green}DELAY${default}"
+	echo -e " ... ${green}DELAY${default}"
 	fn_sleep_time_1
 }
 
 # CANCELED
 fn_print_canceled_eol() {
-	echo -en "${lightyellow}CANCELED${default}"
+	echo -en " ... ${lightyellow}CANCELED${default}"
 	fn_sleep_time_1
 }
 
 fn_print_canceled_eol_nl() {
-	echo -e "${lightyellow}CANCELED${default}"
+	echo -e " ... ${lightyellow}CANCELED${default}"
 	fn_sleep_time_1
 }
 
 # REMOVED
 fn_print_removed_eol() {
-	echo -en "${red}REMOVED${default}"
+	echo -en " ... ${red}REMOVED${default}"
 	fn_sleep_time_1
 }
 
 fn_print_removed_eol_nl() {
-	echo -e "${red}REMOVED${default}"
+	echo -e " ... ${red}REMOVED${default}"
 	fn_sleep_time_1
 }
 

+ 5 - 5
linuxgsm.sh

@@ -152,8 +152,8 @@ fn_bootstrap_fetch_file() {
 				fi
 			else
 				echo -en " ... OK"
-				sleep 0.3
-				echo -en "\033[2K\\r"
+				sleep "0.1"
+				echo -e "\033\\r"
 				if [ -f "${lgsmlog}" ]; then
 					fn_script_log_pass "Downloading ${local_filename}..."
 				fi
@@ -409,10 +409,10 @@ else
 			echo -en "copying _default.cfg...\c"
 			cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg"
 			if [ $? != 0 ]; then
-				echo -e "FAIL"
+				echo -e " ... FAIL"
 				exit 1
 			else
-				echo -e "OK"
+				echo -e " ... OK"
 			fi
 		else
 			config_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg")
@@ -424,7 +424,7 @@ else
 					echo -e "FAIL"
 					exit 1
 				else
-					echo -e "OK"
+					echo -e " ... OK"
 				fi
 			fi
 		fi