diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh index 4ba7daaebd..f062cdb81a 100644 --- a/lgsm/modules/check_deps.sh +++ b/lgsm/modules/check_deps.sh @@ -337,14 +337,14 @@ if [ "${commandname}" == "INSTALL" ]; then if [ "$(whoami)" == "root" ]; then echo -e "" echo -e "${bold}${lightyellow}Checking ${gamename} Dependencies as root${default}" - echo -e "${bold}=================================${default}" + fn_messages_separator fn_print_information_nl "Checking any missing dependencies for ${gamename} server only." fn_print_information_nl "This will NOT install a ${gamename} server." fn_sleep_time else echo -e "" echo -e "${bold}${lightyellow}Checking ${gamename} Dependencies${default}" - echo -e "${bold}=================================${default}" + fn_messages_separator fi fi diff --git a/lgsm/modules/command_debug.sh b/lgsm/modules/command_debug.sh index 41722e5074..495417c161 100644 --- a/lgsm/modules/command_debug.sh +++ b/lgsm/modules/command_debug.sh @@ -82,7 +82,7 @@ echo -e "" echo -e "Use debug for identifying server issues only!" 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 exitcode=0 core_exit.sh diff --git a/lgsm/modules/command_dev_clear_modules.sh b/lgsm/modules/command_dev_clear_modules.sh index 52d07ee1ad..bf19b25780 100644 --- a/lgsm/modules/command_dev_clear_modules.sh +++ b/lgsm/modules/command_dev_clear_modules.sh @@ -10,9 +10,9 @@ commandaction="Clearing modules" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set -echo -e "=================================" -echo -e "Clear Modules" -echo -e "=================================" +echo -e "" +echo -e "${bold}${lightyellow}Clear Modules${default}" +fn_messages_separator echo -e "" if fn_prompt_yn "Do you want to delete all modules?" Y; then rm -rfv "${modulesdir:?}/"* diff --git a/lgsm/modules/command_dev_details.sh b/lgsm/modules/command_dev_details.sh index b954181210..2659465d33 100644 --- a/lgsm/modules/command_dev_details.sh +++ b/lgsm/modules/command_dev_details.sh @@ -17,8 +17,8 @@ info_game.sh carriagereturn=$(file -b "${servercfgfullpath}" | grep -q CRLF && echo "${red}CRLF${default}" || echo "${lightgreen}LF${default}") echo -e "" -echo -e "${lightgreen}Server Details${default}" -echo -e "==================================================================" +echo -e "${bold}${lightgreen}Server Details${default}" +fn_messages_separator echo -e "" echo -e "Game: ${gamename}" @@ -76,8 +76,8 @@ missing_details="" # Loop through the server details and output them. echo -e "" -echo -e "${lightgreen}Available Server Details${default}" -echo -e "=================================" +echo -e "${bold}${lightgreen}Available Server Details${default}" +fn_messages_separator for key in "${!server_details[@]}"; do value=${server_details[$key]} if [ -z "$value" ]; then @@ -91,7 +91,7 @@ done if [ -n "$missing_details" ]; then echo -e "" echo -e "${lightgreen}Missing Server Details${default}" - echo -e "=================================" + fn_messages_separator echo -e "${missing_details}" fi diff --git a/lgsm/modules/command_dev_detect_deps.sh b/lgsm/modules/command_dev_detect_deps.sh index 763ab5554c..6215fb8974 100644 --- a/lgsm/modules/command_dev_detect_deps.sh +++ b/lgsm/modules/command_dev_detect_deps.sh @@ -10,9 +10,9 @@ commandaction="Developer detect deps" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set -echo -e "=================================" -echo -e "Dependencies Checker" -echo -e "=================================" +echo -e "" +echo -e "${bold}Dependencies Checker${default}" +fn_messages_separator echo -e "Checking directory: " echo -e "${serverfiles}" if [ "$(command -v eu-readelf 2> /dev/null)" ]; then @@ -182,33 +182,33 @@ awk -vORS='' '{ print $1,$2 }' "${tmpdir}/.depdetect_ubuntu_list_uniq" > "${tmpd awk -vORS='' '{ print $1,$2 }' "${tmpdir}/.depdetect_debian_list_uniq" > "${tmpdir}/.depdetect_debian_line" echo -e "" echo -e "" -echo -e "Required Dependencies" -echo -e "=================================" +echo -e "${bold}Required Dependencies${default}" +fn_messages_separator echo -e "${executable}" echo -e "" echo -e "CentOS" -echo -e "=================================" +fn_messages_separator cat "${tmpdir}/.depdetect_centos_line" echo -e "" echo -e "" echo -e "Ubuntu" -echo -e "=================================" +fn_messages_separator cat "${tmpdir}/.depdetect_ubuntu_line" echo -e "" echo -e "" echo -e "Debian" -echo -e "=================================" +fn_messages_separator cat "${tmpdir}/.depdetect_debian_line" echo -e "" if [ "${unknownlib}" == "1" ]; then echo -e "" echo -e "Unknown shared Library" - echo -e "=================================" + fn_messages_separator cat "${tmpdir}/.depdetect_unknown" fi echo -e "" echo -e "Required Librarys" -echo -e "=================================" +fn_messages_separator sort "${tmpdir}/.depdetect_readelf" | uniq echo -en "\n" rm -f "${tmpdir:?}/.depdetect_centos_line" diff --git a/lgsm/modules/command_dev_detect_glibc.sh b/lgsm/modules/command_dev_detect_glibc.sh index ca64ed7cc6..f407bf6faa 100644 --- a/lgsm/modules/command_dev_detect_glibc.sh +++ b/lgsm/modules/command_dev_detect_glibc.sh @@ -11,9 +11,9 @@ commandaction="Developer detect glibc" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set -echo -e "=================================" +fn_messages_separator echo -e "glibc Requirements Checker" -echo -e "=================================" +fn_messages_separator if [ ! "$(command -v objdump 2> /dev/null)" ]; then fn_print_failure_nl "objdump is missing" @@ -59,7 +59,7 @@ for glibc_check_var in "${glibc_check_dir_array[@]}"; do echo -e "" echo -e "" echo -e "${glibc_check_name} glibc Requirements" - echo -e "=================================" + fn_messages_separator if [ -f "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" ]; then echo -e "Required glibc" cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | head -1 | tee -a "${tmpdir}/detect_glibc_highest.tmp" @@ -81,7 +81,7 @@ for glibc_check_var in "${glibc_check_dir_array[@]}"; do done echo -e "" echo -e "Final glibc Requirement" -echo -e "=================================" +fn_messages_separator if [ -f "${tmpdir}/detect_glibc_highest.tmp" ]; then cat "${tmpdir}/detect_glibc_highest.tmp" | sort | uniq | sort -r --version-sort | head -1 rm -f "${tmpdir:?}/detect_glibc_highest.tmp" diff --git a/lgsm/modules/command_dev_detect_ldd.sh b/lgsm/modules/command_dev_detect_ldd.sh index 877c8d95bc..af41bb522e 100644 --- a/lgsm/modules/command_dev_detect_ldd.sh +++ b/lgsm/modules/command_dev_detect_ldd.sh @@ -11,9 +11,9 @@ commandaction="Developer detect ldd" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set -echo -e "=================================" +fn_messages_separator echo -e "Shared Object dependencies Checker" -echo -e "=================================" +fn_messages_separator if [ -z "${serverfiles}" ]; then dir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") @@ -47,12 +47,12 @@ find "${serverfiles}" -type f -print0 \ echo -e "" echo -e "" echo -e "All" -echo -e "=================================" +fn_messages_separator cat "${tmpdir}/detect_ldd.tmp" echo -e "" echo -e "Not Found" -echo -e "=================================" +fn_messages_separator cat "${tmpdir}/detect_ldd_not_found.tmp" rm -f "${tmpdir:?}/detect_ldd.tmp" diff --git a/lgsm/modules/command_dev_query_raw.sh b/lgsm/modules/command_dev_query_raw.sh index 1abd6cdf36..cf9e148586 100644 --- a/lgsm/modules/command_dev_query_raw.sh +++ b/lgsm/modules/command_dev_query_raw.sh @@ -17,14 +17,14 @@ info_messages.sh echo -e "" echo -e "${lightgreen}Query IP Addresses${default}" -echo -e "==================================================================" +fn_messages_separator echo -e "" for queryip in "${queryips[@]}"; do echo -e "${queryip}" done echo -e "" echo -e "${lightgreen}Game Server Ports${default}" -echo -e "==================================================================" +fn_messages_separator { echo -e "${lightblue}Port Name \tPort Number \tStatus \tTCP \tUDP${default}" if [ -v port ]; then @@ -184,18 +184,18 @@ echo -e "==================================================================" | column -s $'\t' -t echo -e "" echo -e "${lightgreen}SS Output${default}" -echo -e "=================================" +fn_messages_separator fn_info_message_ports eval "${portcommand}" echo -e "" echo -e "${lightgreen}Query Port - Raw Output${default}" -echo -e "==================================================================" +fn_messages_separator echo -e "" echo -e "PORT: ${port}" echo -e "QUERY PORT: ${queryport}" echo -e "" echo -e "${lightgreen}Gamedig Raw Output${default}" -echo -e "=================================" +fn_messages_separator echo -e "" if [ ! "$(command -v gamedig 2> /dev/null)" ]; then fn_print_failure_nl "gamedig not installed" @@ -211,7 +211,7 @@ for queryip in "${queryips[@]}"; do done echo -e "" echo -e "${lightgreen}gsquery Raw Output${default}" -echo -e "=================================" +fn_messages_separator echo -e "" for queryip in "${queryips[@]}"; do echo -e "./query_gsquery.py -a \"${queryip}\" -p \"${queryport}\" -e \"${querytype}\"" @@ -223,7 +223,7 @@ for queryip in "${queryips[@]}"; do done echo -e "" echo -e "${lightgreen}TCP Raw Output${default}" -echo -e "=================================" +fn_messages_separator echo -e "" for queryip in "${queryips[@]}"; do echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''" @@ -239,10 +239,10 @@ for queryip in "${queryips[@]}"; do done echo -e "" echo -e "${lightgreen}Game Port - Raw Output${default}" -echo -e "==================================================================" +fn_messages_separator echo -e "" echo -e "${lightgreen}TCP Raw Output${default}" -echo -e "=================================" +fn_messages_separator echo -e "" for queryip in "${queryips[@]}"; do echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''" @@ -258,7 +258,7 @@ for queryip in "${queryips[@]}"; do done echo -e "" echo -e "${lightgreen}Steam Master Server Response${default}" -echo -e "==================================================================" +fn_messages_separator echo -e "" echo -e "curl -m 3 -s https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${publicip}" echo -e "" diff --git a/lgsm/modules/command_fastdl.sh b/lgsm/modules/command_fastdl.sh index 4aff9994d9..c6393fb762 100644 --- a/lgsm/modules/command_fastdl.sh +++ b/lgsm/modules/command_fastdl.sh @@ -37,7 +37,7 @@ echo -e "" # Prompts user for FastDL creation settings. echo -e "${commandaction} setup" -echo -e "=================================" +fn_messages_separator # Prompt for clearing old files if directory was already here. if [ -d "${fastdldir}" ]; then diff --git a/lgsm/modules/command_install_resources_mta.sh b/lgsm/modules/command_install_resources_mta.sh index c3d745a301..31a9165fd4 100644 --- a/lgsm/modules/command_install_resources_mta.sh +++ b/lgsm/modules/command_install_resources_mta.sh @@ -13,7 +13,7 @@ fn_firstcommand_set fn_install_resources() { echo -e "" echo -e "${lightyellow}Installing Default Resources${default}" - echo -e "=================================" + fn_messages_separator fn_fetch_file "http://mirror.mtasa.com/mtasa/resources/mtasa-resources-latest.zip" "" "" "" "${tmpdir}" "mtasa-resources-latest.zip" "nochmodx" "norun" "noforce" "nohash" fn_dl_extract "${tmpdir}" "mtasa-resources-latest.zip" "${resourcesdir}" echo -e "Default Resources Installed." diff --git a/lgsm/modules/command_mods_install.sh b/lgsm/modules/command_mods_install.sh index d602be2cd3..19de72ab04 100644 --- a/lgsm/modules/command_mods_install.sh +++ b/lgsm/modules/command_mods_install.sh @@ -19,7 +19,7 @@ fn_print_header fn_mods_installed_list if [ "${installedmodscount}" -gt "0" ]; then echo -e "Installed addons/mods" - echo -e "=================================" + fn_messages_separator # Go through all available commands, get details and display them to the user. for ((llindex = 0; llindex < ${#installedmodslist[@]}; llindex++)); do # Current mod is the "llindex" value of the array we're going through. @@ -32,7 +32,7 @@ if [ "${installedmodscount}" -gt "0" ]; then fi echo -e "Available addons/mods" -echo -e "=================================" +fn_messages_separator # Display available mods from mods_list.sh. # Set and reset vars compatiblemodslistindex=0 @@ -78,7 +78,7 @@ fn_mod_get_info echo -e "" echo -e "Installing ${modprettyname}" -echo -e "=================================" +fn_messages_separator fn_script_log_info "${modprettyname} selected for install" # Check if the mod is already installed and warn the user. diff --git a/lgsm/modules/command_mods_remove.sh b/lgsm/modules/command_mods_remove.sh index 8f9ea37399..d12f7075c9 100644 --- a/lgsm/modules/command_mods_remove.sh +++ b/lgsm/modules/command_mods_remove.sh @@ -16,7 +16,7 @@ fn_mods_check_installed fn_print_header echo -e "Remove addons/mods" -echo -e "=================================" +fn_messages_separator # Displays list of installed mods. # Generates list to display to user. diff --git a/lgsm/modules/command_sponsor.sh b/lgsm/modules/command_sponsor.sh index 336f20f0a6..ea49a30993 100755 --- a/lgsm/modules/command_sponsor.sh +++ b/lgsm/modules/command_sponsor.sh @@ -12,7 +12,7 @@ fn_firstcommand_set fn_print_ascii_logo echo -e "${lightyellow}Support LinuxGSM${default}" -echo -e "=================================" +fn_messages_separator echo -e "" echo -e "Been using LinuxGSM?" echo -e "Consider sponsoring to support development." diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh index b2f46855d3..a0a6986028 100644 --- a/lgsm/modules/command_start.sh +++ b/lgsm/modules/command_start.sh @@ -126,18 +126,18 @@ fn_start_tmux() { fn_script_log_fatal "Unable to start ${servername}: tmux error:" echo -e "" echo -e "Command" - echo -e "=================================" + fn_messages_separator echo -e "tmux -L \"${sessionname}\" new-session -d -s \"${sessionname}\" \"${preexecutable} ${executable} ${startparameters}\"" | tee -a "${lgsmlog}" echo -e "" echo -e "Error" - echo -e "=================================" + fn_messages_separator tee -a "${lgsmlog}" < "${lgsmlogdir}/.${selfname}-tmux-error.tmp" # Detected error https://linuxgsm.com/support if grep -c "Operation not permitted" "${lgsmlogdir}/.${selfname}-tmux-error.tmp"; then echo -e "" echo -e "Fix" - echo -e "=================================" + fn_messages_separator if ! grep "tty:" /etc/group | grep "$(whoami)"; then echo -e "$(whoami) is not part of the tty group." fn_script_log_info "$(whoami) is not part of the tty group." diff --git a/lgsm/modules/core_messages.sh b/lgsm/modules/core_messages.sh index d73366627b..548b2b07d8 100644 --- a/lgsm/modules/core_messages.sh +++ b/lgsm/modules/core_messages.sh @@ -272,8 +272,8 @@ fn_print_start_nl() { # ================================= fn_print_header() { echo -e "" - echo -e "${lightyellow}${gamename} ${commandaction}${default}" - echo -e "=================================${default}" + echo -e "${bold}${lightyellow}${gamename} ${commandaction}${default}" + fn_messages_separator } # Complete! diff --git a/lgsm/modules/fix.sh b/lgsm/modules/fix.sh index a7f5f73786..7c59d66b8c 100644 --- a/lgsm/modules/fix.sh +++ b/lgsm/modules/fix.sh @@ -80,7 +80,7 @@ if [ "${commandname}" == "INSTALL" ]; then if grep -qEe "(^|\s)${shortname}(\s|$)" <<< "${apply_post_install_fix[@]}"; then echo -e "" echo -e "${lightyellow}Applying Post-Install Fixes${default}" - echo -e "=================================" + fn_messages_separator fn_sleep_time postinstall=1 fn_apply_fix "post install" "${shortname}" diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index a05da414f4..2d706d7ba1 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -12,7 +12,7 @@ fn_messages_separator() { if [ "${commandname}" == "DETAILS" ]; then printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' = else - echo -e "=================================" + echo -e "${bold}=================================${default}" fi } @@ -57,7 +57,7 @@ fn_info_message_password_strip() { # used with alertlog fn_info_message_head() { echo -e "" - echo -e "${lightyellow}Alert Summary${default}" + echo -e "${bold}${lightyellow}Alert Summary${default}" fn_messages_separator echo -e "Message" echo -e "${alertbody}" @@ -89,7 +89,7 @@ fn_info_message_distro() { # glibc: 2.31 echo -e "" - echo -e "${lightyellow}Distro Details${default}" + echo -e "${bold}${lightyellow}Distro Details${default}" fn_messages_separator { echo -e "${lightblue}Date:\t${default}$(date)" @@ -132,10 +132,10 @@ fn_info_message_server_resource() { # Internet IP: 176.58.124.96 echo -e "" - echo -e "${lightyellow}Server Resource${default}" + echo -e "${bold}${lightyellow}Server Resource${default}" fn_messages_separator { - echo -e "${lightyellow}CPU\t${default}" + echo -e "${bold}${lightyellow}CPU\t${default}" echo -e "${lightblue}Model:\t${default}${cpumodel}" echo -e "${lightblue}Cores:\t${default}${cpucores}" echo -e "${lightblue}Frequency:\t${default}${cpufreqency}MHz" @@ -143,14 +143,14 @@ fn_info_message_server_resource() { } | column -s $'\t' -t echo -e "" { - echo -e "${lightyellow}Memory\t${default}" + echo -e "${bold}${lightyellow}Memory\t${default}" echo -e "${lightblue}Mem:\t${lightblue}total\tused\tfree\tcached\tavailable${default}" echo -e "${lightblue}Physical:\t${default}${physmemtotal}\t${physmemused}\t${physmemfree}\t${physmemcached}\t${physmemavailable}${default}" echo -e "${lightblue}Swap:\t${default}${swaptotal}\t${swapused}\t${swapfree}${default}" } | column -s $'\t' -t echo -e "" { - echo -e "${lightyellow}Storage${default}" + echo -e "${bold}${lightyellow}Storage${default}" echo -e "${lightblue}Filesystem:\t${default}${filesystem}" echo -e "${lightblue}Total:\t\t${default}${totalspace}" echo -e "${lightblue}Used:\t\t${default}${usedspace}" @@ -158,7 +158,7 @@ fn_info_message_server_resource() { } | column -s $'\t' -t echo -e "" { - echo -e "${lightyellow}Network${default}" + echo -e "${bold}${lightyellow}Network${default}" if [ -n "${netint}" ]; then echo -e "${lightblue}Interface:\t${default}${netint}" fi @@ -185,7 +185,7 @@ fn_info_message_gameserver_resource() { # Backups: 24K echo -e "" - echo -e "${lightyellow}Game Server Resource Usage${default}" + echo -e "${bold}${lightgreen}${gamename} Resource Usage${default}" fn_messages_separator { if [ "${status}" != "0" ] && [ -v status ]; then @@ -206,7 +206,7 @@ fn_info_message_gameserver_resource() { } | column -s $'\t' -t echo -e "" { - echo -e "${lightyellow}Storage${default}" + echo -e "${bold}${lightyellow}Storage${default}" echo -e "${lightblue}Total:\t${default}${rootdirdu}" echo -e "${lightblue}Serverfiles:\t${default}${serverfilesdu}" if [ -d "${backupdir}" ]; then @@ -234,7 +234,7 @@ fn_info_message_gameserver() { # Status: STARTED echo -e "" - echo -e "${lightgreen}${gamename} Server Details${default}" + echo -e "${bold}${lightgreen}${gamename} Server Details${default}" fn_info_message_password_strip fn_messages_separator { @@ -526,7 +526,7 @@ fn_info_message_script() { # Location: /home/lgsm/csgoserver # Config file: /home/lgsm/csgoserver/serverfiles/csgo/cfg/csgoserver.cfg - echo -e "${lightgreen}${selfname} Script Details${default}" + echo -e "${bold}${lightgreen}${selfname} Script Details${default}" fn_messages_separator { # Script name @@ -618,7 +618,7 @@ fn_info_message_backup() { # size: 945M echo -e "" - echo -e "${lightgreen}Backups${default}" + echo -e "${bold}${lightgreen}Backups${default}" fn_messages_separator if [ ! -d "${backupdir}" ] || [ "${backupcount}" == "0" ]; then echo -e "No Backups created" @@ -646,7 +646,7 @@ fn_info_message_commandlineparms() { # ./run_server_x86.sh +set net_strict 1 echo -e "" - echo -e "${lightgreen}Command-line Parameters${default}" + echo -e "${bold}${lightgreen}Command-line Parameters${default}" fn_info_message_password_strip fn_messages_separator if [ "${serverpassword}" == "NOT SET" ]; then @@ -663,7 +663,7 @@ fn_info_message_ports_edit() { # Change ports by editing the parameters in: # /home/lgsm/qlserver/serverfiles/baseq3/ql-server.cfg echo -e "" - echo -e "${lightgreen}Ports${default}" + echo -e "${bold}${lightgreen}Ports${default}" fn_messages_separator echo -e "${lightblue}Change ports by editing the parameters in:${default}" @@ -726,8 +726,8 @@ fn_info_message_statusbottom() { fn_info_logs() { echo -e "" - echo -e "${selfname} Logs" - echo -e "=================================" + echo -e "${bold}${selfname} Logs" + fn_messages_separator if [ -n "${lgsmlog}" ]; then echo -e "\nScript log\n===================" @@ -1111,7 +1111,7 @@ fn_info_message_kf() { fn_port "Steam" steamport udp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${servername} Web Interface${default}" + echo -e "${bold}${lightgreen}${servername} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" @@ -1130,7 +1130,7 @@ fn_info_message_kf2() { fn_port "Web Interface" httpport tcp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${servername} Web Interface${default}" + echo -e "${bold}${lightgreen}${servername} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" @@ -1235,7 +1235,7 @@ fn_info_message_pc() { fn_port "API" apiport tcp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${gamename} Web Interface${default}" + echo -e "${bold}${lightgreen}${gamename} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" @@ -1321,7 +1321,7 @@ fn_info_message_ro() { fn_port "Steam" steamport udp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${servername} Web Interface${default}" + echo -e "${bold}${lightgreen}${servername} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" @@ -1400,7 +1400,7 @@ fn_info_message_sdtd() { fn_port "Telnet" telnetport tcp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${gamename} Web Interface${default}" + echo -e "${bold}${lightgreen}${gamename} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" @@ -1408,7 +1408,7 @@ fn_info_message_sdtd() { echo -e "${lightblue}Web Interface password:\t${default}${httppassword}" } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${gamename} Telnet${default}" + echo -e "${bold}${lightgreen}${gamename} Telnet${default}" fn_messages_separator { echo -e "${lightblue}Telnet enabled:\t${default}${telnetenabled}" @@ -1475,7 +1475,7 @@ fn_info_message_spark() { fn_port "Web Interface" httpport tcp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${gamename} Web Interface${default}" + echo -e "${bold}${lightgreen}${gamename} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}/index.html" @@ -1558,7 +1558,7 @@ fn_info_message_ut2k4() { fn_port "LAN" lanport udp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${servername} Web Interface${default}" + echo -e "${bold}${lightgreen}${gamename} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" @@ -1577,7 +1577,7 @@ fn_info_message_unreal() { fn_port "Web Interface" httpport tcp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${servername} Web Interface${default}" + echo -e "${bold}${lightgreen}${gamename} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" @@ -1613,7 +1613,7 @@ fn_info_message_ut3() { fn_port "Web Interface" httpport tcp } | column -s $'\t' -t echo -e "" - echo -e "${lightgreen}${servername} Web Interface${default}" + echo -e "${bold}${lightgreen}${gamename} Web Interface${default}" fn_messages_separator { echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" diff --git a/lgsm/modules/install_complete.sh b/lgsm/modules/install_complete.sh index 039d2366fb..3415f8a493 100644 --- a/lgsm/modules/install_complete.sh +++ b/lgsm/modules/install_complete.sh @@ -8,19 +8,19 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" -echo -e "${bold}=================================${default}" +fn_messages_separator if [ "${exitcode}" == "1" ]; then - echo -e "${red}Install Failed!${default}" + echo -e "${bold}${red}Install Failed!${default}" fn_script_log_fatal "Install Failed!" elif [ "${exitcode}" == "2" ]; then - echo -e "${red}Install Completed with Errors!${default}}" + echo -e "${bold}${red}Install Completed with Errors!${default}}" fn_script_log_error "Install Completed with Errors!" elif [ "${exitcode}" == "3" ]; then - echo -e "${lightyellow}Install Completed with Warnings!${default}}" + echo -e "${bold}${lightyellow}Install Completed with Warnings!${default}}" fn_script_log_warn "Install Completed with Warnings!" elif [ -z "${exitcode}" ] || [ "${exitcode}" == "0" ]; then - echo -e "${green}Install Complete!${default}" + echo -e "${bold}${green}Install Complete!${default}" fn_script_log_pass "Install Complete!" fi diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh index 1624abea4e..c7a0736b68 100644 --- a/lgsm/modules/install_config.sh +++ b/lgsm/modules/install_config.sh @@ -32,7 +32,7 @@ fn_check_cfgdir() { fn_default_config_remote() { echo -e "" echo -e "${bold}${lightyellow}Downloading ${gamename} Configs${default}" - echo -e "${bold}=================================${default}" + fn_messages_separator echo -e "Downloading default configs from:" echo -e "" echo -e "${italic}https://github.com/GameServerManagers/Game-Server-Configs${default}" @@ -72,7 +72,7 @@ fn_default_config_remote() { fn_default_config_local() { echo -e "" echo -e "${bold}${lightyellow}Copying ${gamename} Configs${default}" - echo -e "${bold}=================================${default}" + fn_messages_separator echo -e "Copying default configs." fn_check_cfgdir echo -en "copying config file [ ${italic}${servercfgdefault}${default} ]" @@ -172,7 +172,7 @@ fn_set_dst_config_vars() { fn_list_config_locations() { echo -e "" echo -e "${bold}${lightyellow}Config Locations${default}" - echo -e "${bold}=================================${default}" + fn_messages_separator if [ -n "${servercfgfullpath}" ]; then if [ -f "${servercfgfullpath}" ]; then echo -e "${gamename} config file: ${italic}${servercfgfullpath}${default}" diff --git a/lgsm/modules/install_dst_token.sh b/lgsm/modules/install_dst_token.sh index 43db58fabe..3c647612db 100644 --- a/lgsm/modules/install_dst_token.sh +++ b/lgsm/modules/install_dst_token.sh @@ -8,8 +8,8 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" -echo -e "${lightyellow}Enter ${gamename} Cluster Token${default}" -echo -e "=================================" +echo -e "${bold}${lightyellow}Enter ${gamename} Cluster Token${default}" +fn_messages_separator fn_sleep_time echo -e "A cluster token is required to run this server!" echo -e "Follow the instructions in this link to obtain this key:" diff --git a/lgsm/modules/install_eula.sh b/lgsm/modules/install_eula.sh index 413f3f51c0..7833c81ab1 100644 --- a/lgsm/modules/install_eula.sh +++ b/lgsm/modules/install_eula.sh @@ -17,7 +17,7 @@ fi echo -e "" echo -e "${bold}${lightyellow}Accept ${gamename} EULA${default}" -echo -e "${bold}=================================${default}" +fn_messages_separator fn_sleep_time echo -e "You are required to accept the EULA:" echo -e "" diff --git a/lgsm/modules/install_factorio_save.sh b/lgsm/modules/install_factorio_save.sh index c86ee2f371..cfd793cac9 100644 --- a/lgsm/modules/install_factorio_save.sh +++ b/lgsm/modules/install_factorio_save.sh @@ -8,8 +8,8 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" -echo -e "${lightyellow}Creating initial Factorio savefile${default}" -echo -e "=================================" +echo -e "${bold}${lightyellow}Creating initial Factorio savefile${default}" +fn_messages_separator fn_sleep_time check_glibc.sh "${executabledir}"/factorio --create "${serverfiles}/save1" diff --git a/lgsm/modules/install_gslt.sh b/lgsm/modules/install_gslt.sh index e2224276f3..772885d64b 100644 --- a/lgsm/modules/install_gslt.sh +++ b/lgsm/modules/install_gslt.sh @@ -8,8 +8,8 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" -echo -e "${lightyellow}Game Server Login Token${default}" -echo -e "=================================" +echo -e "${bold}${lightyellow}Game Server Login Token${default}" +fn_messages_separator fn_sleep_time if [ "${shortname}" == "csgo" ] || [ "${shortname}" == "css" ] || [ "${shortname}" == "nmrih" ] || [ "${shortname}" == "bs" ]; then echo -e "GSLT is required to run a public ${gamename} server" diff --git a/lgsm/modules/install_header.sh b/lgsm/modules/install_header.sh index 1a08fdd2c9..f0c85dba29 100644 --- a/lgsm/modules/install_header.sh +++ b/lgsm/modules/install_header.sh @@ -10,7 +10,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" clear fn_print_ascii_logo fn_sleep_time -echo -e "${bold}=================================${default}" +fn_messages_separator echo -e "${bold}${lightyellow}Linux${default}${bold}GSM_${default}" echo -e "${italic}by Daniel Gibbs${default}" echo -e "${lightblue}Version:${default} ${version}" @@ -18,5 +18,5 @@ echo -e "${lightblue}Game:${default} ${gamename}" echo -e "${lightblue}Website:${default} https://linuxgsm.com" echo -e "${lightblue}Contributors:${default} https://linuxgsm.com/contrib" echo -e "${lightblue}Sponsor:${default} https://linuxgsm.com/sponsor" -echo -e "${bold}=================================${default}" +fn_messages_separator fn_sleep_time diff --git a/lgsm/modules/install_logs.sh b/lgsm/modules/install_logs.sh index 0abc08f6a9..454bff6f19 100644 --- a/lgsm/modules/install_logs.sh +++ b/lgsm/modules/install_logs.sh @@ -10,7 +10,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ -z "${checklogs}" ]; then echo -e "" echo -e "${bold}${lightyellow}Creating Log Directories${default}" - echo -e "=================================" + fn_messages_separator fn_sleep_time fi diff --git a/lgsm/modules/install_server_dir.sh b/lgsm/modules/install_server_dir.sh index 2a9501fa6e..14df4135d9 100644 --- a/lgsm/modules/install_server_dir.sh +++ b/lgsm/modules/install_server_dir.sh @@ -9,7 +9,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" echo -e "${bold}${lightyellow}Server Directory${default}" -echo -e "${bold}=================================${default}" +fn_messages_separator fn_sleep_time echo -en "creating serverfiles directory [ ${italic}${serverfiles}${default} ]" diff --git a/lgsm/modules/install_server_files.sh b/lgsm/modules/install_server_files.sh index 42069a556e..9bf68ec73a 100644 --- a/lgsm/modules/install_server_files.sh +++ b/lgsm/modules/install_server_files.sh @@ -211,7 +211,7 @@ fi echo -e "" echo -e "${bold}${lightyellow}Installing ${gamename} Server${default}" -echo -e "${bold}=================================${default}" +fn_messages_separator fn_sleep_time if [ "${appid}" ]; then @@ -249,7 +249,7 @@ fi if [ -z "${autoinstall}" ]; then echo -e "" - echo -e "${bold}=================================${default}" + fn_messages_separator if ! fn_prompt_yn "Was the install successful?" Y; then install_retry.sh fi diff --git a/lgsm/modules/install_squad_license.sh b/lgsm/modules/install_squad_license.sh index 75499f4a06..c207c8fb83 100644 --- a/lgsm/modules/install_squad_license.sh +++ b/lgsm/modules/install_squad_license.sh @@ -8,8 +8,8 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" -echo -e "${lightyellow}Squad Server License${default}" -echo -e "=================================" +echo -e "${bold}${lightyellow}${gamename} Server License${default}" +fn_messages_separator fn_sleep_time echo -e "Server license is an optional feature for ${gamename} server" fn_script_log_info "Server license is an optional feature for ${gamename} server" diff --git a/lgsm/modules/install_stats.sh b/lgsm/modules/install_stats.sh index 8b184fb7b6..f661a5af42 100644 --- a/lgsm/modules/install_stats.sh +++ b/lgsm/modules/install_stats.sh @@ -9,11 +9,12 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" echo -e "${bold}${lightyellow}LinuxGSM Stats${default}" -echo -e "${bold}=================================${default}" +fn_messages_separator fn_sleep_time echo -e "Assist LinuxGSM development by sending anonymous stats to developers." -echo -e "More info: https://docs.linuxgsm.com/configuration/linuxgsm-stats" -echo -e "The following info will be sent:" +echo -e "Collected data is publicly available: ${italic}https://linuxgsm.com/data/usage${default}" +echo -e "More info: ${italic}https://docs.linuxgsm.com/configuration/linuxgsm-stats${default}" +echo -e "The following info will be sent: " echo -e "* game server" echo -e "* distro" echo -e "* game server resource usage" diff --git a/lgsm/modules/install_steamcmd.sh b/lgsm/modules/install_steamcmd.sh index aed1739eea..c0e8c25c1a 100644 --- a/lgsm/modules/install_steamcmd.sh +++ b/lgsm/modules/install_steamcmd.sh @@ -9,6 +9,6 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" echo -e "${bold}${lightyellow}Installing SteamCMD${default}" -echo -e "${bold}=================================${default}" +fn_messages_separator fn_sleep_time check_steamcmd.sh diff --git a/lgsm/modules/install_ts3db.sh b/lgsm/modules/install_ts3db.sh index 703f9b6454..ecda930381 100644 --- a/lgsm/modules/install_ts3db.sh +++ b/lgsm/modules/install_ts3db.sh @@ -23,8 +23,8 @@ fn_install_ts3db_mariadb() { fi echo -e "" - echo -e "${lightyellow}Configure ${gamename} Server for MariaDB${default}" - echo -e "=================================" + echo -e "${bold}${lightyellow}Configure ${gamename} Server for MariaDB${default}" + fn_messages_separator fn_sleep_time read -rp "Enter MariaDB hostname: " mariahostname read -rp "Enter MariaDB port: " mariaport @@ -50,8 +50,8 @@ fn_install_ts3db_mariadb() { } echo -e "" -echo -e "${lightyellow}Select Database${default}" -echo -e "=================================" +echo -e "${bold}${lightyellow}Select Database${default}" +fn_messages_separator fn_sleep_time if [ -z "${autoinstall}" ]; then if fn_prompt_yn "Do you want to use MariaDB instead of sqlite? (MariaDB must be pre-configured)" N; then @@ -64,8 +64,8 @@ fi install_eula.sh echo -e "" -echo -e "${lightyellow}Getting Privilege Key${default}" -echo -e "=================================" +echo -e "${bold}${lightyellow}Getting Privilege Key${default}" +fn_messages_separator fn_sleep_time fn_print_information_nl "Save these details for later." fn_print_information_nl "Key also saved in:" diff --git a/lgsm/modules/install_ut2k4_key.sh b/lgsm/modules/install_ut2k4_key.sh index c09c4590ce..c96039ef5f 100644 --- a/lgsm/modules/install_ut2k4_key.sh +++ b/lgsm/modules/install_ut2k4_key.sh @@ -8,8 +8,8 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" -echo -e "${lightyellow}Enter ${gamename} CD Key${default}" -echo -e "=================================" +echo -e "${bold}${lightyellow}Enter ${gamename} CD Key${default}" +fn_messages_separator fn_sleep_time echo -e "To get your server listed on the Master Server list" echo -e "you must get a free CD key. Get a key here:"