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

Merge remote-tracking branch 'origin/hotfix/v23.3.2' into hotfix/v23.3.2

Daniel Gibbs 3 лет назад
Родитель
Сommit
5c011df3ab
5 измененных файлов с 6 добавлено и 5 удалено
  1. 2 1
      linuxgsm.sh
  2. 1 1
      tests/tests_fctrserver.sh
  3. 1 1
      tests/tests_jc2server.sh
  4. 1 1
      tests/tests_mcserver.sh
  5. 1 1
      tests/tests_ts3server.sh

+ 2 - 1
linuxgsm.sh

@@ -369,7 +369,8 @@ if [ "${shortname}" == "core" ]; then
 		if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then
 			fn_install_file
 		else
-			echo -e "[ FAIL ] unknown game server"
+			echo -e "[ FAIL ] Unknown game server"
+			exit 1
 		fi
 	else
 		fn_install_getopt

+ 1 - 1
tests/tests_fctrserver.sh

@@ -369,7 +369,7 @@ if [ "${shortname}" == "core" ]; then
 		if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then
 			fn_install_file
 		else
-			echo -e "[ FAIL ] unknown game server"
+			echo -e "[ FAIL ] Unknown game server"
 		fi
 	else
 		fn_install_getopt

+ 1 - 1
tests/tests_jc2server.sh

@@ -370,7 +370,7 @@ if [ "${shortname}" == "core" ]; then
 		if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then
 			fn_install_file
 		else
-			echo -e "[ FAIL ] unknown game server"
+			echo -e "[ FAIL ] Unknown game server"
 		fi
 	else
 		fn_install_getopt

+ 1 - 1
tests/tests_mcserver.sh

@@ -370,7 +370,7 @@ if [ "${shortname}" == "core" ]; then
 		if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then
 			fn_install_file
 		else
-			echo -e "[ FAIL ] unknown game server"
+			echo -e "[ FAIL ] Unknown game server"
 		fi
 	else
 		fn_install_getopt

+ 1 - 1
tests/tests_ts3server.sh

@@ -370,7 +370,7 @@ if [ "${shortname}" == "core" ]; then
 		if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then
 			fn_install_file
 		else
-			echo -e "[ FAIL ] unknown game server"
+			echo -e "[ FAIL ] Unknown game server"
 		fi
 	else
 		fn_install_getopt