diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh index 339cfeec8..c1c105a01 100644 --- a/lgsm/functions/command_test_alert.sh +++ b/lgsm/functions/command_test_alert.sh @@ -13,3 +13,4 @@ check.sh info_config.sh alert="test" alert.sh +core_exit.sh diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index 6b344b72f..2ec6d52d8 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -60,4 +60,5 @@ if [ "${status}" != "0" ]; then command_start.sh else fn_serveradmin_password_set -fi \ No newline at end of file +fi +core_exit.sh \ No newline at end of file diff --git a/lgsm/functions/command_update_functions.sh b/lgsm/functions/command_update_functions.sh index 214849472..5069c43f9 100644 --- a/lgsm/functions/command_update_functions.sh +++ b/lgsm/functions/command_update_functions.sh @@ -9,7 +9,7 @@ lgsm_version="210516" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh fn_print_dots "Updating functions" -fn_script_log "Updating functions" +fn_script_log_info "Updating functions" sleep 1 echo -ne "\n" @@ -30,10 +30,12 @@ fi if [ "${exitcode}" == "0" ]; then fn_print_ok "Updating functions" - fn_script_log "Success! Updating functions" + fn_script_log_pass "Success! Updating functions" + exitcode=0 else fn_print_fail "Updating functions" - - fn_script_log "Failure! Updating functions" + fn_script_log_fatal "Failure! Updating functions" + exitcode=1 fi -echo -ne "\n" \ No newline at end of file +echo -ne "\n" +core_exit.sh \ No newline at end of file diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 7d917f002..9826b6b7f 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -17,7 +17,7 @@ fn_validation(){ fn_print_dots "Checking server files" sleep 1 fn_print_ok "Checking server files" - fn_script_log "Checking server files" + fn_script_log_info "Checking server files" sleep 1 cd "${rootdir}/steamcmd" @@ -35,7 +35,7 @@ fn_validation(){ fi fix.sh - fn_script_log "Checking complete" + fn_script_log_info "Checking complete" } check_status.sh diff --git a/lgsm/functions/compress_ut99_maps.sh b/lgsm/functions/compress_ut99_maps.sh index bb5f78630..ac52a9e4e 100644 --- a/lgsm/functions/compress_ut99_maps.sh +++ b/lgsm/functions/compress_ut99_maps.sh @@ -33,3 +33,4 @@ for map in "${filesdir}/Maps/"*; do ./ucc-bin compress "${map}" --nohomedir done mv -fv "${filesdir}/Maps/"*.unr.uz "${compressedmapsdir}" +core_exit.sh \ No newline at end of file diff --git a/lgsm/functions/core_exit.sh b/lgsm/functions/core_exit.sh index cc3041fa2..c5b0028dc 100644 --- a/lgsm/functions/core_exit.sh +++ b/lgsm/functions/core_exit.sh @@ -23,5 +23,4 @@ fi if [ -f ".dev-debug" ]; then echo "Exiting with code: ${exitcode}" -fi - +fi \ No newline at end of file diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index 3b8b02a62..1adeb7f81 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -159,9 +159,6 @@ fn_fetch_function fn_restart(){ local modulename="Restarting" info_config.sh -if [ -d "${scriptlogdir}" ]; then - fn_script_log "${servername}" -fi command_stop.sh command_start.sh } diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index 15f44944f..c68e9e663 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -439,3 +439,4 @@ elif [ "${engine}" == "unreal" ]; then else fn_getopt_generic fi +core_exit.sh \ No newline at end of file diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index ea1271eed..f012b706f 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -12,17 +12,18 @@ fn_fix_msg_start(){ fn_print_dots "Applying ${fixname} fix: ${gamename}" sleep 1 fn_print_info "Applying ${fixname} fix: ${gamename}" - fn_script_log "Applying ${fixname} fix: ${gamename}" + fn_script_log_info "Applying ${fixname} fix: ${gamename}" sleep 1 } fn_fix_msg_end(){ if [ $? -ne 0 ]; then fn_print_fail_nl "Applying ${fixname} fix: ${gamename}" - fn_script_log "Failure! Applying ${fixname} fix: ${gamename}" + fn_script_log_error "Failure! Applying ${fixname} fix: ${gamename}" + exitcode=2 else fn_print_ok_nl "Applying ${fixname} fix: ${gamename}" - fn_script_log "Complete! Applying ${fixname} fix: ${gamename}" + fn_script_log_pass "Complete! Applying ${fixname} fix: ${gamename}" fi } diff --git a/lgsm/functions/fix_ins.sh b/lgsm/functions/fix_ins.sh index 3e86c070f..81a206d84 100644 --- a/lgsm/functions/fix_ins.sh +++ b/lgsm/functions/fix_ins.sh @@ -13,7 +13,7 @@ export LD_LIBRARY_PATH=${filesdir}:${filesdir}/bin:${LD_LIBRARY_PATH} # fix for issue #529 - gamemode not passed to debug or start if [ "${function_selfname}" == "command_debug.sh" ]; then - defaultmap="\"${defaultmap}\"" + defaultmap="\"${defaultmap}\"" else - defaultmap="\\\"${defaultmap}\\\"" + defaultmap="\\\"${defaultmap}\\\"" fi diff --git a/lgsm/functions/install_complete.sh b/lgsm/functions/install_complete.sh index cd3b237e5..6f9c9c8fa 100644 --- a/lgsm/functions/install_complete.sh +++ b/lgsm/functions/install_complete.sh @@ -14,8 +14,9 @@ if [ "${gamename}" == "Don't Starve Together" ]; then fi echo "=================================" echo "Install Complete!" -fn_script_log "Install Complete!" +fn_script_log_info "Install Complete!" echo "" echo "To start server type:" echo "./${selfname} start" echo "" +core_exit.sh \ No newline at end of file