Browse Source

Merge branch 'release/171014' into develop

pull/1657/head
Daniel Gibbs 8 years ago
parent
commit
11a3e2ed19
  1. 2
      lgsm/functions/command_dev_detect_glibc.sh
  2. 2
      lgsm/functions/command_dev_detect_ldd.sh
  3. 2
      lgsm/functions/info_config.sh
  4. 2
      linuxgsm.sh
  5. 4
      tests/tests_jc2server.sh
  6. 4
      tests/tests_ts3server.sh

2
lgsm/functions/command_dev_detect_glibc.sh

@ -16,7 +16,7 @@ if [ -z "$(command -v objdump)" ]; then
fi
if [ -z "${serverfiles}" ]; then
dir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
fi
if [ -d "${serverfiles}" ]; then

2
lgsm/functions/command_dev_detect_ldd.sh

@ -10,7 +10,7 @@ echo "Shared Object dependencies Checker"
echo "================================="
if [ -z "${serverfiles}" ]; then
dir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
fi
if [ -d "${serverfiles}" ]; then

2
lgsm/functions/info_config.sh

@ -474,6 +474,8 @@ fn_info_config_starbound(){
# Not Set
servername=${servername:-"NOT SET"}
queryenabled=${queryenabled:-"NOT SET"}
rconenabled==${rconenabled:-"NOT SET"}
rconpassword=${rconpassword:-"NOT SET"}
port=${port:-"21025"}
queryport=${queryport:-"21025"}

2
linuxgsm.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="170926"
version="171014"
shortname="core"
gameservername="core"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"

4
tests/tests_jc2server.sh

@ -16,10 +16,10 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="170619"
version="171014"
shortname="jc2"
gameservername="jc2server"
rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
servicename="${selfname}"
lockselfname=".${servicename}.lock"

4
tests/tests_ts3server.sh

@ -16,10 +16,10 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="170619"
version="171014"
shortname="ts3"
gameservername="ts3server"
rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
servicename="${selfname}"
lockselfname=".${servicename}.lock"

Loading…
Cancel
Save