From e54790900095a8440b29d2ffe8a6f59b035696d8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 12:26:30 +0100 Subject: [PATCH 1/4] corrected shortname for minecraft related to #1941 --- lgsm/functions/check_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 55085abfb..f727d13d8 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -398,7 +398,7 @@ fn_deps_build_redhat(){ fi # All servers except ts3,mumble,multitheftauto and minecraft servers require glibc.i686 and libstdc++.i686 - if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "nc" ]&&[ "${engine}" != "renderware" ]; then + if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${engine}" != "renderware" ]; then if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then array_deps_required+=( glibc.i686 libstdc++64.i686 ) else From 49599ed65823a6de064aeb4b7335c6bd02641a6d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Mon, 23 Jul 2018 23:11:14 +0200 Subject: [PATCH 2/4] Only check steam dependencies for steam games related to #1941 --- lgsm/functions/check_deps.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index f727d13d8..5db883072 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -140,8 +140,11 @@ fn_deps_detector(){ echo -e "${red}${deptocheck}${default}" sleep 0.2 fi - if [ "${deptocheck}" == "glibc.i686" ]||[ "${deptocheck}" == "libstdc++64.i686" ]||[ "${deptocheck}" == "lib32gcc1" ]||[ "${deptocheck}" == "libstdc++6:i386" ]; then - steamcmdfail=1 + # Define required dependencies for SteamCMD + if [ -n "${appid}" ]; then + if [ "${deptocheck}" == "glibc.i686" ]||[ "${deptocheck}" == "libstdc++64.i686" ]||[ "${deptocheck}" == "lib32gcc1" ]||[ "${deptocheck}" == "libstdc++6:i386" ]; then + steamcmdfail=1 + fi fi fi @@ -492,4 +495,4 @@ elif [ -f "/etc/redhat-release" ]; then fn_deps_build_redhat else fn_print_warning_nl "${distroname} dependency checking unavailable" -fi \ No newline at end of file +fi From fc2c83f1ea13ff4dcfb3202557d8bc8e7287431e Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 26 Jul 2018 01:10:19 +0200 Subject: [PATCH 3/4] Reliable way to select latest Minecraft release fixes #1961 --- lgsm/functions/update_minecraft.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index c02fa932b..947de934a 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -9,7 +9,8 @@ local commandaction="Update" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_dl(){ - latestmcbuildurl=$(${curlpath} -s $(${curlpath} -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | jq -r '.versions[0] | .url') | jq -r '.downloads.server.url') + latestmcreleaselink=$(${curlpath} -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | jq -r '.latest.release as $latest | .versions[] | select(.id == $latest) | .url') + latestmcbuildurl=$(${curlpath} -s "${latestmcreleaselink}" | jq -r '.downloads.server.url') fn_fetch_file "${latestmcbuildurl}" "${tmpdir}" "minecraft_server.${availablebuild}.jar" echo -e "copying to ${serverfiles}...\c" fn_script_log "Copying to ${serverfiles}" From aa4daf17c27afd5ab5c98d18bbd6bb71870a3e35 Mon Sep 17 00:00:00 2001 From: Bara Date: Sat, 4 Aug 2018 10:15:05 +0200 Subject: [PATCH 4/4] Update license year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c6ad3cd89..9bcd64251 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Daniel Gibbs +Copyright (c) 2018 Daniel Gibbs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal