Merge branch 'hotfix/v20.6.2'

GameServerManagers · Dec 18, 2020 · a61de53 · a61de53
2 parents 22a76ce + 871af8a
commit a61de53
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh
@@ -61,7 +61,7 @@ fn_dl_steamcmd(){
  # If using a specific branch.
  if [ -n "${branch}" ]&&[ -n "${betapassword}" ]; then
  ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" -betapassword "${betapassword}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
- elif [ -n "${branch}" ]; then
+ elif [ -n "${branch}" ]&&[ "${branch}" != "public" ]; then
  ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
  else
  ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
@@ -70,7 +70,7 @@ fn_dl_steamcmd(){
  elif [ "${shortname}" == "ac" ]||[ "${shortname}" == "jk2" ]; then
  if [ -n "${branch}" ]&&[ -n "${betapassword}" ]; then
  ${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" -betapassword "${betapassword}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
- elif [ -n "${branch}" ]; then
+ elif [ -n "${branch}" ]&&[ "${branch}" != "public" ]; then
  ${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
  else
  ${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
@@ -79,7 +79,7 @@ fn_dl_steamcmd(){
  else
  if [ -n "${branch}" ]&&[ -n "${betapassword}" ]; then
  ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" -betapassword "${betapassword}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
- elif [ -n "${branch}" ]; then
+ elif [ -n "${branch}" ]&&[ "${branch}" != "public" ]; then
  ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
  else
  ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"

diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
@@ -7,7 +7,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v20.6.1"
+modulesversion="v20.6.2"
 
 # Core
 

diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh
@@ -42,7 +42,7 @@ fn_update_steamcmd_remotebuild(){
 
  if [ -n "${branch}" ]&&[ -n "${betapassword}" ]; then
  remotebuild=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" -beta "${branch}" -betapassword "${betapassword}" +quit | sed '1,/branches/d' | sed "1,/${branch}/d" | grep -m 1 buildid | tr -cd '[:digit:]')
- elif [ -n "${branch}" ]; then
+ elif [ -n "${branch}" ]&&[ "${branch}" != "public" ]; then
  remotebuild=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" -beta "${branch}" +quit | sed '1,/branches/d' | sed "1,/${branch}/d" | grep -m 1 buildid | tr -cd '[:digit:]')
  else
  remotebuild=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed '1,/branches/d' | sed "1,/${branch}/d" | grep -m 1 buildid | tr -cd '[:digit:]')

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="v20.6.1"
+version="v20.6.2"
 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="v20.6.1"
+version="v20.6.2"
 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="v20.6.1"
+version="v20.6.2"
 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="v20.6.1"
+version="v20.6.2"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"