gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

code de-lint and bringing up to shellcheck standards (#2613)

pull/2617/head
Daniel Gibbs 5 years ago
committed by GitHub
parent
b4290a3c96
commit
06554cb314
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 78 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lgsm/functions/alert_telegram.sh
  2. 20
      lgsm/functions/check_deps.sh
  3. 1
      lgsm/functions/core_dl.sh
  4. 68
      lgsm/functions/core_messages.sh
  5. 2
      lgsm/functions/info_distro.sh
  6. 16
      linuxgsm.sh
  7. 26
      tests/tests_defaultcfg/tests_defaultcfg.sh
  8. 3
      tests/tests_fctrserver.sh
  9. 2
      tests/tests_jc2server.sh
  10. 3
      tests/tests_mcserver.sh
  11. 3
      tests/tests_ts3server.sh

2
lgsm/functions/alert_telegram.sh
View File

@ -18,7 +18,7 @@ EOF
) )
fn_print_dots "Sending Telegram alert" fn_print_dots "Sending Telegram alert"
telegramsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" ${curlcustomstring} | grep "error_code") telegramsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" "${curlcustomstring}" | grep "error_code")
if [ -n "${telegramsend}" ]; then if [ -n "${telegramsend}" ]; then
fn_print_fail_nl "Sending Telegram alert: ${telegramsend}" fn_print_fail_nl "Sending Telegram alert: ${telegramsend}"

20
lgsm/functions/check_deps.sh
View File

