diff --git a/lgsm/functions/command_console.sh b/lgsm/functions/command_console.sh index cb8c95d33..a97d7f4fc 100644 --- a/lgsm/functions/command_console.sh +++ b/lgsm/functions/command_console.sh @@ -12,26 +12,29 @@ fn_firstcommand_set check.sh fn_print_header -# Verbose output -if [ "${consoleoutput}" == "on" ]; then - fn_print_information_nl "${gamename} produces a verbose output to the console." -elif [ "${consoleverbose}" == "off" ]; then - fn_print_information_nl "${gamename} does NOT produce a verbose output to the console." +if [ "${consoleverbose}" == "yes" ]; then + echo "* Verbose output: ${lightgreen}yes${default}" +elif [ "${consoleverbose}" == "no" ]; then + echo "* Verbose output: ${red}no${default}" +else + echo "* Verbose output: ${red}unknown${default}" fi -# Interactive console -if [ "${consoleinteract}" == "on" ]; then - fn_print_information_nl "${gamename} DOES allow server commands to be entered in to the console." -elif [ "${consoleinteract}" == "off" ]; then - fn_print_information_nl "${gamename} does NOT allow server commands to be entered in to the console." +if [ "${consoleinteract}" == "yes" ]; then + echo "* Interactive output: ${lightgreen}yes${default}" +elif [ "${consoleinteract}" == "no" ]; then + echo "* Interactive output: ${red}no${default}" +else + echo "* Interactive output: ${red}unknown${default}" fi - +echo "" fn_print_information_nl "Press \"CTRL+b\" then \"d\" to exit console." fn_print_warning_nl "Do NOT press CTRL+c to exit." echo -e "* https://docs.linuxgsm.com/commands/console" echo -e "" if ! fn_prompt_yn "Continue?" Y; then - return + exitcode=0 + core_exit.sh fi fn_print_dots "Accessing console" check_status.sh diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh index d8a8a1cba..cbd42d287 100644 --- a/lgsm/functions/command_debug.sh +++ b/lgsm/functions/command_debug.sh @@ -82,7 +82,8 @@ echo -e "Press CTRL+c to drop out of debug mode." fn_print_warning_nl "If ${selfname} is already running it will be stopped." echo -e "" if ! fn_prompt_yn "Continue?" Y; then - return + exitcode=0 + core_exit.sh fi fn_print_info_nl "Stopping any running servers" diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh index c97d98805..ff75b71d2 100644 --- a/lgsm/functions/command_ts3_server_pass.sh +++ b/lgsm/functions/command_ts3_server_pass.sh @@ -16,7 +16,8 @@ fn_serveradmin_password_prompt(){ fn_print_warning_nl "${gamename} will restart during this process." echo -e "" if ! fn_prompt_yn "Continue?" Y; then - echo Exiting; exit + exitcode=0 + core_exit.sh fi fn_script_log_info "Initiating ${gamename} ServerAdmin password change" read -rp "Enter new password: " newpassword diff --git a/lgsm/functions/compress_unreal2_maps.sh b/lgsm/functions/compress_unreal2_maps.sh index 82d94d4d8..7169c9612 100644 --- a/lgsm/functions/compress_unreal2_maps.sh +++ b/lgsm/functions/compress_unreal2_maps.sh @@ -20,7 +20,8 @@ echo -e "" echo -e "${compressedmapsdir}" echo -e "" if ! fn_prompt_yn "Start compression?" Y; then - return + exitcode=0 + core_exit.sh fi mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1 rm -rfv "${serverfiles:?}/Maps/"*.ut2.uz2 diff --git a/lgsm/functions/compress_ut99_maps.sh b/lgsm/functions/compress_ut99_maps.sh index 39153ba3e..3239837a0 100644 --- a/lgsm/functions/compress_ut99_maps.sh +++ b/lgsm/functions/compress_ut99_maps.sh @@ -20,7 +20,8 @@ echo -e "" echo -e "${compressedmapsdir}" echo -e "" if ! fn_prompt_yn "Start compression?" Y; then - return + exitcode=0 + core_exit.sh fi mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1 rm -rfv "${serverfiles:?}/Maps/"*.unr.uz diff --git a/lgsm/functions/install_eula.sh b/lgsm/functions/install_eula.sh index cd51954d0..1f50007f2 100644 --- a/lgsm/functions/install_eula.sh +++ b/lgsm/functions/install_eula.sh @@ -25,6 +25,7 @@ if [ -z "${autoinstall}" ]; then echo -e "By continuing you are indicating your agreement to the EULA." echo -e "" if ! fn_prompt_yn "Continue?" Y; then + exitcode=0 core_exit.sh fi elif [ "${commandname}" == "START" ]; then diff --git a/lgsm/functions/install_retry.sh b/lgsm/functions/install_retry.sh index 2d6e3df7b..070a4a816 100644 --- a/lgsm/functions/install_retry.sh +++ b/lgsm/functions/install_retry.sh @@ -9,5 +9,6 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if fn_prompt_yn "Retry install?" Y; then command_install.sh; core_exit.sh else + exitcode=0 core_exit.sh fi diff --git a/lgsm/functions/install_server_dir.sh b/lgsm/functions/install_server_dir.sh index cfd586dc4..77c5ab138 100644 --- a/lgsm/functions/install_server_dir.sh +++ b/lgsm/functions/install_server_dir.sh @@ -17,7 +17,8 @@ pwd echo -e "" if [ -z "${autoinstall}" ]; then if ! fn_prompt_yn "Continue?" Y; then - exit + exitcode=0 + core_exit.sh fi fi if [ ! -d "${serverfiles}" ]; then