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

Big refactor: Remove all the fn_ crap and normalize whitespace.

Browse source
This commit is contained in:
Daniel Ceregatti 2022-07-25 18:26:31 -07:00
parent 5e48a3c3e3
commit c728c743b7
1 changed files with 250 additions and 276 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

206
files/dayzserver
View file

@ -51,7 +51,7 @@ profile="-profiles=${SERVER_PROFILE}"
logs="-nologs" logs="-nologs"
# Put them all together # Put them all together
dayzparameter=" -config=${config} -port=${port} -freezecheck -fps=60 -BEpath=${SERVER_FILES}/battleye ${profile} ${logs}" parameters=" -config=${config} -port=${port} -freezecheck -fps=60 -BEpath=${SERVER_FILES}/battleye ${profile} ${logs}"
# Server configuration file # Server configuration file
SERVER_CFG_FILE="serverDZ.cfg" SERVER_CFG_FILE="serverDZ.cfg"
@ -81,7 +81,7 @@ mod_command_line="-mod="
YES="${green}yes${default}" YES="${green}yes${default}"
NO="${red}no${default}" NO="${red}no${default}"
fn_usage(){ usage(){
echo -e " echo -e "
${red}Bad option or arguments! ${yellow}${*}${default} ${red}Bad option or arguments! ${yellow}${*}${default}
@ -92,7 +92,7 @@ Options and arguments:
activate id [id...] - Activate one or many installed DayZ Workshop items by id activate id [id...] - Activate one or many installed DayZ Workshop items by id
add id [id...] - Add one or many DayZ Workshop items by id. Added items become active by default add id [id...] - Add one or many DayZ Workshop items by id. Added items become active by default
config - Update the internal serverDZ.cfg file from files/serverDZ.cfg on the host. Presents a unified diff if the internal file doesn't match the host file. config - Update the internal serverDZ.cfg file from files/serverDZ.cfg on the host. Presents a unified diff if the internal file doesn't match the host file.
deactivate id [id...] - Deactivate one or many installed DayZ Workshop items by id - Keeps the addon files but excludes from -mod= deactivate id [id...] - Deactivate one or many installed DayZ Workshop items by id - Keeps the mod files but excludes from -mod=
install - Install the DayZ server files install - Install the DayZ server files
list - List Workshop items and if they are active or not list - List Workshop items and if they are active or not
login - Login to Steam login - Login to Steam
@ -105,7 +105,7 @@ ${default}"
exit 1 exit 1
} }
fn_prompt_yn(){ prompt_yn(){
echo -n "${1} (y|N) " >&2 echo -n "${1} (y|N) " >&2
read -s -n 1 a read -s -n 1 a
a=$(echo ${a} | tr A-Z a-z) a=$(echo ${a} | tr A-Z a-z)
@ -118,7 +118,7 @@ fn_prompt_yn(){
fi fi
} }
fn_loadconfig_dayz(){ loadconfig(){
if [ ! -f "${SERVER_INSTALL_FILE}" ] if [ ! -f "${SERVER_INSTALL_FILE}" ]
then then
echo echo
@ -140,10 +140,12 @@ fn_loadconfig_dayz(){
if [ ! -f "${BE_SERVER_FILE}" ] && [ ! -f "${ALT_BE_SERVER_FILE}" ] if [ ! -f "${BE_SERVER_FILE}" ] && [ ! -f "${ALT_BE_SERVER_FILE}" ]
then then
passwd=$(openssl rand -base64 8 | tr -dc 'A-Za-z0-9') passwd=$(openssl rand -base64 8 | tr -dc 'A-Za-z0-9')
if [ "${passwd}" == "" ]; then if [ "${passwd}" == "" ]
then
passwd=$(< /dev/urandom tr -dc 'A-Za-z0-9' | head -c10) passwd=$(< /dev/urandom tr -dc 'A-Za-z0-9' | head -c10)
fi fi
if [ "${passwd}" == "" ]; then if [ "${passwd}" == "" ]
then
printf "[ ${red}FAIL${default} ] Could not generate a passwort for RCON!\nOpen the Battleye config with 'dayzserver rcon'." printf "[ ${red}FAIL${default} ] Could not generate a passwort for RCON!\nOpen the Battleye config with 'dayzserver rcon'."
exit 1 exit 1
else else
@ -172,7 +174,7 @@ EOF
> ~/py3rcon.config.json > ~/py3rcon.config.json
} }
fn_start_dayz(){ start(){
# Check for interactive shell # Check for interactive shell
if [ -t 0 ] if [ -t 0 ]
then then
@ -185,12 +187,12 @@ fn_start_dayz(){
trap ' trap '
report report
' EXIT ' EXIT
fn_mod_cmd mod_cmd
cd ${SERVER_FILES} cd ${SERVER_FILES}
# Run the server. Allow docker to restart the container if the script exits with a code other than 0. This is so we can # Run the server. Allow docker to restart the container if the script exits with a code other than 0. This is so we can
# safely shut the container down without killing the server within. # safely shut the container down without killing the server within.
printf "[ ${green}DayZ${default} ] Server starting...\n" printf "[ ${green}DayZ${default} ] Server starting...\n"
./DayZServer "${mod_command_line}" ${dayzparameter} ./DayZServer "${mod_command_line}" ${parameters}
EXIT_CODE=$? EXIT_CODE=$?
if [ -f ${SERVER_FILES}/restart ] if [ -f ${SERVER_FILES}/restart ]
then then
@ -201,21 +203,22 @@ fn_start_dayz(){
exit ${EXIT_CODE} exit ${EXIT_CODE}
} }
fn_restart(){ restart(){
touch "${SERVER_FILES}/restart" touch "${SERVER_FILES}/restart"
echo "Restarting DayZ server..." echo "Restarting DayZ server..."
kill -TERM $(pidof DayZServer) kill -TERM $(pidof DayZServer)
} }
fn_stop_dayz(){ stop(){
echo "Stopping DayZ server..." echo "Stopping DayZ server..."
kill -TERM $(pidof DayZServer) kill -TERM $(pidof DayZServer)
} }
fn_steam_login(){ login(){
loadconfig
if [ -f "${STEAM_LOGIN}" ] if [ -f "${STEAM_LOGIN}" ]
then then
if fn_prompt_yn "The steam login is already set. Reset it?" if prompt_yn "The steam login is already set. Reset it?"
then then
rm -f "${STEAM_LOGIN}" rm -f "${STEAM_LOGIN}"
else else
@ -238,40 +241,38 @@ fn_steam_login(){
fi fi
} }
fn_steamlogin_dayz(){ dologin(){
loadconfig
if [ -f "${STEAM_LOGIN}" ] if [ -f "${STEAM_LOGIN}" ]
then then
source "${STEAM_LOGIN}" source "${STEAM_LOGIN}"
else else
echo "No cached Steam credentials. Please configure this now: " echo "No cached Steam credentials. Please configure this now: "
fn_steam_login login
fi fi
} }
fn_runvalidate_dayz(){ install(){
# fn_loadconfig_dayz loadconfig
${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" validate +quit if [ ! -f "${SERVER_INSTALL_FILE}" ] || [[ ${1} = "force" ]]
} then
fn_install_dayz(){
if [ ! -f "${SERVER_INSTALL_FILE}" ]; then
mkdir -p "${SERVER_FILES}" mkdir -p "${SERVER_FILES}"
mkdir -p "${SERVER_PROFILE}" mkdir -p "${SERVER_PROFILE}"
printf "[ ${yellow}DayZ${default} ] Downloading DayZ Server-Files!\n" printf "[ ${yellow}DayZ${default} ] Downloading DayZ Server-Files!\n"
fn_steamlogin_dayz dologin
fn_runvalidate_dayz ${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" validate +quit
else else
printf "[ ${lightblue}DayZ${default} ] The Server is already installed.\n" printf "[ ${lightblue}DayZ${default} ] The Server is already installed.\n"
fi fi
} }
fn_config(){ config(){
if ! diff -q "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}" if ! diff -q "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}"
then then
echo "=========================================================================" echo "========================================================================="
diff -Nau --color "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}" || echo "" diff -Nau --color "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}" || echo ""
echo "=========================================================================" echo "========================================================================="
if fn_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
echo "Updating the server configuration file" echo "Updating the server configuration file"
cp "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}" cp "${SERVER_CFG_SRC}" "${SERVER_CFG_DST}"
@ -281,8 +282,8 @@ fn_config(){
fi fi
} }
fn_update_dayz(){ update(){
fn_steamlogin_dayz dologin
appmanifestfile=${SERVER_FILES}/steamapps/appmanifest_"${appid}".acf appmanifestfile=${SERVER_FILES}/steamapps/appmanifest_"${appid}".acf
printf "[ ... ] Checking for update:" printf "[ ... ] Checking for update:"
# gets currentbuild # gets currentbuild
@ -310,9 +311,9 @@ fn_update_dayz(){
printf "\thttps://steamdb.info/app/${appid}/\n" printf "\thttps://steamdb.info/app/${appid}/\n"
printf "\nApplying update" printf "\nApplying update"
# run update # run update
fn_steamlogin_dayz dologin
${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" +quit ${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" +quit
fn_update_mods modupdate
else else
printf "\r[ ${green}OK${default} ] Checking for update:: No update available\n" printf "\r[ ${green}OK${default} ] Checking for update:: No update available\n"
printf "\nNo update available:\n" printf "\nNo update available:\n"
@ -322,7 +323,7 @@ fn_update_dayz(){
fi fi
} }
fn_get_mods(){ get_mods(){
mapfile -t workshopID < "${WORKSHOP_CFG}" mapfile -t workshopID < "${WORKSHOP_CFG}"
for i in "${workshopID[@]}" for i in "${workshopID[@]}"
do do
@ -333,13 +334,15 @@ fn_get_mods(){
done done
} }
fn_update_mods(){ modupdate(){
fn_get_mods get_mods
echo "Updating mods..."
dologin
${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" ${workshoplist} +quit ${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" ${workshoplist} +quit
echo echo
} }
fn_add_mod(){ add(){
if [ -d "${workshopfolder}/${1}" ] if [ -d "${workshopfolder}/${1}" ]
then then
echo -e "${yellow}Warning: The mod directory ${workshopfolder}/${1} already exists!${default}" echo -e "${yellow}Warning: The mod directory ${workshopfolder}/${1} already exists!${default}"
@ -356,7 +359,7 @@ fn_add_mod(){
fi fi
echo "Adding mod id ${1}" echo "Adding mod id ${1}"
echo "${1}:MODNAME:1" >> ${WORKSHOP_CFG} echo "${1}:MODNAME:1" >> ${WORKSHOP_CFG}
fn_update_mods modupdate
# Make sure the install succeeded # Make sure the install succeeded
if [ ! -d "${workshopfolder}/${1}" ] if [ ! -d "${workshopfolder}/${1}" ]
then then
@ -367,29 +370,26 @@ fn_add_mod(){
mv /tmp/workshop.cfg.tmp "${WORKSHOP_CFG}" mv /tmp/workshop.cfg.tmp "${WORKSHOP_CFG}"
return return
fi fi
# Get the name of the newly added addon # Get the name of the newly added mod
MODNAME=$(cut -d '"' -f 2 <<< $(grep name ${workshopfolder}/${1}/meta.cpp)) MODNAME=$(cut -d '"' -f 2 <<< $(grep name ${workshopfolder}/${1}/meta.cpp))
# Symlink it # Symlink it
if [ ! -L "${SERVER_FILES}/@${MODNAME}" ] if [ ! -L "${SERVER_FILES}/@${MODNAME}" ]
then then
ln -s ${workshopfolder}/${1} "${SERVER_FILES}/@${MODNAME}" ln -s ${workshopfolder}/${1} "${SERVER_FILES}/@${MODNAME}"
echo "Created symlink for mod id ${1}" echo "Created symlink ${workshopfolder}/${1} ${SERVER_FILES}/@${MODNAME}"
fi fi
# Lower case all the files in mod directories. # Lower case all the files in mod directories.
find "${workshopfolder}/${1}" -depth -exec rename -f 's/(.*)\/([^\/]*)/$1\/\L$2/' {} \; find "${workshopfolder}/${1}" -depth -exec rename -f 's/(.*)\/([^\/]*)/$1\/\L$2/' {} \;
# Copy the key files # Copy the key files
if ls ${SERVER_FILES}/@* 1> /dev/null 2>&1
then
echo "Copying key files..." echo "Copying key files..."
cp -vu "${workshopfolder}/*/keys/*" "${SERVER_FILES}/keys/" 2> /dev/null cp -v ${workshopfolder}/${1}/keys/* "${SERVER_FILES}/keys/"
fi
# Set the mod name in the workshop config file, as we don't know this at the start. # Set the mod name in the workshop config file, as we don't know this at the start.
sed -i "${WORKSHOP_CFG}" -e "s/${1}:MODNAME/${1}:${MODNAME}/" sed -i "${WORKSHOP_CFG}" -e "s/${1}:MODNAME/${1}:${MODNAME}/"
echo -e "Mod id ${1} - ${green}${MODNAME}${default} - added" echo -e "Mod id ${1} - ${green}${MODNAME}${default} - added"
} }
fn_remove_mod(){ remove(){
if [ -d "${workshopfolder}/${1}" ] if [ -d "${workshopfolder}/${1}" ]
then then
MODNAME=$(cut -d '"' -f 2 <<< $(grep name ${workshopfolder}/${1}/meta.cpp)) MODNAME=$(cut -d '"' -f 2 <<< $(grep name ${workshopfolder}/${1}/meta.cpp))
@ -409,8 +409,8 @@ fn_remove_mod(){
echo "Mod id ${1} - ${MODNAME} - removed" echo "Mod id ${1} - ${MODNAME} - removed"
} }
fn_activate_mod(){ activate(){
fn_get_mods get_mods
for i in "${workshopID[@]}" for i in "${workshopID[@]}"
do do
ID=$(echo ${i} | cut -d: -f1) ID=$(echo ${i} | cut -d: -f1)
@ -429,8 +429,8 @@ fn_activate_mod(){
done done
} }
fn_deactivate_mod(){ deactivate(){
fn_get_mods get_mods
for i in "${workshopID[@]}" for i in "${workshopID[@]}"
do do
ID=$(echo ${i} | cut -d: -f1) ID=$(echo ${i} | cut -d: -f1)
@ -449,8 +449,8 @@ fn_deactivate_mod(){
done done
} }
fn_list_mods(){ list(){
fn_get_mods get_mods
spaces=" " spaces=" "
echo -e "ID\t\tName\t\t\tActive\tURL" echo -e "ID\t\tName\t\t\tActive\tURL"
for i in "${workshopID[@]}" for i in "${workshopID[@]}"
@ -462,8 +462,8 @@ fn_list_mods(){
done done
} }
fn_mod_cmd(){ mod_cmd(){
fn_get_mods get_mods
for i in "${workshopID[@]}" for i in "${workshopID[@]}"
do do
ID=$(echo ${i} | cut -d: -f1) ID=$(echo ${i} | cut -d: -f1)
@ -478,55 +478,15 @@ fn_mod_cmd(){
mod_command_line="${mod_command_line::-1}" mod_command_line="${mod_command_line::-1}"
} }
fn_workshop_mods(){ rcon(){
# Check usage
if [[ ${1} = "" ]]
then
fn_usage
fi
if [[ ${1} != "list" ]] && [[ ${2} = "" ]]
then
fn_usage
fi
# Most mods require a valid Steam login. Not all will work with the anonymous user.
fn_steamlogin_dayz
# Options
case "${1}" in
activate)
fn_activate_mod ${2}
;;
add)
fn_add_mod ${2}
;;
deactivate)
fn_deactivate_mod ${2}
;;
list)
fn_list_mods
;;
remove)
fn_remove_mod ${2}
;;
update)
echo "Updating mods..."
fn_update_mods
;;
**)
fn_usage
;;
esac
}
fn_rcon(){
exec /usr/local/py3rcon/py3rcon.py --gui ~/py3rcon.config.json exec /usr/local/py3rcon/py3rcon.py --gui ~/py3rcon.config.json
} }
fn_status(){ status(){
INSTALLED="${NO}" INSTALLED="${NO}"
LOGGED_IN="${NO}" LOGGED_IN="${NO}"
RUNNING="${NO}" RUNNING="${NO}"
fn_get_mods get_mods
MODS_INSTALLED="${green}${#workshopID[@]}${default}" MODS_INSTALLED="${green}${#workshopID[@]}${default}"
# DayZ Server files installation # DayZ Server files installation
if [ -f "${SERVER_INSTALL_FILE}" ] if [ -f "${SERVER_INSTALL_FILE}" ]
@ -549,7 +509,7 @@ fn_status(){
then then
RUNNING="${YES}" RUNNING="${YES}"
fi fi
fn_mod_cmd mod_cmd
# Uptime # Uptime
UPTIME=$(date -d@$(($(date +%s) - $(date +%s -r ${SERVER_PROFILE}/server_console.log))) -u +%H:%M:%S) UPTIME=$(date -d@$(($(date +%s) - $(date +%s -r ${SERVER_PROFILE}/server_console.log))) -u +%H:%M:%S)
# Number of mods plus the list denoting on or off # Number of mods plus the list denoting on or off
@ -561,51 +521,65 @@ Status:
Server files installed: ${INSTALLED} Server files installed: ${INSTALLED}
Mods installed: ${MODS_INSTALLED} Mods installed: ${MODS_INSTALLED}
Server running: ${RUNNING} Server running: ${RUNNING}
Default parameters:${dayzparameter} Default parameters:${parameters}
Mod parameter: ${mod_command_line} Mod parameter: ${mod_command_line}
" "
} }
case "${1}" in C=${1}
shift
case "${C}" in
activate)
activate "${@}"
;;
add)
add "${@}"
;;
cmd) cmd)
fn_mod_cmd mod_cmd "${@}"
;; ;;
config) config)
fn_config config "${@}"
;;
deactivate)
deactivate "${@}"
;; ;;
install) install)
fn_loadconfig_dayz install "${@}"
fn_install_dayz ;;
list)
list "${@}"
;; ;;
login) login)
fn_loadconfig_dayz login "${@}"
fn_steam_login ;;
modupdate)
modupdate "${@}"
;; ;;
rcon) rcon)
fn_rcon "${2}" rcon "${@}"
;;
remove)
remove "${@}"
;; ;;
restart) restart)
fn_restart restart "${@}"
;; ;;
start) start)
fn_loadconfig_dayz start "${@}"
fn_start_dayz
;; ;;
status) status)
fn_status status "${@}"
;; ;;
stop) stop)
fn_stop_dayz stop "${@}"
;; ;;
update) update)
fn_loadconfig_dayz update "${@}"
fn_update_dayz
;;
workshop)
fn_loadconfig_dayz
fn_workshop_mods ${2} ${3} ${4}
;; ;;
**) **)
fn_usage "$*" usage "$*"
;; ;;
esac esac