Browse Source
Merge pull request #1975 from Bara/patch-1
Update license year
pull/1987/head
Daniel Gibbs
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
10 additions and
6 deletions
-
LICENSE
-
lgsm/functions/check_deps.sh
-
lgsm/functions/update_minecraft.sh
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -398,7 +401,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 |
|
|
|
@ -492,4 +495,4 @@ elif [ -f "/etc/redhat-release" ]; then |
|
|
|
fn_deps_build_redhat |
|
|
|
else |
|
|
|
fn_print_warning_nl "${distroname} dependency checking unavailable" |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
@ -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}" |
|
|
|
|
