Skip to content

Commit fdfeae1

Browse files
committed
Merge branch 'hotfix/v21.5.1'
2 parents ad8fc3a + 437ebfa commit fdfeae1

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

lgsm/functions/core_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v21.5.0"
11+
modulesversion="v21.5.1"
1212

1313
# Core
1414

linuxgsm.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.5.0"
23+
version="v21.5.1"
2424
shortname="core"
2525
gameservername="core"
2626
commandname="CORE"
@@ -47,9 +47,9 @@ userinput2="${2}"
4747
## GitHub Branch Select
4848
# Allows for the use of different function files
4949
# from a different repo and/or branch.
50-
githubuser="GameServerManagers"
51-
githubrepo="LinuxGSM"
52-
githubbranch="master"
50+
[ -n "${LGSM_GITHUBUSER}" ] && githubuser="${LGSM_GITHUBUSER}" || githubuser="GameServerManagers"
51+
[ -n "${LGSM_GITHUBREPO}" ] && githubrepo="${LGSM_GITHUBREPO}" || githubrepo="LinuxGSM"
52+
[ -n "${LGSM_GITHUBBRANCH}" ] && githubbranch="${LGSM_GITHUBBRANCH}" || githubbranch="master"
5353

5454
# Core function that is required first.
5555
core_functions.sh(){

tests/tests_fctrserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.5.0"
23+
version="v21.5.1"
2424
shortname="fctr"
2525
gameservername="fctrserver"
2626
commandname="CORE"

tests/tests_jc2server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.5.0"
23+
version="v21.5.1"
2424
shortname="jc2"
2525
gameservername="jc2server"
2626
commandname="CORE"

tests/tests_mcserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.5.0"
23+
version="v21.5.1"
2424
shortname="mc"
2525
gameservername="mcserver"
2626
commandname="CORE"

tests/tests_ts3server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.5.0"
23+
version="v21.5.1"
2424
shortname="ts3"
2525
gameservername="ts3server"
2626
commandname="CORE"

0 commit comments

Comments
 (0)