Explorar o código

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

Daniel Gibbs %!s(int64=3) %!d(string=hai) anos
pai
achega
5c011df3ab

+ 2 - 1
linuxgsm.sh

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