From c1ac374ba5126fd6badcda23c42de6d1383f3cf4 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Fri, 31 Dec 2021 23:49:34 -0600 Subject: [PATCH] Made xmllint a requirement --- Scripts/7D2D-Manage.bash | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Scripts/7D2D-Manage.bash b/Scripts/7D2D-Manage.bash index 185752f..b1fc5c6 100644 --- a/Scripts/7D2D-Manage.bash +++ b/Scripts/7D2D-Manage.bash @@ -268,17 +268,13 @@ start_server() { mv "temp-serverconfig.xml" "${server_config}" # xmllint, helps avoiding the random server launch failures for apparently no reason - if which xmllint >/dev/null 2>&1; then - for xml_file in "${server_directory}"/*.xml; do - log "info" "Linting $(important "${xml_file}")..." - if ! xmllint "${xml_file}" > /dev/null; then - log "error" "Xml parsing error in $(important "${xml_file}"), resolve the error and attempt to start again" - return 1 - fi - done - else - log "warning" "$(important "xmllint") not installed or not in PATH, skipping lint check" - fi + for xml_file in "${server_directory}"/*.xml; do + log "info" "Linting $(important "${xml_file}")..." + if ! xmllint "${xml_file}" > /dev/null; then + log "error" "Xml parsing error in $(important "${xml_file}"), resolve the error and attempt to start again" + return 1 + fi + done log "info" "Starting $(important "${server_name}") located at $(important "${server_directory}") on game port $(important "${server_port}") and telnet port $(important "${telnet_port}")"