@ -27,13 +27,13 @@ fn_install_mono_repo(){
if [ "${distroid}" == "ubuntu" ]; then if [ "${distroid}" == "ubuntu" ]; then
if [ "${distroversion}" == "18.04" ]; then if [ "${distroversion}" == "18.04" ]; then
cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
eval ${cmd} eval "${cmd}"
elif [ "${distroversion}" == "16.04" ]; then elif [ "${distroversion}" == "16.04" ]; then
cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
eval ${cmd} eval "${cmd}"
elif [ "${distroversion}" == "14.04" ]; then elif [ "${distroversion}" == "14.04" ]; then
cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-trusty main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-trusty main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
eval ${cmd} eval "${cmd}"
else else
fn_print_warn_nl "Installing Mono repository" fn_print_warn_nl "Installing Mono repository"
echo -e "Mono auto install not available for ${distroname}" echo -e "Mono auto install not available for ${distroname}"
@ -44,13 +44,13 @@ fn_install_mono_repo(){
elif [ "${distroid}" == "debian" ]; then elif [ "${distroid}" == "debian" ]; then
if [ "${distroversion}" == "10" ]; then if [ "${distroversion}" == "10" ]; then
cmd="sudo apt install apt-transport-https dirmngr;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-buster main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" cmd="sudo apt install apt-transport-https dirmngr;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-buster main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
eval ${cmd} eval "${cmd}"
elif [ "${distroversion}" == "9" ]; then elif [ "${distroversion}" == "9" ]; then
cmd="sudo apt install apt-transport-https dirmngr;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" cmd="sudo apt install apt-transport-https dirmngr;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
eval ${cmd} eval "${cmd}"
elif [ "${distroversion}" == "8" ]; then elif [ "${distroversion}" == "8" ]; then
cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/debian stable-jessie main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/debian stable-jessie main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
eval ${cmd} eval "${cmd}"
else else
echo -e "Mono auto install not available for ${distroname}" echo -e "Mono auto install not available for ${distroname}"
echo -e " Follow instructions on mono site to install the latest version of Mono." echo -e " Follow instructions on mono site to install the latest version of Mono."
@ -60,13 +60,13 @@ fn_install_mono_repo(){
elif [ "${distroid}" == "centos" ]; then elif [ "${distroid}" == "centos" ]; then
if [ "${distroversion}" == "8" ]; then if [ "${distroversion}" == "8" ]; then
cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'" cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'"
eval ${cmd} eval "${cmd}"
elif [ "${distroversion}" == "7" ]; then elif [ "${distroversion}" == "7" ]; then
cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'"
eval ${cmd} eval "${cmd}"
elif [ "${distroversion}" == "6" ]; then elif [ "${distroversion}" == "6" ]; then
cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos6-stable.repo | tee /etc/yum.repos.d/mono-centos6-stable.repo'" cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos6-stable.repo | tee /etc/yum.repos.d/mono-centos6-stable.repo'"
eval ${cmd} eval "${cmd}"
else else
echo -e "Mono auto install not available for ${distroname}" echo -e "Mono auto install not available for ${distroname}"
echo -e " Follow instructions on mono site to install the latest version of Mono." echo -e " Follow instructions on mono site to install the latest version of Mono."
@ -75,7 +75,7 @@ fn_install_mono_repo(){
fi fi
elif [ "${distroid}" == "fedora" ]; then elif [ "${distroid}" == "fedora" ]; then
cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'; su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'; dnf update" cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'; su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'; dnf update"
eval ${cmd} eval "${cmd}"
else else
echo -e "Mono auto install not available for ${distroname}" echo -e "Mono auto install not available for ${distroname}"
echo -e " Follow instructions on mono site to install the latest version of Mono." echo -e " Follow instructions on mono site to install the latest version of Mono."

1
lgsm/functions/core_dl.sh
View File

@ -168,6 +168,7 @@ fn_fetch_file(){
fn_dl_md5 fn_dl_md5
# Execute file if run is set. # Execute file if run is set.
if [ "${run}" == "run" ]; then if [ "${run}" == "run" ]; then
# shellcheck source=/dev/null
source "${local_filedir}/${local_filename}" source "${local_filedir}/${local_filename}"
fi fi
fi fi

68
lgsm/functions/core_messages.sh
View File

@ -119,18 +119,18 @@ fn_script_log_info(){
# [ .... ] # [ .... ]
fn_print_dots(){ fn_print_dots(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[ .... ] ${commandaction} ${selfname}: $@" echo -en "${creeol}[ .... ] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[ .... ] $@" echo -en "${creeol}[ .... ] $*"
fi fi
fn_sleep_time fn_sleep_time
} }
fn_print_dots_nl(){ fn_print_dots_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -e "${creeol}[ .... ] ${commandaction} ${selfname}: $@" echo -e "${creeol}[ .... ] ${commandaction} ${servicename}: $*"
else else
echo -e "${creeol}[ .... ] $@" echo -e "${creeol}[ .... ] $*"
fi fi
fn_sleep_time fn_sleep_time
echo -en "\n" echo -en "\n"
@ -139,18 +139,18 @@ fn_print_dots_nl(){
# [ OK ] # [ OK ]
fn_print_ok(){ fn_print_ok(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${green} OK ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${green} OK ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${green} OK ${default}] $@" echo -en "${creeol}[${green} OK ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
} }
fn_print_ok_nl(){ fn_print_ok_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${green} OK ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${green} OK ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${green} OK ${default}] $@" echo -en "${creeol}[${green} OK ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
echo -en "\n" echo -en "\n"
@ -159,18 +159,18 @@ fn_print_ok_nl(){
# [ FAIL ] # [ FAIL ]
fn_print_fail(){ fn_print_fail(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${red} FAIL ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${red} FAIL ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${red} FAIL ${default}] $@" echo -en "${creeol}[${red} FAIL ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
} }
fn_print_fail_nl(){ fn_print_fail_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${red} FAIL ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${red} FAIL ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${red} FAIL ${default}] $@" echo -en "${creeol}[${red} FAIL ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
echo -en "\n" echo -en "\n"
@ -179,18 +179,18 @@ fn_print_fail_nl(){
# [ ERROR ] # [ ERROR ]
fn_print_error(){ fn_print_error(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${red}ERROR ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${red}ERROR ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${red}ERROR ${default}] $@" echo -en "${creeol}[${red}ERROR ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
} }
fn_print_error_nl(){ fn_print_error_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${red}ERROR ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${red}ERROR ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${red}ERROR ${default}] $@" echo -en "${creeol}[${red}ERROR ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
echo -en "\n" echo -en "\n"
@ -199,18 +199,18 @@ fn_print_error_nl(){
# [ WARN ] # [ WARN ]
fn_print_warn(){ fn_print_warn(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${lightyellow} WARN ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${lightyellow} WARN ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${lightyellow} WARN ${default}] $@" echo -en "${creeol}[${lightyellow} WARN ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
} }
fn_print_warn_nl(){ fn_print_warn_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${lightyellow} WARN ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${lightyellow} WARN ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${lightyellow} WARN ${default}] $@" echo -en "${creeol}[${lightyellow} WARN ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
echo -en "\n" echo -en "\n"
@ -219,18 +219,18 @@ fn_print_warn_nl(){
# [ INFO ] # [ INFO ]
fn_print_info(){ fn_print_info(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${cyan} INFO ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${cyan} INFO ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${cyan} INFO ${default}] $@" echo -en "${creeol}[${cyan} INFO ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
} }
fn_print_info_nl(){ fn_print_info_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandaction}" ]; then
echo -en "${creeol}[${cyan} INFO ${default}] ${commandaction} ${selfname}: $@" echo -en "${creeol}[${cyan} INFO ${default}] ${commandaction} ${servicename}: $*"
else else
echo -en "${creeol}[${cyan} INFO ${default}] $@" echo -en "${creeol}[${cyan} INFO ${default}] $*"
fi fi
fn_sleep_time fn_sleep_time
echo -en "\n" echo -en "\n"
@ -249,56 +249,56 @@ fn_print_header(){
# Complete! # Complete!
fn_print_complete(){ fn_print_complete(){
echo -en "${green}Complete!${default} $@" echo -en "${green}Complete!${default} $*"
fn_sleep_time fn_sleep_time
} }
fn_print_complete_nl(){ fn_print_complete_nl(){
echo -e "${green}Complete!${default} $@" echo -e "${green}Complete!${default} $*"
fn_sleep_time fn_sleep_time
} }
# Failure! # Failure!
fn_print_failure(){ fn_print_failure(){
echo -en "${red}Failure!${default} $@" echo -en "${red}Failure!${default} $*"
fn_sleep_time fn_sleep_time
} }
fn_print_failure_nl(){ fn_print_failure_nl(){
echo -e "${red}Failure!${default} $@" echo -e "${red}Failure!${default} $*"
fn_sleep_time fn_sleep_time
} }
# Error! # Error!
fn_print_error2(){ fn_print_error2(){
echo -en "${red}Error!${default} $@" echo -en "${red}Error!${default} $*"
fn_sleep_time fn_sleep_time
} }
fn_print_error2_nl(){ fn_print_error2_nl(){
echo -e "${red}Error!${default} $@" echo -e "${red}Error!${default} $*"
fn_sleep_time fn_sleep_time
} }
# Warning! # Warning!
fn_print_warning(){ fn_print_warning(){
echo -en "${lightyellow}Warning!${default} $@" echo -en "${lightyellow}Warning!${default} $*"
fn_sleep_time fn_sleep_time
} }
fn_print_warning_nl(){ fn_print_warning_nl(){
echo -e "${lightyellow}Warning!${default} $@" echo -e "${lightyellow}Warning!${default} $*"
fn_sleep_time fn_sleep_time
} }
# Information! # Information!
fn_print_information(){ fn_print_information(){
echo -en "${cyan}Information!${default} $@" echo -en "${cyan}Information!${default} $*"
fn_sleep_time fn_sleep_time
} }
fn_print_information_nl(){ fn_print_information_nl(){
echo -e "${cyan}Information!${default} $@" echo -e "${cyan}Information!${default} $*"
fn_sleep_time fn_sleep_time
} }

2
lgsm/functions/info_distro.sh
View File

@ -235,7 +235,7 @@ if [ -z "${extip}" ]; then
echo -e "${extip}" > "${tmpdir}/extip.txt" echo -e "${extip}" > "${tmpdir}/extip.txt"
else else
if [ -f "${tmpdir}/extip.txt" ]; then if [ -f "${tmpdir}/extip.txt" ]; then
extip=$(cat ${tmpdir}/extip.txt) extip=$(cat "${tmpdir}/extip.txt")
else else
echo -e "x.x.x.x" echo -e "x.x.x.x"
fi fi

16
linuxgsm.sh
View File

@ -102,6 +102,7 @@ fn_bootstrap_fetch_file(){
if [ -f "${local_filedir}/${local_filename}" ]; then if [ -f "${local_filedir}/${local_filename}" ]; then
# Run file if run is set. # Run file if run is set.
if [ "${run}" == "run" ]; then if [ "${run}" == "run" ]; then
# shellcheck source=/dev/null
source "${local_filedir}/${local_filename}" source "${local_filedir}/${local_filename}"
fi fi
fi fi
@ -127,7 +128,7 @@ fn_bootstrap_fetch_file_github(){
fn_print_center() { fn_print_center() {
columns="$(tput cols)" columns="$(tput cols)"
line="$@" line="$*"
printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}" printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}"
} }
@ -347,20 +348,25 @@ else
fi fi
fi fi
fi fi
# shellcheck source=/dev/null
source "${configdirserver}/_default.cfg" source "${configdirserver}/_default.cfg"
# Load the common.cfg config. If missing download it. # Load the common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/common.cfg" ]; then if [ ! -f "${configdirserver}/common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
# shellcheck source=/dev/null
source "${configdirserver}/common.cfg" source "${configdirserver}/common.cfg"
else else
# shellcheck source=/dev/null
source "${configdirserver}/common.cfg" source "${configdirserver}/common.cfg"
fi fi
# Load the instance.cfg config. If missing download it. # Load the instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/${servicename}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${servicename}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
source "${configdirserver}/${selfname}.cfg" # shellcheck source=/dev/null
source "${configdirserver}/${servicename}.cfg"
else else
source "${configdirserver}/${selfname}.cfg" # shellcheck source=/dev/null
source "${configdirserver}/${servicename}.cfg"
fi fi
# Load the linuxgsm.sh in to tmpdir. If missing download it. # Load the linuxgsm.sh in to tmpdir. If missing download it.

26
tests/tests_defaultcfg/tests_defaultcfg.sh
View File

@ -11,7 +11,7 @@ while IFS= read -r -d $'\0' line; do
diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_0.txt defaultcfgtemp.txt) diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_0.txt defaultcfgtemp.txt)
if [ "${diffoutput}" ]; then if [ "${diffoutput}" ]; then
echo "File with errors:" echo "File with errors:"
echo "${line}" echo "${line}"
echo -e "=================================" echo -e "================================="
echo "${diffoutput}" echo "${diffoutput}"
echo "" echo ""
@ -27,11 +27,11 @@ echo -e "test checks that vars present in ALL _default.cfg files are correct."
echo -e "" echo -e ""
find lgsm/config-default/config-lgsm/ ! -name '*template.cfg' -name "*.cfg" -type f -print0 | find lgsm/config-default/config-lgsm/ ! -name '*template.cfg' -name "*.cfg" -type f -print0 |
while IFS= read -r -d $'\0' line; do while IFS= read -r -d $'\0' line; do
grep = ${line} | cut -f1 -d"=" > defaultcfgtemp.txt grep "=" "${line}" | cut -f1 -d"=" > defaultcfgtemp.txt
diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_0.txt defaultcfgtemp.txt | grep '^<') diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_0.txt defaultcfgtemp.txt | grep '^<')
if [ "${diffoutput}" ]; then if [ "${diffoutput}" ]; then
echo "File with errors:" echo "File with errors:"
echo "${line}" echo "${line}"
echo -e "=================================" echo -e "================================="
echo "${diffoutput}" echo "${diffoutput}"
echo "" echo ""
@ -47,14 +47,14 @@ echo -e "test checks that comments in ALL _default.cfg files are correct."
echo -e "" echo -e ""
find lgsm/config-default/config-lgsm/ ! -name '*template.cfg' -name "*.cfg" -type f -print0 | find lgsm/config-default/config-lgsm/ ! -name '*template.cfg' -name "*.cfg" -type f -print0 |
while IFS= read -r -d $'\0' line; do while IFS= read -r -d $'\0' line; do
grep "#" ${line} > defaultcfgtemp.txt grep "#" "${line}" > defaultcfgtemp.txt
diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_1.txt defaultcfgtemp.txt | grep '^<') diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_1.txt defaultcfgtemp.txt | grep '^<')
if [ "${diffoutput}" ]; then if [ "${diffoutput}" ]; then
echo "File with errors:" echo "File with errors:"
echo "${line}" echo "${line}"
echo -e "=================================" echo -e "================================="
echo "${diffoutput}" echo "${diffoutput}"
echo "" echo ""
fi fi
rm defaultcfgtemp.txt rm defaultcfgtemp.txt
done done

3
tests/tests_fctrserver.sh
View File

@ -113,6 +113,7 @@ fn_bootstrap_fetch_file(){
if [ -f "${local_filedir}/${local_filename}" ]; then if [ -f "${local_filedir}/${local_filename}" ]; then
# Run file if run is set. # Run file if run is set.
if [ "${run}" == "run" ]; then if [ "${run}" == "run" ]; then
# shellcheck source=/dev/null
source "${local_filedir}/${local_filename}" source "${local_filedir}/${local_filename}"
fi fi
fi fi
@ -138,7 +139,7 @@ fn_bootstrap_fetch_file_github(){
fn_print_center() { fn_print_center() {
columns="$(tput cols)" columns="$(tput cols)"
line="$@" line="$*"
printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}" printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}"
} }

2
tests/tests_jc2server.sh
View File

@ -136,7 +136,7 @@ fn_bootstrap_fetch_file_github(){
fn_print_center() { fn_print_center() {
columns="$(tput cols)" columns="$(tput cols)"
line="$@" line="$*"
printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}" printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}"
} }

3
tests/tests_mcserver.sh
View File

@ -111,6 +111,7 @@ fn_bootstrap_fetch_file(){
if [ -f "${local_filedir}/${local_filename}" ]; then if [ -f "${local_filedir}/${local_filename}" ]; then
# Run file if run is set. # Run file if run is set.
if [ "${run}" == "run" ]; then if [ "${run}" == "run" ]; then
# shellcheck source=/dev/null
source "${local_filedir}/${local_filename}" source "${local_filedir}/${local_filename}"
fi fi
fi fi
@ -136,7 +137,7 @@ fn_bootstrap_fetch_file_github(){
fn_print_center() { fn_print_center() {
columns="$(tput cols)" columns="$(tput cols)"
line="$@" line="$*"
printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}" printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}"
} }

3
tests/tests_ts3server.sh
View File

@ -111,6 +111,7 @@ fn_bootstrap_fetch_file(){
if [ -f "${local_filedir}/${local_filename}" ]; then if [ -f "${local_filedir}/${local_filename}" ]; then
# Run file if run is set. # Run file if run is set.
if [ "${run}" == "run" ]; then if [ "${run}" == "run" ]; then
# shellcheck source=/dev/null
source "${local_filedir}/${local_filename}" source "${local_filedir}/${local_filename}"
fi fi
fi fi
@ -136,7 +137,7 @@ fn_bootstrap_fetch_file_github(){
fn_print_center() { fn_print_center() {
columns="$(tput cols)" columns="$(tput cols)"
line="$@" line="$*"
printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}" printf "%*s\n" $(( (${#line} + columns) / 2)) "${line}"
} }

Write Preview
Loading…
Cancel
Save