Просмотр исходного кода

fix(dstserver): fix config installation (#2742)

* fix(dstserver): move cluster configvars
Daniel Gibbs 6 лет назад
Родитель
Сommit
f6c332bac0
2 измененных файлов с 5 добавлено и 5 удалено
  1. 4 4
      lgsm/config-default/config-lgsm/dstserver/_default.cfg
  2. 1 1
      lgsm/functions/check_deps.sh

+ 4 - 4
lgsm/config-default/config-lgsm/dstserver/_default.cfg

@@ -153,14 +153,14 @@ glibc="2.15"
 systemdir="${serverfiles}"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/bin"
 executabledir="${serverfiles}/bin"
 executable="./dontstarve_dedicated_server_nullrenderer"
 executable="./dontstarve_dedicated_server_nullrenderer"
-servercfgdir="${clustercfgdir}/${shard}"
-servercfg="server.ini"
-servercfgdefault="server.ini"
-servercfgfullpath="${servercfgdir}/${servercfg}"
 clustercfgdir="${persistentstorageroot}/${confdir}/${cluster}"
 clustercfgdir="${persistentstorageroot}/${confdir}/${cluster}"
 clustercfg="cluster.ini"
 clustercfg="cluster.ini"
 clustercfgdefault="cluster.ini"
 clustercfgdefault="cluster.ini"
 clustercfgfullpath="${clustercfgdir}/${clustercfg}"
 clustercfgfullpath="${clustercfgdir}/${clustercfg}"
+servercfgdir="${clustercfgdir}/${shard}"
+servercfg="server.ini"
+servercfgdefault="server.ini"
+servercfgfullpath="${servercfgdir}/${servercfg}"
 
 
 ## Backup Directory
 ## Backup Directory
 backupdir="${lgsmdir}/backup"
 backupdir="${lgsmdir}/backup"

+ 1 - 1
lgsm/functions/check_deps.sh

@@ -352,7 +352,7 @@ fn_deps_build_debian(){
 	# No More Room in Hell, Counter-Strike: Source, Garry's Mod and Zombie Panic: Source
 	# No More Room in Hell, Counter-Strike: Source, Garry's Mod and Zombie Panic: Source
 	elif [ "${shortname}" == "nmrih" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "zps" ]; then
 	elif [ "${shortname}" == "nmrih" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "zps" ]; then
 		if [ "${arch}" == "x86_64" ]; then
 		if [ "${arch}" == "x86_64" ]; then
-			array_deps_required+=( lib32tinfo5 )
+			array_deps_required+=( libtinfo5:i386 )
 		else
 		else
 			array_deps_required+=( libtinfo5 )
 			array_deps_required+=( libtinfo5 )
 		fi
 		fi