diff --git a/README.md b/README.md
index 5ba974010..5e1f5cea4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+
[](https://linuxgsm.com)
[](https://travis-ci.org/GameServerManagers/LinuxGSM)
diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index 6681a49a6..8837606fe 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -15,13 +15,13 @@ port="27102"
queryport="27131"
servername="LinuxGSM Server"
serverpassword=""
-defaultmap="Oilfield"
-defaultscenario="Scenario_Oilfield_Push_Security"
+defaultmap="Canyon"
+defaultscenario="Scenario_Crossing_Push_Security"
maxplayers="28"
## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
fn_parms(){
-parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -password=${serverpassword} -hostname='${servername}' -log"
+parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password=${serverpassword} -hostname='${servername}' -log"
}
#### LinuxGSM Settings ####
diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 738e24f65..87138fea7 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -430,7 +430,9 @@ fn_deps_build_redhat(){
# LinuxGSM requirements
## CentOS 6
if [ "${distroversion}" == "6" ]; then
- array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc jq )
+ array_deps_required=( epel-release curl wget util-linux-ng python file gzip bzip2 unzip binutils bc jq )
+ if [ "${distroversion}" == "7" ]; then
+ array_deps_required=( epel-release curl wget util-linux python file gzip bzip2 unzip binutils bc jq )
elif [ "${distroid}" == "fedora" ]; then
array_deps_required=( curl wget util-linux python2 file gzip bzip2 unzip binutils bc jq )
elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then
diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh
index 0f2b09b4d..c5d48e202 100644
--- a/lgsm/functions/command_backup.sh
+++ b/lgsm/functions/command_backup.sh
@@ -121,7 +121,7 @@ fn_backup_compression(){
core_exit.sh
fi
- tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" --exclude "${tmpdir}/.backup.lock" ./*
+ tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" --exclude "${tmpdir}/.backup.lock" ./.
local exitcode=$?
if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol
diff --git a/lgsm/functions/command_fastdl.sh b/lgsm/functions/command_fastdl.sh
index 7eed4813e..36e15391c 100644
--- a/lgsm/functions/command_fastdl.sh
+++ b/lgsm/functions/command_fastdl.sh
@@ -170,7 +170,7 @@ fn_fastdl_preview(){
done
# Source engine
else
- fastdl_directories_array=( "maps" "materials" "models" "particles" "sounds" "resources" )
+ fastdl_directories_array=( "maps" "materials" "models" "particles" "sound" "resources" )
for directory in "${fastdl_directories_array[@]}"; do
if [ -d "${systemdir}/${directory}" ]; then
if [ "${directory}" == "maps" ]; then
@@ -181,7 +181,7 @@ fn_fastdl_preview(){
local allowed_extentions_array=( "*.vtx" "*.vvd" "*.mdl" "*.phy" "*.jpg" "*.png" )
elif [ "${directory}" == "particles" ]; then
local allowed_extentions_array=( "*.pcf" )
- elif [ "${directory}" == "sounds" ]; then
+ elif [ "${directory}" == "sound" ]; then
local allowed_extentions_array=( "*.wav" "*.mp3" "*.ogg" )
fi
for allowed_extention in "${allowed_extentions_array[@]}"; do
@@ -320,7 +320,7 @@ fn_fastdl_source(){
local allowed_extentions_array=( "*.vtx" "*.vvd" "*.mdl" "*.phy" "*.jpg" "*.png" )
elif [ "${directory}" == "particles" ]; then
local allowed_extentions_array=( "*.pcf" )
- elif [ "${directory}" == "sounds" ]; then
+ elif [ "${directory}" == "sound" ]; then
local allowed_extentions_array=( "*.wav" "*.mp3" "*.ogg" )
fi
for allowed_extention in "${allowed_extentions_array[@]}"
diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index 77c25ee8f..447102e31 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -90,7 +90,7 @@ fn_start_tmux(){
# Create lockfile
date > "${rootdir}/${lockselfname}"
cd "${executabledir}"
- tmux new-session -d -x "${sessionheight}" -y "${sessionwidth}" -s "${servicename}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${servicename}-tmux-error.tmp"
+ tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${servicename}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${servicename}-tmux-error.tmp"
# Create logfile
touch "${consolelog}"
diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index 416835504..6aef2fca4 100644
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -378,6 +378,11 @@ functionfile="${FUNCNAME}"
fn_fetch_function
}
+fix_ts3.sh(){
+functionfile="${FUNCNAME}"
+fn_fetch_function
+}
+
fix_ut2k4.sh(){
functionfile="${FUNCNAME}"
fn_fetch_function
diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh
index dfa9fde78..739a27a7c 100644
--- a/lgsm/functions/fix.sh
+++ b/lgsm/functions/fix.sh
@@ -60,6 +60,8 @@ if [ "${function_selfname}" != "command_install.sh" ]&&[ -z "${fixbypass}" ]; th
fix_rw.sh
elif [ "${shortname}" == "ss3" ]; then
fix_ss3.sh
+ elif [ "${shortname}" == "ts3" ]; then
+ fix_ts3.sh
elif [ "${shortname}" == "mta" ]; then
fix_mta.sh
elif [ "${shortname}" == "wurm" ]; then
diff --git a/lgsm/functions/fix_ts3.sh b/lgsm/functions/fix_ts3.sh
new file mode 100644
index 000000000..fd28a90bd
--- /dev/null
+++ b/lgsm/functions/fix_ts3.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# LinuxGSM fix_ts3.sh function
+# Author: Daniel Gibbs
+# Website: https://linuxgsm.com
+# Description: Resolves various issues with Teamspeak 3.
+
+local commandname="FIX"
+local commandaction="Fix"
+local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+
+# Fixes: makes libmariadb2 available #1924
+if [ ! -f "${serverfiles}/libmariadb.so.2" ]; then
+ ln -s "${serverfiles}/redist/libmariadb.so.2" "${serverfiles}/libmariadb.so.2"
+fi
\ No newline at end of file