Skip to content

Update license year #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgibbs64 merged 7 commits into from
Aug 8, 2018
+10 −6
Merged

Update license year #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ef5c29
Merge branch 'hotfix/minecraft-2-1944'
dgibbs64 Jul 21, 2018
e547909
corrected shortname for minecraft related to #1941
dgibbs64 Jul 22, 2018
49599ed
Only check steam dependencies for steam games
UltimateByte Jul 23, 2018
8ab01c0
Merge branch 'hotfix/fd-dependecies-1941'
UltimateByte Jul 24, 2018
fc2c83f
Reliable way to select latest Minecraft release
UltimateByte Jul 25, 2018
1a99877
Merge branch 'hotfix/minecraft-1961'
UltimateByte Jul 25, 2018
aa4daf1
Update license year
Bara Aug 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 7 additions & 4 deletions lgsm/functions/check_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
3 changes: 2 additions & 1 deletion lgsm/functions/update_minecraft.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down