diff --git a/files/bin/dz-common b/files/bin/dz-common index 60fa642..d6f56fe 100755 --- a/files/bin/dz-common +++ b/files/bin/dz-common @@ -171,14 +171,24 @@ get_mods(){ get_mod_command_line(){ mod_command_line="" + server_command_line="" for link in $(ls -tdr ${SERVER_PROFILE}/@* 2> /dev/null) do ID=$(readlink ${link} | awk -F/ '{print $NF}') MODNAME=$(get_mod_name ${ID}) - mod_command_line+="@${MODNAME};" + if grep -q SERVER_MOD ${FILES}/mods/${ID}/xml.env 2> /dev/null + then + server_command_line+="@${MODNAME};" + else + mod_command_line+="@${MODNAME};" + fi done if [[ ${mod_command_line} != "" ]] then mod_command_line='-mod='${mod_command_line::-1} fi + if [[ ${server_command_line} != "" ]] + then + server_command_line='-serverMod='${server_command_line::-1} + fi } diff --git a/files/mods/2874589934/xml.env b/files/mods/2874589934/xml.env new file mode 100644 index 0000000..5dc4a7b --- /dev/null +++ b/files/mods/2874589934/xml.env @@ -0,0 +1 @@ +SERVER_MOD=1 diff --git a/files/mods/2881635033/xml.env b/files/mods/2881635033/xml.env new file mode 100644 index 0000000..5dc4a7b --- /dev/null +++ b/files/mods/2881635033/xml.env @@ -0,0 +1 @@ +SERVER_MOD=1 diff --git a/files/mods/@DayZ-Dynamic-AI-Addon b/files/mods/@DayZ-Dynamic-AI-Addon new file mode 120000 index 0000000..656ffd0 --- /dev/null +++ b/files/mods/@DayZ-Dynamic-AI-Addon @@ -0,0 +1 @@ +2874589934 \ No newline at end of file diff --git a/files/mods/@FallFix b/files/mods/@FallFix new file mode 120000 index 0000000..932c093 --- /dev/null +++ b/files/mods/@FallFix @@ -0,0 +1 @@ +2881635033 \ No newline at end of file diff --git a/server/Dockerfile b/server/Dockerfile index a6db72a..d6e148b 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -24,6 +24,11 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install --no-install-reco wget \ xmlstarlet +# Add bercon-cli https://github.com/WoozyMasta/bercon +RUN wget https://github.com/WoozyMasta/bercon-cli/releases/latest/download/bercon-cli-linux-amd64 -O bercon-cli \ + && chmod +x bercon-cli \ + && mv bercon-cli /usr/bin + # Set the locale RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen ENV LANG en_US.UTF-8