From 92ca548c2cfc40384f464f99f4956ff2bee66f54 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 15 May 2023 21:38:35 +0100 Subject: [PATCH] add legacy vars --- lgsm/modules/command_dev_details.sh | 9 ++++----- .../{command_donate.sh => command_sponsor.sh} | 14 +++++++------- lgsm/modules/core_legacy.sh | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 12 deletions(-) rename lgsm/modules/{command_donate.sh => command_sponsor.sh} (70%) diff --git a/lgsm/modules/command_dev_details.sh b/lgsm/modules/command_dev_details.sh index 19bdd9f31..330d7e2cd 100644 --- a/lgsm/modules/command_dev_details.sh +++ b/lgsm/modules/command_dev_details.sh @@ -39,7 +39,11 @@ declare -A server_details=( ['Default Map']="${defaultmap}" ['Game Mode']="${gamemode}" ['Game Type']="${gametype}" + ['HTTP Enabled']="${httpenabled}" + ['HTTP IP']="${httpip}" + ['HTTP Password']="${httppassword}" ['HTTP Port']="${httpport}" + ['HTTP User']="${httpuser}" ['ip']="${ip}" ['LAN Port']="${lanport}" ['Master Port']="${masterport}" @@ -57,13 +61,8 @@ declare -A server_details=( ['Shard']="${shard}" ['Sharding']="${sharding}" ['Steam Auth Port']="${steamauthport}" - ['Steam Master Port']="${steammasterport}" ['Telnet IP']="${telnetip}" ['Tickrate']="${tickrate}" - ['HTTP Enabled']="${httpenabled}" - ['HTTP IP']="${httpip}" - ['HTTP Password']="${httppassword}" - ['HTTP User']="${httpuser}" ['World Name']="${worldname}" ['World Type']="${worldtype}" ) diff --git a/lgsm/modules/command_donate.sh b/lgsm/modules/command_sponsor.sh similarity index 70% rename from lgsm/modules/command_donate.sh rename to lgsm/modules/command_sponsor.sh index f00a4d702..336f20f0a 100755 --- a/lgsm/modules/command_donate.sh +++ b/lgsm/modules/command_sponsor.sh @@ -1,13 +1,13 @@ #!/bin/bash -# LinuxGSM command_donate.sh module +# LinuxGSM command_sponsor.sh module # Author: Daniel Gibbs # Contributors: http://linuxgsm.com/contrib # Website: https://linuxgsm.com -# Description: Shows ways to donate. +# Description: Shows ways to sponsor. -commandname="DONATE" -commandaction="Donate" -functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +commandname="SPONSOR" +commandaction="Sponsor" +moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set fn_print_ascii_logo @@ -15,10 +15,10 @@ echo -e "${lightyellow}Support LinuxGSM${default}" echo -e "=================================" echo -e "" echo -e "Been using LinuxGSM?" -echo -e "Consider donating to support development." +echo -e "Consider sponsoring to support development." echo -e "" -echo -e "* ${lightblue}Patreon:${default} https://linuxgsm.com/patreon" echo -e "* ${lightblue}GitHub:${default} https://github.com/sponsors/dgibbs64" +echo -e "* ${lightblue}Patreon:${default} https://linuxgsm.com/patreon" echo -e "* ${lightblue}PayPal:${default} https://linuxgsm.com/paypal" echo -e "" echo -e "LinuxGSM est. 2012" diff --git a/lgsm/modules/core_legacy.sh b/lgsm/modules/core_legacy.sh index 2ed942abd..c6316962f 100644 --- a/lgsm/modules/core_legacy.sh +++ b/lgsm/modules/core_legacy.sh @@ -15,6 +15,22 @@ for legacy_version in "${legacy_versions_array[@]}"; do fi done +if [ -n "${webadminuser}" ]; then + httpuser="${webadminuser}" +fi + +if [ -n "${webadminpass}" ]; then + httppassword="${webadminpass}" +fi + +if [ -n "${webadminport}" ]; then + httpport="${webadminport}" +fi + +if [ -n "${webadminip}" ]; then + httpip="${webadminip}" +fi + if [ -z "${serverfiles}" ]; then serverfiles="${filesdir}" fi