Browse Source

Auto stash before merge of "feature/check-update" and "h3o66/feature/check-update"

pull/3151/head
Daniel Gibbs 5 years ago
parent
commit
f79962848c
  1. 6
      lgsm/functions/core_steamcmd.sh
  2. 6
      linuxgsm.sh

6
lgsm/functions/core_steamcmd.sh

@ -126,8 +126,8 @@ fn_check_steamcmd_ark(){
}
fn_check_steamcmd_clear(){
# Will remove steamcmd dir if steamcmd package is installed.
if [ "$(command -v steamcmd 2>/dev/null)" ]&&[ -d "${rootdir}/steamcmd" ]; then
# Will remove steamcmd dir if steamcmd package is installed.
if [ "$(command -v steamcmd 2>/dev/null)" ]&&[ -d "${rootdir}/steamcmd" ]; then
rm -rf "${steamcmddir:?}"
exitcode=$?
if [ "${exitcode}" != 0 ]; then
@ -135,7 +135,7 @@ fn_check_steamcmd_clear(){
else
fn_script_log_pass "Removing ${rootdir}/steamcmd"
fi
fi
fi
}
fn_check_steamcmd_exec(){

6
linuxgsm.sh

@ -401,6 +401,8 @@ else
fi
fi
fi
# Configs have to be loaded twice to allow start startparameters to pick up all vars
fn_configs(){
# shellcheck source=/dev/null
source "${configdirserver}/_default.cfg"
# Load the common.cfg config. If missing download it.
@ -444,7 +446,11 @@ else
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5"
fi
}
fn_configs
fn_configs
fi
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
fn_ansi_loader
# Prevents running of core_exit.sh for Travis-CI.

Loading…
Cancel
Save