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

Fix code indentions; Show path to eula.txt when it is not accepted yet

Browse Source
This commit is contained in:
Ben Pflueg
2018-10-01 19:35:31 +02:00
parent 0311691f9b
commit 2f1796bf86
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
init/msm
View File

@ -1090,12 +1090,12 @@ jargroup_getlatest() {
error_exit FILE_NOT_FOUND "$error" error_exit FILE_NOT_FOUND "$error"
fi fi
# test wget for --trust-server-names option # test wget for --trust-server-names option
local wget_opts="--trust-server-names" local wget_opts="--trust-server-names"
wget $wget_opts >/dev/null 2>&1 wget $wget_opts >/dev/null 2>&1
if [[ $? != 1 ]]; then if [[ $? != 1 ]]; then
wget_opts="" wget_opts=""
fi fi
# If target contains the word 'minecraft' or 'minecraft-snapshot', check JSON version file for correct filename # If target contains the word 'minecraft' or 'minecraft-snapshot', check JSON version file for correct filename
# This method allows for backwards compatibility with previous releases # This method allows for backwards compatibility with previous releases
@ -1423,7 +1423,7 @@ 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
echo " 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 (${SERVER_PATH[$1]}/eula.txt)."
return return
fi fi
fi fi