diff --git a/docker-compose.yml b/docker-compose.yml index 8f41b9a..256aa9b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,4 +12,7 @@ services: - "27016:27016/udp" volumes: - homedir:/home/user - - ./files:/files \ No newline at end of file + - ./files:/files +# environment: +# # So we don't have to always download the full server when testing +# - FAKE_DAYZ_INSTALL=1 \ No newline at end of file diff --git a/files/dayzserver b/files/dayzserver index b36d954..fdc1b2d 100755 --- a/files/dayzserver +++ b/files/dayzserver @@ -123,6 +123,10 @@ fn_start_dayz(){ ) } +fn_stop_dayz(){ + echo "Stopping DayZ server..." +} + fn_steam_login(){ if [ -f "${STEAM_LOGIN_DST}" ] then @@ -159,6 +163,18 @@ fn_steamlogin_dayz(){ fi } +fn_runvalidate_dayz(){ + fn_loadconfig_dayz + if [[ "${FAKE_DAYZ_INSTALL}" = "" ]] + then + ${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" validate +quit + else + echo + echo -e "${red}Faking DayZ install procedure!!${default}" + echo + fi +} + fn_install_dayz(){ if [ ! -f "${SERVER_INSTALL_FILE}" ]; then mkdir -p "${SERVER_FILES}" @@ -218,11 +234,6 @@ fn_update_dayz(){ fi } -fn_runvalidate_dayz(){ - fn_loadconfig_dayz - ${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" validate +quit -} - fn_workshop_mods(){ fn_steamlogin_dayz fn_loadconfig_dayz @@ -288,10 +299,6 @@ fn_rcon(){ esac } -fn_restart_dayz(){ - echo "Restarting DayZ server..." -} - fn_backup(){ echo "Creating backup...WIP" } @@ -309,26 +316,20 @@ case "${1}" in rcon) fn_rcon "${2}" ;; - restart) - fn_restart_dayz - ;; - start) - fn_start_dayz - ;; stop) - echo "Stopping DayZ server..." + fn_stop_dayz ;; update) - echo "Updating DayZ..." fn_update_dayz ;; workshop) - echo "Manage workshopp..." - fn_workshop_mods + fn_workshop_mods "${2}" ;; **) - echo "Unknown option '${1}'" - echo "Usage: $0 [ backup | login | rcon [ show | reset ] | restart | start | stop | update | workshop ]" + echo + echo -e "${red}Unknown or missing option: '${1}'${default}" + echo -e "${green}Usage: $(basename $0) [ backup | login | rcon [ show | reset ] | stop | update | workshop [ add id | list | remove id ] ]${default}" + echo exit 0 ;; esac