Procházet zdrojové kódy

Fixed Project Zomboid config handling

- Corrected default config names
- Use service name for config and "server name"
- Added fn_check_cfgdir call to create non-existing config directory
Marvin Lehmann před 9 roky
rodič
revize
4092d49278
2 změnil soubory, kde provedl 5 přidání a 4 odebrání
  1. 4 4
      ProjectZomboid/pzserver
  2. 1 0
      lgsm/functions/install_config.sh

+ 4 - 4
ProjectZomboid/pzserver

@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="161113"
+version="161118"
 
 
 ##########################
 ##########################
 ######## Settings ########
 ######## Settings ########
@@ -27,7 +27,7 @@ adminpassword="CHANGE_ME"
 ip="0.0.0.0"
 ip="0.0.0.0"
 
 
 fn_parms(){
 fn_parms(){
-parms="-ip ${ip} -adminpassword \"${adminpassword}\""
+parms="-ip ${ip} -adminpassword \"${adminpassword}\" -servername ${servicename}"
 }
 }
 
 
 #### LinuxGSM Settings ####
 #### LinuxGSM Settings ####
@@ -96,8 +96,8 @@ filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}"
 systemdir="${filesdir}"
 executabledir="${filesdir}"
 executabledir="${filesdir}"
 executable="./start-server.sh"
 executable="./start-server.sh"
-servercfg="server.ini"
-servercfgdefault="server.cfg"
+servercfg="${servicename}.ini"
+servercfgdefault="server.ini"
 servercfgdir="${HOME}/Zomboid/Server"
 servercfgdir="${HOME}/Zomboid/Server"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 

+ 1 - 0
lgsm/functions/install_config.sh

@@ -298,6 +298,7 @@ elif [ "${gamename}" == "Pirates, Vikings, and Knights II" ]; then
 	fn_set_config_vars
 	fn_set_config_vars
 elif [ "${gamename}" == "Project Zomboid" ]; then
 elif [ "${gamename}" == "Project Zomboid" ]; then
 	gamedirname="ProjectZomboid"
 	gamedirname="ProjectZomboid"
+	fn_check_cfgdir
 	array_configs+=( server.ini )
 	array_configs+=( server.ini )
 	fn_fetch_default_config
 	fn_fetch_default_config
 	fn_default_config_remote
 	fn_default_config_remote