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

Fix config diff handling.

Browse source
This commit is contained in:
Daniel Ceregatti 2023-02-24 15:14:22 -08:00
parent 1a129135da
commit 412b4e692c
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
files/dayzserver
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eE set -eEa
# If you want/need the server and rcon ports to be different, set them here. # If you want/need the server and rcon ports to be different, set them here.
# The steam query port is set in serverDZ.cfg. # The steam query port is set in serverDZ.cfg.
@ -299,10 +299,10 @@ install(){
# Handle any changes in the server config file by allowing them to be merged after viewing a diff. # Handle any changes in the server config file by allowing them to be merged after viewing a diff.
config(){ config(){
if ! diff -q "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}" if ! diff -q "${SERVER_CFG_DST}" "${SERVER_CFG_SRC}"
then then
echo "=========================================================================" echo "========================================================================="
diff -Nau --color "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}" || echo "" diff -Nau --color "${SERVER_CFG_DST}" "${SERVER_CFG_SRC}" | more
echo "=========================================================================" echo "========================================================================="
if prompt_yn "The new server configuration file differs from what's installed. Use it?" if prompt_yn "The new server configuration file differs from what's installed. Use it?"
then then
@ -311,6 +311,8 @@ config(){
else else
echo "NOT updating the server configuration file" echo "NOT updating the server configuration file"
fi fi
else
echo "No differences found between ${SERVER_CFG_SRC} and ${SERVER_CFG_DST}"
fi fi
} }
@ -484,9 +486,9 @@ activate(){
sed -i "${WORKSHOP_CFG}" -e "s/${ID}:${NAME}:[0-1]/${ID}:${NAME}:${W}/" sed -i "${WORKSHOP_CFG}" -e "s/${ID}:${NAME}:[0-1]/${ID}:${NAME}:${W}/"
symlink ${W} ${ID} "${NAME}" symlink ${W} ${ID} "${NAME}"
copy_keys ${W} ${ID} copy_keys ${W} ${ID}
echo "Mod id ${ID} - ${WW}activated"
checkTypesXML ${ID} ${UU}install checkTypesXML ${ID} ${UU}install
checkInstall ${ID} ${UU}install checkInstall ${ID} ${UU}install
echo "Mod id ${ID} - ${WW}activated"
else else
echo -e "Mod id ${ID} - ${green}${NAME}${default} - is already ${WW}active" echo -e "Mod id ${ID} - ${green}${NAME}${default} - is already ${WW}active"
fi fi
@ -525,7 +527,8 @@ copy_keys(){
if [[ ${1} = 1 ]] if [[ ${1} = 1 ]]
then then
echo "Copying key files..." echo "Copying key files..."
cp -v ${workshopfolder}/${2}/keys/* "${SERVER_FILES}/keys/" cp -v ${workshopfolder}/${2}/keys/* "${SERVER_FILES}/keys/" || \
cp -v ${workshopfolder}/${2}/key/* "${SERVER_FILES}/keys/" # Because mod authors can't stick to one way of doing things...
fi fi
} }
@ -572,10 +575,22 @@ checkTypesXML(){
then then
echo "Merging to missions..." echo "Merging to missions..."
else else
echo "Restoring original types.xml..." echo "Removing contents from missions..."
fi fi
/files/mods/types.sh ${1} ${2} /files/mods/types.sh ${1} ${2}
fi fi
# Also see if there's a symlink to some other file that serves the same purpose, but named differently
if [ -s "/files/mods/${1}/types.xml" ]
then
echo -n "The mod id ${1} has a types.xml symlink. "
if [[ ${2} = "install" ]]
then
echo "Merging to missions..."
else
echo "Removing contents from missions..."
fi
/files/mods/types.sh ${1} ${2} /files/mods/${1}/types.xml
fi
} }
checkInstall(){ checkInstall(){