matty/dayzdockerserver
1
0
Fork 0
mirror of https://ceregatti.org/git/daniel/dayzdockerserver.git synced 2025-05-07 06:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start handling cfgenvironment. WIP.

Browse source 
Exec out to sleep so the container stops correctly.
This commit is contained in:
Daniel Ceregatti 2023-10-17 17:16:44 -07:00
parent 664b267da1
commit 499d92e179
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/bin/dz
View file

@ -137,7 +137,7 @@ mergexml(){
echo echo
# First copy the pristine files from upstream # First copy the pristine files from upstream
echo -e "${green}Copying upstream XML files into local mpmissions for map ${MAP}${default}": echo -e "${green}Copying upstream XML files into local mpmissions for map ${MAP}${default}":
find /mpmissions/${MAP} \( -name "cfgeconomycore.xml" -o -name "cfgeventspawns.xml" \) -exec cp -v {} ${SERVER_FILES}{} \; find /mpmissions/${MAP} \( -name "cfgeconomycore.xml" -o -name "cfgeventspawns.xml" -o -name "cfgenvironment.xml" \) -exec cp -v {} ${SERVER_FILES}{} \;
# Follow https://community.bistudio.com/wiki/DayZ:Central_Economy_mission_files_modding # Follow https://community.bistudio.com/wiki/DayZ:Central_Economy_mission_files_modding
# First, remove any existing files, via the mod_ prefix # First, remove any existing files, via the mod_ prefix
rm -rf ${MPMISSIONS}/${MAP}/mod_* rm -rf ${MPMISSIONS}/${MAP}/mod_*
@ -177,7 +177,7 @@ mergexml(){
-m /ce /economycore {} \; -m /ce /economycore {} \;
fi fi
# These are merged directly into the upstream file # These are merged directly into the upstream file
for i in "CFGEVENTSPAWNS:eventposdef:event" for i in "CFGEVENTSPAWNS:eventposdef:event" "CFGENVIRONMENT:env:territories/territory"
do do
var=$(echo ${i} | cut -d: -f1) var=$(echo ${i} | cut -d: -f1)
CHECK=$(echo ${i} | cut -d: -f2) CHECK=$(echo ${i} | cut -d: -f2)
@ -257,8 +257,7 @@ start(){
echo "Caught SIGTERM/SIGINT..." echo "Caught SIGTERM/SIGINT..."
exit 0 exit 0
' SIGTERM SIGINT ' SIGTERM SIGINT
sleep 1 exec sleep 1000000
exit 0
fi fi
# Do the report on exit. Set here so that it only happens once we're starting the server, and not for other actions. # Do the report on exit. Set here so that it only happens once we're starting the server, and not for other actions.
trap ' trap '