Browse Source

more wording changes

pull/4166/head
Daniel Gibbs 4 years ago
parent
commit
6eee25887a
  1. 2
      .github/workflows/version-check.sh
  2. 2
      lgsm/functions/check_steamcmd.sh
  3. 2
      lgsm/functions/command_dev_clear_modules.sh
  4. 2
      lgsm/functions/core_dl.sh
  5. 11
      linuxgsm.sh

2
.github/workflows/version-check.sh

@ -1,5 +1,5 @@
version=$(grep "version=" linuxgsm.sh | sed -e 's/version//g'| tr -d '="')
modulesversion=$(grep "modulesversion=" lgsm/functions/core_functions.sh | sed -e 's/modulesversion//g'| tr -d '="')
modulesversion=$(grep "modulesversion=" lgsm/modules/core_modules.sh | sed -e 's/modulesversion//g'| tr -d '="')
if [ "${version}" != "${modulesversion}" ]; then
echo "Error! LinuxGSM version mismatch"

2
lgsm/functions/check_steamcmd.sh

@ -7,7 +7,7 @@
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
# init steamcmd functions
# init steamcmd functions.
core_steamcmd.sh
fn_check_steamcmd_clear

2
lgsm/functions/command_dev_clear_modules.sh

@ -11,7 +11,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_firstcommand_set
echo -e "================================="
echo -e "Clear Functions"
echo -e "Clear Modules"
echo -e "================================="
echo -e ""
if fn_prompt_yn "Do you want to delete all modules?" Y; then

2
lgsm/functions/core_dl.sh

@ -430,7 +430,7 @@ fn_fetch_file(){
# GitHub file download modules.
# Used to simplify downloading specific files from GitHub.
# github_fileurl_dir: the directory of the file in the GitHub: lgsm/functions
# github_fileurl_dir: the directory of the file in the GitHub: lgsm/modules
# github_fileurl_name: the filename of the file to download from GitHub: core_messages.sh
# github_file_url_dir: the directory of the file in the GitHub: lgsm/modules
# github_file_url_name: the filename of the file to download from GitHub: core_messages.sh

11
linuxgsm.sh

@ -45,13 +45,12 @@ userinput="${1}"
userinput2="${2}"
## GitHub Branch Select
# Allows for the use of different function files
# from a different repo and/or branch.
# Allows for the use of different branches and forks.
githubuser="GameServerManagers"
githubrepo="LinuxGSM"
githubbranch="master"
# Core function that is required first.
# Core module that is required first.
core_modules.sh(){
modulefile="${FUNCNAME[0]}"
fn_bootstrap_fetch_file_github "lgsm/modules" "core_modules.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nomd5"
@ -177,7 +176,7 @@ fn_bootstrap_fetch_file_github(){
run="${5:-0}"
forcedl="${6:-0}"
md5="${7:-0}"
# Passes vars to the file download function.
# Passes vars to the file download module.
fn_bootstrap_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}"
}
@ -389,8 +388,8 @@ else
echo -e "OK"
fi
else
function_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg")
if [ "${function_file_diff}" != "" ]; then
config_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg")
if [ "${config_file_diff}" != "" ]; then
fn_print_warn_nl "_default.cfg has altered. reloading config."
echo -en "copying _default.cfg...\c"
cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg"

Loading…
Cancel
Save