Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't exit if single server is blocked by EULA

Browse Source
This commit is contained in:
Marcus Whybrow 2015-07-26 01:22:08 +01:00
parent 09ac4a93fc
commit 4f90d9453a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/msm
View File

@ -158,7 +158,6 @@ error_exit() {
CONF_ERROR) code=73;; CONF_ERROR) code=73;;
FATAL_ERROR) code=74;; FATAL_ERROR) code=74;;
JAVA_NOT_INSTALLED) code=75;; JAVA_NOT_INSTALLED) code=75;;
EULA_UNACCEPTED) code=76;;
esac esac
echo "${2:-"Unknown Error"}" 1>&2 echo "${2:-"Unknown Error"}" 1>&2
@ -1426,7 +1425,8 @@ server_start() {
if [[ -f "${SERVER_PATH[$1]}"/eula.txt ]]; then if [[ -f "${SERVER_PATH[$1]}"/eula.txt ]]; then
if ! grep -q -i 'eula=true' "${SERVER_PATH[$1]}"/eula.txt; then if ! grep -q -i 'eula=true' "${SERVER_PATH[$1]}"/eula.txt; then
error_exit EULA_UNACCEPTED "Could not start the server as you first need to agree to an EULA. See eula.txt for more info." echo " Could not start the server as you first need to agree to an EULA. See eula.txt for more info."
return
fi fi
fi fi