Merge branch 'hotfix/v21.5.1'

GameServerManagers · Jan 17, 2022 · fdfeae1 · fdfeae1
2 parents ad8fc3a + 437ebfa
commit fdfeae1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
@@ -8,7 +8,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v21.5.0"
+modulesversion="v21.5.1"
 
 # Core
 

diff --git a/linuxgsm.sh b/linuxgsm.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.5.0"
+version="v21.5.1"
 shortname="core"
 gameservername="core"
 commandname="CORE"
@@ -47,9 +47,9 @@ userinput2="${2}"
 ## GitHub Branch Select
 # Allows for the use of different function files
 # from a different repo and/or branch.
-githubuser="GameServerManagers"
-githubrepo="LinuxGSM"
-githubbranch="master"
+[ -n "${LGSM_GITHUBUSER}" ] && githubuser="${LGSM_GITHUBUSER}" || githubuser="GameServerManagers"
+[ -n "${LGSM_GITHUBREPO}" ] && githubrepo="${LGSM_GITHUBREPO}" || githubrepo="LinuxGSM"
+[ -n "${LGSM_GITHUBBRANCH}" ] && githubbranch="${LGSM_GITHUBBRANCH}" || githubbranch="master"
 
 # Core function that is required first.
 core_functions.sh(){

diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.5.0"
+version="v21.5.1"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.5.0"
+version="v21.5.1"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.5.0"
+version="v21.5.1"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v21.5.0"
+version="v21.5.1"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
     functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
-    modulesversion="v21.5.0"
+    modulesversion="v21.5.1"
     # Core
@@ Expand Down @@