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. 0
      lgsm/functions/core_steamcmd.sh
  2. 6
      linuxgsm.sh

0
lgsm/functions/core_steamcmd.sh

6
linuxgsm.sh

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

Loading…
Cancel
Save