gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactor: renamed fatal to fail to improve consistency 

- Updated the log level from "fatal" to "fail" in the alert scripts.
feature/dst-changes
Daniel Gibbs 2 years ago
parent
ee738a699c
commit
eb5c8338ab
No known key found for this signature in database GPG Key ID: 2076B128385E8C55
48 changed files with 144 additions and 144 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lgsm/modules/alert_discord.sh
  2. 2
      lgsm/modules/alert_email.sh
  3. 2
      lgsm/modules/alert_gotify.sh
  4. 2
      lgsm/modules/alert_ifttt.sh
  5. 2
      lgsm/modules/alert_mailgun.sh
  6. 2
      lgsm/modules/alert_pushbullet.sh
  7. 2
      lgsm/modules/alert_pushover.sh
  8. 2
      lgsm/modules/alert_rocketchat.sh
  9. 2
      lgsm/modules/alert_slack.sh
  10. 2
      lgsm/modules/alert_telegram.sh
  11. 4
      lgsm/modules/check_config.sh
  12. 4
      lgsm/modules/check_deps.sh
  13. 2
      lgsm/modules/check_executable.sh
  14. 6
      lgsm/modules/check_permissions.sh
  15. 2
      lgsm/modules/check_root.sh
  16. 4
      lgsm/modules/check_system_dir.sh
  17. 4
      lgsm/modules/check_tmuxception.sh
  18. 10
      lgsm/modules/command_backup.sh
  19. 2
      lgsm/modules/command_dev_detect_glibc.sh
  20. 28
      lgsm/modules/command_fastdl.sh
  21. 6
      lgsm/modules/command_mods_remove.sh
  22. 2
      lgsm/modules/command_mods_update.sh
  23. 2
      lgsm/modules/command_monitor.sh
  24. 2
      lgsm/modules/command_skeleton.sh
  25. 4
      lgsm/modules/command_start.sh
  26. 2
      lgsm/modules/command_stop.sh
  27. 20
      lgsm/modules/command_update_linuxgsm.sh
  28. 32
      lgsm/modules/core_dl.sh
  29. 2
      lgsm/modules/core_exit.sh
  30. 6
      lgsm/modules/core_github.sh
  31. 2
      lgsm/modules/core_messages.sh
  32. 14
      lgsm/modules/core_steamcmd.sh
  33. 2
      lgsm/modules/fix_ts3.sh
  34. 2
      lgsm/modules/install_complete.sh
  35. 14
      lgsm/modules/install_config.sh
  36. 2
      lgsm/modules/install_server_files.sh
  37. 2
      lgsm/modules/install_ts3db.sh
  38. 42
      lgsm/modules/mods_core.sh
  39. 4
      lgsm/modules/update_fctr.sh
  40. 4
      lgsm/modules/update_jk2.sh
  41. 4
      lgsm/modules/update_mc.sh
  42. 6
      lgsm/modules/update_mcb.sh
  43. 4
      lgsm/modules/update_mta.sh
  44. 4
      lgsm/modules/update_pmc.sh
  45. 6
      lgsm/modules/update_ts3.sh
  46. 4
      lgsm/modules/update_ut99.sh
  47. 4
      lgsm/modules/update_vints.sh
  48. 4
      linuxgsm.sh

2
lgsm/modules/alert_discord.sh
View File

@ -52,7 +52,7 @@ discordsend=$(curl --connect-timeout 10 -sSL -H "Content-Type: application/json"
if [ -n "${discordsend}" ]; then if [ -n "${discordsend}" ]; then
fn_print_fail_nl "Sending Discord alert: ${discordsend}" fn_print_fail_nl "Sending Discord alert: ${discordsend}"
fn_script_log_fatal "Sending Discord alert: ${discordsend}" fn_script_log_fail "Sending Discord alert: ${discordsend}"
else else
fn_print_ok_nl "Sending Discord alert" fn_print_ok_nl "Sending Discord alert"
fn_script_log_pass "Sending Discord alert" fn_script_log_pass "Sending Discord alert"

2
lgsm/modules/alert_email.sh
View File

@ -20,5 +20,5 @@ if [ "${exitcode}" == "0" ]; then
fn_script_log_pass "Sending Email alert: ${email}" fn_script_log_pass "Sending Email alert: ${email}"
else else
fn_print_fail_nl "Sending Email alert: ${email}" fn_print_fail_nl "Sending Email alert: ${email}"
fn_script_log_fatal "Sending Email alert: ${email}" fn_script_log_fail "Sending Email alert: ${email}"
fi fi

2
lgsm/modules/alert_gotify.sh
View File

@ -26,5 +26,5 @@ if [ -n "${gotifysend}" ]; then
fn_script_log_pass "Sending Gotify alert" fn_script_log_pass "Sending Gotify alert"
else else
fn_print_fail_nl "Sending Gotify alert: ${gotifysend}" fn_print_fail_nl "Sending Gotify alert: ${gotifysend}"
fn_script_log_fatal "Sending Gotify alert: ${gotifysend}" fn_script_log_fail "Sending Gotify alert: ${gotifysend}"
fi fi

2
lgsm/modules/alert_ifttt.sh
View File

@ -22,7 +22,7 @@ iftttsend=$(curl --connect-timeout 10 -sSL -H "Content-Type: application/json" -
if [ -n "${iftttsend}" ]; then if [ -n "${iftttsend}" ]; then
fn_print_fail_nl "Sending IFTTT alert: ${pushbulletsend}" fn_print_fail_nl "Sending IFTTT alert: ${pushbulletsend}"
fn_script_log_fatal "Sending IFTTT alert: ${pushbulletsend}" fn_script_log_fail "Sending IFTTT alert: ${pushbulletsend}"
else else
fn_print_ok_nl "Sending IFTTT alert" fn_print_ok_nl "Sending IFTTT alert"
fn_script_log_pass "Sent IFTTT alert" fn_script_log_pass "Sent IFTTT alert"

2
lgsm/modules/alert_mailgun.sh
View File

@ -25,7 +25,7 @@ mailgunsend=$(curl --connect-timeout 10 -s --user "api:${mailguntoken}" \
if [ -z "${mailgunsend}" ]; then if [ -z "${mailgunsend}" ]; then
fn_print_fail_nl "Sending Email alert: Mailgun: ${mailgunemail}" fn_print_fail_nl "Sending Email alert: Mailgun: ${mailgunemail}"
fn_script_log_fatal "Sending Email alert: Mailgun: ${mailgunemail}" fn_script_log_fail "Sending Email alert: Mailgun: ${mailgunemail}"
else else
fn_print_ok_nl "Sending Email alert: Mailgun: ${mailgunemail}" fn_print_ok_nl "Sending Email alert: Mailgun: ${mailgunemail}"
fn_script_log_pass "Sending Email alert: Mailgun: ${mailgunemail}" fn_script_log_pass "Sending Email alert: Mailgun: ${mailgunemail}"

2
lgsm/modules/alert_pushbullet.sh
View File

@ -23,7 +23,7 @@ pushbulletsend=$(curl --connect-timeout 10 -sSL -u """${pushbullettoken}"":" -H
if [ -n "${pushbulletsend}" ]; then if [ -n "${pushbulletsend}" ]; then
fn_print_fail_nl "Sending Pushbullet alert: ${pushbulletsend}" fn_print_fail_nl "Sending Pushbullet alert: ${pushbulletsend}"
fn_script_log_fatal "Sending Pushbullet alert: ${pushbulletsend}" fn_script_log_fail "Sending Pushbullet alert: ${pushbulletsend}"
else else
fn_print_ok_nl "Sending Pushbullet alert" fn_print_ok_nl "Sending Pushbullet alert"
fn_script_log_pass "Sent Pushbullet alert" fn_script_log_pass "Sent Pushbullet alert"

2
lgsm/modules/alert_pushover.sh
View File

@ -26,7 +26,7 @@ pushoversend=$(curl --connect-timeout 10 -sS -F token="${pushovertoken}" -F user
if [ -n "${pushoversend}" ]; then if [ -n "${pushoversend}" ]; then
fn_print_fail_nl "Sending Pushover alert: ${pushoversend}" fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"
fn_script_log_fatal "Sending Pushover alert: ${pushoversend}" fn_script_log_fail "Sending Pushover alert: ${pushoversend}"
else else
fn_print_ok_nl "Sending Pushover alert" fn_print_ok_nl "Sending Pushover alert"
fn_script_log_pass "Sent Pushover alert" fn_script_log_pass "Sent Pushover alert"

2
lgsm/modules/alert_rocketchat.sh
View File

@ -46,5 +46,5 @@ if [ -n "${rocketchatsend}" ]; then
fn_script_log_pass "Sending Rocketchat alert" fn_script_log_pass "Sending Rocketchat alert"
else else
fn_print_fail_nl "Sending Rocketchat alert: ${rocketchatsend}" fn_print_fail_nl "Sending Rocketchat alert: ${rocketchatsend}"
fn_script_log_fatal "Sending Rocketchat alert: ${rocketchatsend}" fn_script_log_fail "Sending Rocketchat alert: ${rocketchatsend}"
fi fi

2
lgsm/modules/alert_slack.sh
View File

@ -71,5 +71,5 @@ if [ "${slacksend}" == "ok" ]; then
fn_script_log_pass "Sending Slack alert" fn_script_log_pass "Sending Slack alert"
else else
fn_print_fail_nl "Sending Slack alert: ${slacksend}" fn_print_fail_nl "Sending Slack alert: ${slacksend}"
fn_script_log_fatal "Sending Slack alert: ${slacksend}" fn_script_log_fail "Sending Slack alert: ${slacksend}"
fi fi

2
lgsm/modules/alert_telegram.sh
View File

@ -23,7 +23,7 @@ telegramsend=$(curl --connect-timeout 10 -sSL -H "Content-Type: application/json
if [ -n "${telegramsend}" ]; then if [ -n "${telegramsend}" ]; then
fn_print_fail_nl "Sending Telegram alert: ${telegramsend}" fn_print_fail_nl "Sending Telegram alert: ${telegramsend}"
fn_script_log_fatal "Sending Telegram alert: ${telegramsend}" fn_script_log_fail "Sending Telegram alert: ${telegramsend}"
else else
fn_print_ok_nl "Sending Telegram alert" fn_print_ok_nl "Sending Telegram alert"
fn_script_log_pass "Sent Telegram alert" fn_script_log_pass "Sent Telegram alert"

4
lgsm/modules/check_config.sh
View File

@ -28,8 +28,8 @@ fi
if [ "${shortname}" == "vh" ] && [ -z "${serverpassword}" ]; then if [ "${shortname}" == "vh" ] && [ -z "${serverpassword}" ]; then
fn_print_fail_nl "serverpassword is not set" fn_print_fail_nl "serverpassword is not set"
fn_script_log_fatal "serverpassword is not set" fn_script_log_fail "serverpassword is not set"
elif [ "${shortname}" == "vh" ] && [ "${#serverpassword}" -le "4" ]; then elif [ "${shortname}" == "vh" ] && [ "${#serverpassword}" -le "4" ]; then
fn_print_fail_nl "serverpassword is to short (min 5 chars)" fn_print_fail_nl "serverpassword is to short (min 5 chars)"
fn_script_log_fatal "serverpassword is to short (min 5 chars)" fn_script_log_fail "serverpassword is to short (min 5 chars)"
fi fi

4
lgsm/modules/check_deps.sh
View File

@ -80,7 +80,7 @@ fn_install_mono_repo() {
if [ "${monoautoinstall}" != "1" ]; then if [ "${monoautoinstall}" != "1" ]; then
if [ $? != 0 ]; then if [ $? != 0 ]; then
fn_print_failure_nl "Unable to install Mono repository." fn_print_failure_nl "Unable to install Mono repository."
fn_script_log_fatal "Unable to install Mono repository." fn_script_log_fail "Unable to install Mono repository."
else else
fn_print_complete_nl "Installing Mono repository completed." fn_print_complete_nl "Installing Mono repository completed."
fn_script_log_pass "Installing Mono repository completed." fn_script_log_pass "Installing Mono repository completed."
@ -215,7 +215,7 @@ fn_install_missing_deps() {
if [ "${steamcmdfail}" ]; then if [ "${steamcmdfail}" ]; then
if [ "${commandname}" == "INSTALL" ]; then if [ "${commandname}" == "INSTALL" ]; then
fn_print_failure_nl "Missing dependencies required to run SteamCMD." fn_print_failure_nl "Missing dependencies required to run SteamCMD."
fn_script_log_fatal "Missing dependencies required to run SteamCMD." fn_script_log_fail "Missing dependencies required to run SteamCMD."
core_exit.sh core_exit.sh
else else
fn_print_error_nl "Missing dependencies required to run SteamCMD." fn_print_error_nl "Missing dependencies required to run SteamCMD."

2
lgsm/modules/check_executable.sh
View File

@ -20,7 +20,7 @@ if [ ! -f "${executabledir}/${execname}" ]; then
fn_print_fail_nl "executable was not found" fn_print_fail_nl "executable was not found"
echo -e "* ${executabledir}/${execname}" echo -e "* ${executabledir}/${execname}"
if [ -d "${lgsmlogdir}" ]; then if [ -d "${lgsmlogdir}" ]; then
fn_script_log_fatal "Executable was not found: ${executabledir}/${execname}" fn_script_log_fail "Executable was not found: ${executabledir}/${execname}"
fi fi
unset exitbypass unset exitbypass
core_exit.sh core_exit.sh

6
lgsm/modules/check_permissions.sh
View File

@ -25,7 +25,7 @@ fn_check_ownership() {
fi fi
if [ "${selfownissue}" == "1" ] || [ "${funcownissue}" == "1" ] || [ "${filesownissue}" == "1" ]; then if [ "${selfownissue}" == "1" ] || [ "${funcownissue}" == "1" ] || [ "${filesownissue}" == "1" ]; then
fn_print_fail_nl "Ownership issues found" fn_print_fail_nl "Ownership issues found"
fn_script_log_fatal "Ownership issues found" fn_script_log_fail "Ownership issues found"
fn_print_information_nl "The current user ($(whoami)) does not have ownership of the following files:" fn_print_information_nl "The current user ($(whoami)) does not have ownership of the following files:"
fn_script_log_info "The current user ($(whoami)) does not have ownership of the following files:" fn_script_log_info "The current user ($(whoami)) does not have ownership of the following files:"
{ {
@ -56,7 +56,7 @@ fn_check_permissions() {
if [ -d "${modulesdir}" ]; then if [ -d "${modulesdir}" ]; then
if [ "$(find "${modulesdir}" -type f -not -executable | wc -l)" -ne "0" ]; then if [ "$(find "${modulesdir}" -type f -not -executable | wc -l)" -ne "0" ]; then
fn_print_fail_nl "Permissions issues found" fn_print_fail_nl "Permissions issues found"
fn_script_log_fatal "Permissions issues found" fn_script_log_fail "Permissions issues found"
fn_print_information_nl "The following files are not executable:" fn_print_information_nl "The following files are not executable:"
fn_script_log_info "The following files are not executable:" fn_script_log_info "The following files are not executable:"
{ {
@ -80,7 +80,7 @@ fn_check_permissions() {
grouprootdirperm="${rootdirperm:1:1}" grouprootdirperm="${rootdirperm:1:1}"
if [ "${userrootdirperm}" != "7" ] && [ "${grouprootdirperm}" != "7" ]; then if [ "${userrootdirperm}" != "7" ] && [ "${grouprootdirperm}" != "7" ]; then
fn_print_fail_nl "Permissions issues found" fn_print_fail_nl "Permissions issues found"
fn_script_log_fatal "Permissions issues found" fn_script_log_fail "Permissions issues found"
fn_print_information_nl "The following directory does not have the correct permissions:" fn_print_information_nl "The following directory does not have the correct permissions:"
fn_script_log_info "The following directory does not have the correct permissions:" fn_script_log_info "The following directory does not have the correct permissions:"
fn_script_log_info "${rootdir}" fn_script_log_info "${rootdir}"

2
lgsm/modules/check_root.sh
View File

@ -11,7 +11,7 @@ if [ "$(whoami)" == "root" ]; then
if [ "${commandname}" != "INSTALL" ]; then if [ "${commandname}" != "INSTALL" ]; then
fn_print_fail_nl "Do NOT run this script as root!" fn_print_fail_nl "Do NOT run this script as root!"
if [ -d "${lgsmlogdir}" ]; then if [ -d "${lgsmlogdir}" ]; then
fn_script_log_fatal "${selfname} attempted to run as root." fn_script_log_fail "${selfname} attempted to run as root."
else else
# Forces exit code is log does not yet exist. # Forces exit code is log does not yet exist.
exitcode=1 exitcode=1

4
lgsm/modules/check_system_dir.sh
View File

@ -10,7 +10,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
if [ ! -d "${serverfiles}" ]; then if [ ! -d "${serverfiles}" ]; then
fn_print_fail_nl "Cannot access ${serverfiles}: No such directory" fn_print_fail_nl "Cannot access ${serverfiles}: No such directory"
if [ -d "${lgsmlogdir}" ]; then if [ -d "${lgsmlogdir}" ]; then
fn_script_log_fatal "Cannot access ${serverfiles}: No such directory." fn_script_log_fail "Cannot access ${serverfiles}: No such directory."
fi fi
core_exit.sh core_exit.sh
fi fi
@ -18,7 +18,7 @@ fi
if [ ! -d "${systemdir}" ]; then if [ ! -d "${systemdir}" ]; then
fn_print_fail_nl "Cannot access ${systemdir}: No such directory" fn_print_fail_nl "Cannot access ${systemdir}: No such directory"
if [ -d "${lgsmlogdir}" ]; then if [ -d "${lgsmlogdir}" ]; then
fn_script_log_fatal "Cannot access ${systemdir}: No such directory." fn_script_log_fail "Cannot access ${systemdir}: No such directory."
fi fi
core_exit.sh core_exit.sh
fi fi

4
lgsm/modules/check_tmuxception.sh
View File

@ -10,7 +10,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_check_is_in_tmux() { fn_check_is_in_tmux() {
if [ "${TMUX}" ]; then if [ "${TMUX}" ]; then
fn_print_fail_nl "tmuxception error: Sorry Cobb you cannot start a tmux session inside of a tmux session." fn_print_fail_nl "tmuxception error: Sorry Cobb you cannot start a tmux session inside of a tmux session."
fn_script_log_fatal "Tmuxception error: Attempted to start a tmux session inside of a tmux session." fn_script_log_fail "Tmuxception error: Attempted to start a tmux session inside of a tmux session."
fn_print_information_nl "LinuxGSM creates a tmux session when starting the server." fn_print_information_nl "LinuxGSM creates a tmux session when starting the server."
echo -e "It is not possible to run a tmux session inside another tmux session" echo -e "It is not possible to run a tmux session inside another tmux session"
echo -e "https://docs.linuxgsm.com/requirements/tmux#tmuxception" echo -e "https://docs.linuxgsm.com/requirements/tmux#tmuxception"
@ -21,7 +21,7 @@ fn_check_is_in_tmux() {
fn_check_is_in_screen() { fn_check_is_in_screen() {
if [ "${STY}" ]; then if [ "${STY}" ]; then
fn_print_fail_nl "tmuxception error: Sorry Cobb you cannot start a tmux session inside of a screen session." fn_print_fail_nl "tmuxception error: Sorry Cobb you cannot start a tmux session inside of a screen session."
fn_script_log_fatal "Tmuxception error: Attempted to start a tmux session inside of a screen session." fn_script_log_fail "Tmuxception error: Attempted to start a tmux session inside of a screen session."
fn_print_information_nl "LinuxGSM creates a tmux session when starting the server." fn_print_information_nl "LinuxGSM creates a tmux session when starting the server."
echo -e "It is not possible to run a tmux session inside screen session" echo -e "It is not possible to run a tmux session inside screen session"
echo -e "https://docs.linuxgsm.com/requirements/tmux#tmuxception" echo -e "https://docs.linuxgsm.com/requirements/tmux#tmuxception"

10
lgsm/modules/command_backup.sh
View File

@ -148,7 +148,7 @@ fn_backup_compression() {
# Check that excludedir is a valid path. # Check that excludedir is a valid path.
if [ ! -d "${excludedir}" ]; then if [ ! -d "${excludedir}" ]; then
fn_print_fail_nl "Problem identifying the previous backup directory for exclusion." fn_print_fail_nl "Problem identifying the previous backup directory for exclusion."
fn_script_log_fatal "Problem identifying the previous backup directory for exclusion" fn_script_log_fail "Problem identifying the previous backup directory for exclusion"
core_exit.sh core_exit.sh
fi fi
@ -156,10 +156,10 @@ fn_backup_compression() {
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol fn_print_fail_eol
fn_script_log_fatal "Backup in progress: FAIL" fn_script_log_fail "Backup in progress: FAIL"
echo -e "${extractcmd}" | tee -a "${lgsmlog}" echo -e "${extractcmd}" | tee -a "${lgsmlog}"
fn_print_fail_nl "Starting backup" fn_print_fail_nl "Starting backup"
fn_script_log_fatal "Starting backup" fn_script_log_fail "Starting backup"
else else
fn_print_ok_eol fn_print_ok_eol
fn_print_ok_nl "Completed: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')" fn_print_ok_nl "Completed: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')"
@ -217,7 +217,7 @@ fn_backup_relpath() {
declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g")) declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g"))
if [ ${#rdirtoks[@]} -eq 0 ]; then if [ ${#rdirtoks[@]} -eq 0 ]; then
fn_print_fail_nl "Problem assessing rootdir during relative path assessment" fn_print_fail_nl "Problem assessing rootdir during relative path assessment"
fn_script_log_fatal "Problem assessing rootdir during relative path assessment: ${rootdir}" fn_script_log_fail "Problem assessing rootdir during relative path assessment: ${rootdir}"
core_exit.sh core_exit.sh
fi fi
@ -225,7 +225,7 @@ fn_backup_relpath() {
declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g")) declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g"))
if [ ${#bdirtoks[@]} -eq 0 ]; then if [ ${#bdirtoks[@]} -eq 0 ]; then
fn_print_fail_nl "Problem assessing backupdir during relative path assessment" fn_print_fail_nl "Problem assessing backupdir during relative path assessment"
fn_script_log_fatal "Problem assessing backupdir during relative path assessment: ${rootdir}" fn_script_log_fail "Problem assessing backupdir during relative path assessment: ${rootdir}"
core_exit.sh core_exit.sh
fi fi

2
lgsm/modules/command_dev_detect_glibc.sh
View File

@ -17,7 +17,7 @@ fn_messages_separator
if [ ! "$(command -v objdump 2> /dev/null)" ]; then if [ ! "$(command -v objdump 2> /dev/null)" ]; then
fn_print_failure_nl "objdump is missing" fn_print_failure_nl "objdump is missing"
fn_script_log_fatal "objdump is missing" fn_script_log_fail "objdump is missing"
core_exit.sh core_exit.sh
fi fi

28
lgsm/modules/command_fastdl.sh
View File

@ -26,7 +26,7 @@ luafastdlfullpath="${luasvautorundir}/${luafastdlfile}"
# Check if bzip2 is installed. # Check if bzip2 is installed.
if [ ! "$(command -v bzip2 2> /dev/null)" ]; then if [ ! "$(command -v bzip2 2> /dev/null)" ]; then
fn_print_fail "bzip2 is not installed" fn_print_fail "bzip2 is not installed"
fn_script_log_fatal "bzip2 is not installed" fn_script_log_fail "bzip2 is not installed"
core_exit.sh core_exit.sh
fi fi
@ -72,7 +72,7 @@ fn_clear_old_fastdl() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Clearing existing FastDL directory ${fastdldir}" fn_script_log_fail "Clearing existing FastDL directory ${fastdldir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -89,7 +89,7 @@ fn_fastdl_dirs() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Creating web directory ${webdir}" fn_script_log_fail "Creating web directory ${webdir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -102,7 +102,7 @@ fn_fastdl_dirs() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Creating fastdl directory ${fastdldir}" fn_script_log_fail "Creating fastdl directory ${fastdldir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -218,13 +218,13 @@ fn_fastdl_preview() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Calculating total file size." fn_script_log_fail "Calculating total file size."
core_exit.sh core_exit.sh
fi fi
done < "${tmpdir}/fastdl_files_to_compress.txt" done < "${tmpdir}/fastdl_files_to_compress.txt"
else else
fn_print_fail_eol_nl "generating file list" fn_print_fail_eol_nl "generating file list"
fn_script_log_fatal "Generating file list." fn_script_log_fail "Generating file list."
core_exit.sh core_exit.sh
fi fi
echo -e "about to compress ${totalfiles} files, total size $(fn_human_readable_file_size ${filesizetotal} 0)" echo -e "about to compress ${totalfiles} files, total size $(fn_human_readable_file_size ${filesizetotal} 0)"
@ -251,7 +251,7 @@ fn_fastdl_gmod() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Copying ${fastdlfile} > ${fastdldir}" fn_script_log_fail "Copying ${fastdlfile} > ${fastdldir}"
core_exit.sh core_exit.sh
else else
fn_script_log_pass "Copying ${fastdlfile} > ${fastdldir}" fn_script_log_pass "Copying ${fastdlfile} > ${fastdldir}"
@ -268,7 +268,7 @@ fn_fastdl_gmod() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Updating addons file structure" fn_script_log_fail "Updating addons file structure"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -281,7 +281,7 @@ fn_fastdl_gmod() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Clearing addons dir from fastdl dir" fn_script_log_fail "Clearing addons dir from fastdl dir"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -296,7 +296,7 @@ fn_fastdl_gmod() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Correcting DarkRP files" fn_script_log_fail "Correcting DarkRP files"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -347,7 +347,7 @@ fn_fastdl_source() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Copying ${fastdlfile} > ${fastdldir}/${copytodir}" fn_script_log_fail "Copying ${fastdlfile} > ${fastdldir}/${copytodir}"
core_exit.sh core_exit.sh
else else
fn_script_log_pass "Copying ${fastdlfile} > ${fastdldir}/${copytodir}" fn_script_log_pass "Copying ${fastdlfile} > ${fastdldir}/${copytodir}"
@ -383,7 +383,7 @@ fn_fastdl_gmod_dl_enforcer() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Removing existing download enforcer ${luafastdlfullpath}" fn_script_log_fail "Removing existing download enforcer ${luafastdlfullpath}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -401,7 +401,7 @@ fn_fastdl_gmod_dl_enforcer() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Creating new download enforcer ${luafastdlfullpath}" fn_script_log_fail "Creating new download enforcer ${luafastdlfullpath}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -418,7 +418,7 @@ fn_fastdl_bzip2() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Compressing ${filetocompress}" fn_script_log_fail "Compressing ${filetocompress}"
core_exit.sh core_exit.sh
else else
fn_script_log_pass "Compressing ${filetocompress}" fn_script_log_pass "Compressing ${filetocompress}"

6
lgsm/modules/command_mods_remove.sh
View File

@ -72,7 +72,7 @@ while [ "${modfileline}" -le "${modsfilelistsize}" ]; do
rm -rf "${modinstalldir:?}/${currentfileremove:?}" rm -rf "${modinstalldir:?}/${currentfileremove:?}"
((exitcode = $?)) ((exitcode = $?))
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "Removing ${modinstalldir}/${currentfileremove}" fn_script_log_fail "Removing ${modinstalldir}/${currentfileremove}"
break break
else else
fn_script_log_pass "Removing ${modinstalldir}/${currentfileremove}" fn_script_log_pass "Removing ${modinstalldir}/${currentfileremove}"
@ -103,7 +103,7 @@ fn_sleep_time
rm -rf "${modsdir:?}/${modcommand}-files.txt" rm -rf "${modsdir:?}/${modcommand}-files.txt"
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "Removing ${modsdir}/${modcommand}-files.txt" fn_script_log_fail "Removing ${modsdir}/${modcommand}-files.txt"
fn_print_fail_eol_nl fn_print_fail_eol_nl
core_exit.sh core_exit.sh
else else
@ -118,7 +118,7 @@ fn_sleep_time
sed -i "/^${modcommand}$/d" "${modsinstalledlistfullpath}" sed -i "/^${modcommand}$/d" "${modsinstalledlistfullpath}"
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "Removing ${modcommand} from ${modsinstalledlist}" fn_script_log_fail "Removing ${modcommand} from ${modsinstalledlist}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
core_exit.sh core_exit.sh
else else

2
lgsm/modules/command_mods_update.sh
View File

@ -97,7 +97,7 @@ while [ "${installedmodsline}" -le "${installedmodscount}" ]; do
((installedmodsline++)) ((installedmodsline++))
else else
fn_print_fail "No mod was selected" fn_print_fail "No mod was selected"
fn_script_log_fatal "No mod was selected" fn_script_log_fail "No mod was selected"
exitcode="1" exitcode="1"
core_exit.sh core_exit.sh
fi fi

2
lgsm/modules/command_monitor.sh
View File

@ -206,7 +206,7 @@ fn_monitor_check_session() {
else else
fn_print_error "Checking session: " fn_print_error "Checking session: "
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Checking session: FAIL" fn_script_log_fail "Checking session: FAIL"
alert="restart" alert="restart"
alert.sh alert.sh
fn_script_log_info "Checking session: Monitor is restarting ${selfname}" fn_script_log_info "Checking session: Monitor is restarting ${selfname}"

2
lgsm/modules/command_skeleton.sh
View File

@ -18,7 +18,7 @@ find "${rootdir}" -type d -not \( -path ./skel -prune \) | cpio -pdvm skel 2> /d
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_nl "Creating skeleton directory" fn_print_fail_nl "Creating skeleton directory"
fn_script_log_fatal "Creating skeleton directory" fn_script_log_fail "Creating skeleton directory"
else else
fn_print_ok_nl "Creating skeleton directory: ./skel" fn_print_ok_nl "Creating skeleton directory: ./skel"
fn_script_log_pass "Creating skeleton directory: ./skel" fn_script_log_pass "Creating skeleton directory: ./skel"

4
lgsm/modules/command_start.sh
View File

@ -120,10 +120,10 @@ fn_start_tmux() {
check_status.sh check_status.sh
if [ "${status}" == "0" ]; then if [ "${status}" == "0" ]; then
fn_print_fail_nl "Unable to start ${servername}" fn_print_fail_nl "Unable to start ${servername}"
fn_script_log_fatal "Unable to start ${servername}" fn_script_log_fail "Unable to start ${servername}"
if [ -s "${lgsmlogdir}/.${selfname}-tmux-error.tmp" ]; then if [ -s "${lgsmlogdir}/.${selfname}-tmux-error.tmp" ]; then
fn_print_fail_nl "Unable to start ${servername}: tmux error:" fn_print_fail_nl "Unable to start ${servername}: tmux error:"
fn_script_log_fatal "Unable to start ${servername}: tmux error:" fn_script_log_fail "Unable to start ${servername}: tmux error:"
echo -e "" echo -e ""
echo -e "Command" echo -e "Command"
fn_messages_separator fn_messages_separator

2
lgsm/modules/command_stop.sh
View File

@ -248,7 +248,7 @@ fn_stop_tmux() {
fn_script_log_pass "Stopped ${servername}" fn_script_log_pass "Stopped ${servername}"
else else
fn_print_fail_nl "Unable to stop ${servername}" fn_print_fail_nl "Unable to stop ${servername}"
fn_script_log_fatal "Unable to stop ${servername}" fn_script_log_fail "Unable to stop ${servername}"
fi fi
} }

20
lgsm/modules/command_update_linuxgsm.sh
View File

@ -24,7 +24,7 @@ if [ $? != "0" ]; then
curl --connect-timeout 10 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/linuxgsm.sh" 1> /dev/null curl --connect-timeout 10 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/linuxgsm.sh" 1> /dev/null
if [ $? != "0" ]; then if [ $? != "0" ]; then
fn_print_fail_nl "Selecting repo: Unable to to access GitHub or Bitbucket repositories" fn_print_fail_nl "Selecting repo: Unable to to access GitHub or Bitbucket repositories"
fn_script_log_fatal "Selecting repo: Unable to to access GitHub or Bitbucket repositories" fn_script_log_fail "Selecting repo: Unable to to access GitHub or Bitbucket repositories"
core_exit.sh core_exit.sh
else else
remotereponame="Bitbucket" remotereponame="Bitbucket"
@ -44,8 +44,8 @@ else
fi fi
if [ $? != "0" ]; then if [ $? != "0" ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Checking ${remotereponame} script linuxgsm.sh" fn_script_log_fail "Checking ${remotereponame} script linuxgsm.sh"
fn_script_log_fatal "Curl returned error: $?" fn_script_log_fail "Curl returned error: $?"
core_exit.sh core_exit.sh
fi fi
@ -82,7 +82,7 @@ if [ "${script_diff}" != "" ]; then
cp "${rootdir}/${selfname}" "${backupdir}/script/${selfname}-$(date +"%m_%d_%Y_%M").bak" cp "${rootdir}/${selfname}" "${backupdir}/script/${selfname}-$(date +"%m_%d_%Y_%M").bak"
if [ $? != 0 ]; then if [ $? != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Backup script ${selfname}" fn_script_log_fail "Backup script ${selfname}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -103,7 +103,7 @@ if [ "${script_diff}" != "" ]; then
if [ $? != "0" ]; then if [ $? != "0" ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "copying ${selfname}" fn_script_log_fail "copying ${selfname}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -124,8 +124,8 @@ else
fi fi
if [ $? != "0" ]; then if [ $? != "0" ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Checking ${remotereponame} config _default.cfg" fn_script_log_fail "Checking ${remotereponame} config _default.cfg"
fn_script_log_fatal "Curl returned error: $?" fn_script_log_fail "Curl returned error: $?"
core_exit.sh core_exit.sh
fi fi
@ -158,8 +158,8 @@ if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
fi fi
if [ $? != "0" ]; then if [ $? != "0" ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv" fn_script_log_fail "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv"
fn_script_log_fatal "Curl returned error: $?" fn_script_log_fail "Curl returned error: $?"
core_exit.sh core_exit.sh
fi fi
@ -200,7 +200,7 @@ if [ -n "${modulesdir}" ]; then
echo -en "removing module ${modulefile}...\c" echo -en "removing module ${modulefile}...\c"
if ! rm -f "${modulefile:?}"; then if ! rm -f "${modulefile:?}"; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Removing module ${modulefile}" fn_script_log_fail "Removing module ${modulefile}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl

32
lgsm/modules/core_dl.sh
View File

@ -93,27 +93,27 @@ fn_dl_steamcmd() {
# Not enough space. # Not enough space.
if [ -n "$(grep "0x202" "${steamcmdlog}" | tail -1)" ]; then if [ -n "$(grep "0x202" "${steamcmdlog}" | tail -1)" ]; then
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files" fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files"
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files" fn_script_log_fail "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files"
core_exit.sh core_exit.sh
# Not enough space. # Not enough space.
elif [ -n "$(grep "0x212" "${steamcmdlog}" | tail -1)" ]; then elif [ -n "$(grep "0x212" "${steamcmdlog}" | tail -1)" ]; then
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files" fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files"
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files" fn_script_log_fail "${commandaction} ${selfname}: ${remotelocation}: Not enough disk space to download server files"
core_exit.sh core_exit.sh
# Need tp purchase game. # Need tp purchase game.
elif [ -n "$(grep "No subscription" "${steamcmdlog}" | tail -1)" ]; then elif [ -n "$(grep "No subscription" "${steamcmdlog}" | tail -1)" ]; then
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Steam account does not have a license for the required game" fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Steam account does not have a license for the required game"
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Steam account does not have a license for the required game" fn_script_log_fail "${commandaction} ${selfname}: ${remotelocation}: Steam account does not have a license for the required game"
core_exit.sh core_exit.sh
# Two-factor authentication failure # Two-factor authentication failure
elif [ -n "$(grep "Two-factor code mismatch" "${steamcmdlog}" | tail -1)" ]; then elif [ -n "$(grep "Two-factor code mismatch" "${steamcmdlog}" | tail -1)" ]; then
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Two-factor authentication failure" fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Two-factor authentication failure"
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Two-factor authentication failure" fn_script_log_fail "${commandaction} ${selfname}: ${remotelocation}: Two-factor authentication failure"
core_exit.sh core_exit.sh
# Incorrect Branch password # Incorrect Branch password
elif [ -n "$(grep "Password check for AppId" "${steamcmdlog}" | tail -1)" ]; then elif [ -n "$(grep "Password check for AppId" "${steamcmdlog}" | tail -1)" ]; then
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: betapassword is incorrect" fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: betapassword is incorrect"
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: betapassword is incorrect" fn_script_log_fail "${commandaction} ${selfname}: ${remotelocation}: betapassword is incorrect"
core_exit.sh core_exit.sh
# Update did not finish. # Update did not finish.
elif [ -n "$(grep "0x402" "${steamcmdlog}" | tail -1)" ] || [ -n "$(grep "0x602" "${steamcmdlog}" | tail -1)" ]; then elif [ -n "$(grep "0x402" "${steamcmdlog}" | tail -1)" ] || [ -n "$(grep "0x602" "${steamcmdlog}" | tail -1)" ]; then
@ -142,7 +142,7 @@ fn_dl_steamcmd() {
if [ "${counter}" -gt "10" ]; then if [ "${counter}" -gt "10" ]; then
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Did not complete the download, too many retrys" fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Did not complete the download, too many retrys"
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Did not complete the download, too many retrys" fn_script_log_fail "${commandaction} ${selfname}: ${remotelocation}: Did not complete the download, too many retrys"
core_exit.sh core_exit.sh
fi fi
done done
@ -195,7 +195,7 @@ fn_dl_hash() {
fn_print_fail_eol_nl fn_print_fail_eol_nl
echo -e "${local_filename} returned ${hashtype} checksum: ${hashsumcmd}" echo -e "${local_filename} returned ${hashtype} checksum: ${hashsumcmd}"
echo -e "expected ${hashtype} checksum: ${hash}" echo -e "expected ${hashtype} checksum: ${hash}"
fn_script_log_fatal "Verifying ${local_filename} with ${hashtype}" fn_script_log_fail "Verifying ${local_filename} with ${hashtype}"
fn_script_log_info "${local_filename} returned ${hashtype} checksum: ${hashsumcmd}" fn_script_log_info "${local_filename} returned ${hashtype} checksum: ${hashsumcmd}"
fn_script_log_info "Expected ${hashtype} checksum: ${hash}" fn_script_log_info "Expected ${hashtype} checksum: ${hash}"
core_exit.sh core_exit.sh
@ -226,8 +226,8 @@ fn_dl_extract() {
if [ ! -f "${local_filedir}/${local_filename}" ]; then if [ ! -f "${local_filedir}/${local_filename}" ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
echo -en "file ${local_filedir}/${local_filename} not found" echo -en "file ${local_filedir}/${local_filename} not found"
fn_script_log_fatal "Extracting ${local_filename}" fn_script_log_fail "Extracting ${local_filename}"
fn_script_log_fatal "File ${local_filedir}/${local_filename} not found" fn_script_log_fail "File ${local_filedir}/${local_filename} not found"
core_exit.sh core_exit.sh
fi fi
mime=$(file -b --mime-type "${local_filedir}/${local_filename}") mime=$(file -b --mime-type "${local_filedir}/${local_filename}")
@ -259,7 +259,7 @@ fn_dl_extract() {
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Extracting ${local_filename}" fn_script_log_fail "Extracting ${local_filename}"
if [ -f "${lgsmlog}" ]; then if [ -f "${lgsmlog}" ]; then
echo -e "${extractcmd}" >> "${lgsmlog}" echo -e "${extractcmd}" >> "${lgsmlog}"
fi fi
@ -319,8 +319,8 @@ fn_check_file() {
if [ ${counter} -ge 2 ]; then if [ ${counter} -ge 2 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
if [ -f "${lgsmlog}" ]; then if [ -f "${lgsmlog}" ]; then
fn_script_log_fatal "Checking ${remote_filename}" fn_script_log_fail "Checking ${remote_filename}"
fn_script_log_fatal "${fileurl}" fn_script_log_fail "${fileurl}"
checkflag=1 checkflag=1
fi fi
else else
@ -420,8 +420,8 @@ fn_fetch_file() {
if [ ${counter} -ge 2 ]; then if [ ${counter} -ge 2 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
if [ -f "${lgsmlog}" ]; then if [ -f "${lgsmlog}" ]; then
fn_script_log_fatal "Downloading ${local_filename}..." fn_script_log_fail "Downloading ${local_filename}..."
fn_script_log_fatal "${fileurl}" fn_script_log_fail "${fileurl}"
fi fi
core_exit.sh core_exit.sh
else else
@ -616,7 +616,7 @@ fn_dl_latest_release_github() {
# Check how many releases we got from the api and exit if we have more then one. # Check how many releases we got from the api and exit if we have more then one.
if [ "$(echo -e "${githubreleaseassets}" | jq '. | length')" -gt 1 ]; then if [ "$(echo -e "${githubreleaseassets}" | jq '. | length')" -gt 1 ]; then
fn_print_fatal_nl "Found more than one release to download - Please report this to the LinuxGSM issue tracker" fn_print_fatal_nl "Found more than one release to download - Please report this to the LinuxGSM issue tracker"
fn_script_log_fatal "Found more than one release to download - Please report this to the LinuxGSM issue tracker" fn_script_log_fail "Found more than one release to download - Please report this to the LinuxGSM issue tracker"
else else
# Set variables for download via fn_fetch_file. # Set variables for download via fn_fetch_file.
githubreleasefilename=$(echo -e "${githubreleaseassets}" | jq -r '.[]name') githubreleasefilename=$(echo -e "${githubreleaseassets}" | jq -r '.[]name')
@ -625,7 +625,7 @@ fn_dl_latest_release_github() {
# Error if no version is there. # Error if no version is there.
if [ -z "${githubreleasefilename}" ]; then if [ -z "${githubreleasefilename}" ]; then
fn_print_fail_nl "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}" fn_print_fail_nl "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}"
fn_script_log_fatal "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}" fn_script_log_fail "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}"
else else
# Fetch file from the remote location from the existing module to the ${tmpdir} for now. # Fetch file from the remote location from the existing module to the ${tmpdir} for now.
fn_fetch_file "${githubreleasedownloadlink}" "" "${githubreleasefilename}" "" "${githubreleasedownloadpath}" "${githubreleasefilename}" fn_fetch_file "${githubreleasedownloadlink}" "" "${githubreleasefilename}" "" "${githubreleasedownloadpath}" "${githubreleasefilename}"

2
lgsm/modules/core_exit.sh
View File

@ -29,7 +29,7 @@ elif [ "${exitcode}" != "0" ]; then
# List LinuxGSM version in logs # List LinuxGSM version in logs
fn_script_log_info "LinuxGSM version: ${version}" fn_script_log_info "LinuxGSM version: ${version}"
if [ "${exitcode}" == "1" ]; then if [ "${exitcode}" == "1" ]; then
fn_script_log_fatal "${moduleselfname} exiting with code: ${exitcode}" fn_script_log_fail "${moduleselfname} exiting with code: ${exitcode}"
elif [ "${exitcode}" == "2" ]; then elif [ "${exitcode}" == "2" ]; then
fn_script_log_error "${moduleselfname} exiting with code: ${exitcode}" fn_script_log_error "${moduleselfname} exiting with code: ${exitcode}"
elif [ "${exitcode}" == "3" ]; then elif [ "${exitcode}" == "3" ]; then

6
lgsm/modules/core_github.sh
View File

@ -28,7 +28,7 @@ fn_github_get_latest_release_version() {
# error if no version is there # error if no version is there
if [ -z "${githubreleaseversion}" ]; then if [ -z "${githubreleaseversion}" ]; then
fn_print_fail_nl "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}" fn_print_fail_nl "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}"
fn_script_log_fatal "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}" fn_script_log_fail "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}"
fi fi
} }
@ -46,7 +46,7 @@ fn_github_set_latest_release_version() {
# error if no version is there # error if no version is there
if [ -z "${githubreleaseversion}" ]; then if [ -z "${githubreleaseversion}" ]; then
fn_print_fail_nl "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}" fn_print_fail_nl "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}"
fn_script_log_fatal "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}" fn_script_log_fail "Cannot get version from GitHub API for ${githubreleaseuser}/${githubreleaserepo}"
else else
echo "${githubreleaseversion}" > "${githublocalversionfile}" echo "${githubreleaseversion}" > "${githublocalversionfile}"
fi fi
@ -81,7 +81,7 @@ fn_github_compare_version() {
# error if no version is there # error if no version is there
if [ -z "${githubreleaseversion}" ]; then if [ -z "${githubreleaseversion}" ]; then
fn_print_fail_nl "Can not get version from Github Api for ${githubreleaseuser}/${githubreleaserepo}" fn_print_fail_nl "Can not get version from Github Api for ${githubreleaseuser}/${githubreleaserepo}"
fn_script_log_fatal "Can not get version from Github Api for ${githubreleaseuser}/${githubreleaserepo}" fn_script_log_fail "Can not get version from Github Api for ${githubreleaseuser}/${githubreleaserepo}"
else else
if [ "${githublocalversion}" == "${githubreleaseversion}" ]; then if [ "${githublocalversion}" == "${githubreleaseversion}" ]; then
echo -en "\n" echo -en "\n"

2
lgsm/modules/core_messages.sh
View File

@ -71,7 +71,7 @@ fn_script_log_pass() {
} }
## Feb 28 14:56:58 ut99-server: Monitor: FAIL: ## Feb 28 14:56:58 ut99-server: Monitor: FAIL:
fn_script_log_fatal() { fn_script_log_fail() {
if [ -d "${lgsmlogdir}" ]; then if [ -d "${lgsmlogdir}" ]; then
if [ -n "${commandname}" ]; then if [ -n "${commandname}" ]; then
echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: FAIL: ${1}" >> "${lgsmlog}" echo -e "$(date '+%b %d %H:%M:%S.%3N') ${selfname}: ${commandname}: FAIL: ${1}" >> "${lgsmlog}"

14
lgsm/modules/core_steamcmd.sh
View File

@ -25,7 +25,7 @@ fn_check_steamcmd_user() {
fn_print_fail_nl "Steam login not set. Update steamuser in ${configdirserver}" fn_print_fail_nl "Steam login not set. Update steamuser in ${configdirserver}"
echo -e " * Change steamuser=\"username\" to a valid steam login." echo -e " * Change steamuser=\"username\" to a valid steam login."
if [ -d "${lgsmlogdir}" ]; then if [ -d "${lgsmlogdir}" ]; then
fn_script_log_fatal "Steam login not set. Update steamuser in ${configdirserver}" fn_script_log_fail "Steam login not set. Update steamuser in ${configdirserver}"
fi fi
core_exit.sh core_exit.sh
fi fi
@ -130,7 +130,7 @@ fn_check_steamcmd_clear() {
rm -rf "${steamcmddir:?}" rm -rf "${steamcmddir:?}"
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "Removing ${rootdir}/steamcmd" fn_script_log_fail "Removing ${rootdir}/steamcmd"
else else
fn_script_log_pass "Removing ${rootdir}/steamcmd" fn_script_log_pass "Removing ${rootdir}/steamcmd"
fi fi
@ -155,7 +155,7 @@ fn_update_steamcmd_localbuild() {
# Checks if localbuild variable has been set. # Checks if localbuild variable has been set.
if [ -z "${localbuild}" ]; then if [ -z "${localbuild}" ]; then
fn_print_fail "Checking local build: ${remotelocation}: missing local build info" fn_print_fail "Checking local build: ${remotelocation}: missing local build info"
fn_script_log_fatal "Missing local build info" fn_script_log_fail "Missing local build info"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking local build: ${remotelocation}" fn_print_ok "Checking local build: ${remotelocation}"
@ -189,7 +189,7 @@ fn_update_steamcmd_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -199,7 +199,7 @@ fn_update_steamcmd_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi
@ -306,7 +306,7 @@ fn_check_steamcmd_appmanifest() {
# if error can not be resolved. # if error can not be resolved.
if [ "${appmanifestfilewc}" -ge "2" ]; then if [ "${appmanifestfilewc}" -ge "2" ]; then
fn_print_fail "Unable to remove x${appmanifestfilewc} appmanifest_${appid}.acf files" fn_print_fail "Unable to remove x${appmanifestfilewc} appmanifest_${appid}.acf files"
fn_script_log_fatal "Unable to remove x${appmanifestfilewc} appmanifest_${appid}.acf files" fn_script_log_fail "Unable to remove x${appmanifestfilewc} appmanifest_${appid}.acf files"
echo -e "* Check user permissions" echo -e "* Check user permissions"
for appfile in ${appmanifestfile}; do for appfile in ${appmanifestfile}; do
echo -e " ${appfile}" echo -e " ${appfile}"
@ -328,7 +328,7 @@ fn_check_steamcmd_appmanifest() {
fn_appmanifest_info fn_appmanifest_info
if [ "${appmanifestfilewc}" -eq "0" ]; then if [ "${appmanifestfilewc}" -eq "0" ]; then
fn_print_fail_nl "Still no appmanifest_${appid}.acf found" fn_print_fail_nl "Still no appmanifest_${appid}.acf found"
fn_script_log_fatal "Still no appmanifest_${appid}.acf found" fn_script_log_fail "Still no appmanifest_${appid}.acf found"
core_exit.sh core_exit.sh
fi fi
fi fi

2
lgsm/modules/fix_ts3.sh
View File

@ -40,7 +40,7 @@ if [ -f "${accountingfile}" ] && [ "${status}" == "0" ]; then
# file is not owned by the current user and needs to be deleted manually. # file is not owned by the current user and needs to be deleted manually.
else else
fn_print_error_nl "File ${accountingfile} is not owned by $(whoami) and needs to be deleted manually" fn_print_error_nl "File ${accountingfile} is not owned by $(whoami) and needs to be deleted manually"
fn_script_log_fatal "File ${accountingfile} is not owned by $(whoami) and needs to be deleted manually" fn_script_log_fail "File ${accountingfile} is not owned by $(whoami) and needs to be deleted manually"
core_exit.sh core_exit.sh
fi fi
fi fi

2
lgsm/modules/install_complete.sh
View File

@ -12,7 +12,7 @@ fn_messages_separator
if [ "${exitcode}" == "1" ]; then if [ "${exitcode}" == "1" ]; then
echo -e "${bold}${red}Install Failed!${default}" echo -e "${bold}${red}Install Failed!${default}"
fn_script_log_fatal "Install Failed!" fn_script_log_fail "Install Failed!"
elif [ "${exitcode}" == "2" ]; then elif [ "${exitcode}" == "2" ]; then
echo -e "${bold}${red}Install Completed with Errors!${default}}" echo -e "${bold}${red}Install Completed with Errors!${default}}"
fn_script_log_error "Install Completed with Errors!" fn_script_log_error "Install Completed with Errors!"

14
lgsm/modules/install_config.sh
View File

@ -15,7 +15,7 @@ fn_check_cfgdir() {
changes+=$(mkdir -pv "${servercfgdir}") changes+=$(mkdir -pv "${servercfgdir}")
if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181 if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "creating ${servercfgdir} config directory" fn_script_log_fail "creating ${servercfgdir} config directory"
core_exit.sh core_exit.sh
elif [ "${changes}" != "" ]; then elif [ "${changes}" != "" ]; then
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -57,7 +57,7 @@ fn_default_config_remote() {
fi fi
if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181 if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "copying config file ${servercfgfullpath}" fn_script_log_fail "copying config file ${servercfgfullpath}"
elif [ "${changes}" != "" ]; then elif [ "${changes}" != "" ]; then
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "copying config file ${servercfgfullpath}" fn_script_log_pass "copying config file ${servercfgfullpath}"
@ -79,7 +79,7 @@ fn_default_config_local() {
cp -n "${servercfgdir}/${servercfgdefault}" "${servercfgfullpath}" cp -n "${servercfgdir}/${servercfgdefault}" "${servercfgfullpath}"
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol fn_print_fail_eol
fn_script_log_fatal "copying config file [ ${servercfgdefault} ]" fn_script_log_fail "copying config file [ ${servercfgdefault} ]"
else else
fn_print_ok_eol fn_print_ok_eol
fn_script_log_pass "copying config file [ ${servercfgdefault} ]" fn_script_log_pass "copying config file [ ${servercfgdefault} ]"
@ -104,7 +104,7 @@ fn_set_config_vars() {
fi fi
if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181 if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181
fn_print_fail_eol fn_print_fail_eol
fn_script_log_fatal "changing server name" fn_script_log_fail "changing server name"
elif [ "${changes}" != "" ]; then elif [ "${changes}" != "" ]; then
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "changing server name" fn_script_log_pass "changing server name"
@ -124,7 +124,7 @@ fn_set_config_vars() {
fi fi
if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181 if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181
fn_print_fail_eol fn_print_fail_eol
fn_script_log_fatal "generating rcon/admin password" fn_script_log_fail "generating rcon/admin password"
elif [ "${changes}" != "" ]; then elif [ "${changes}" != "" ]; then
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "generating rcon/admin password" fn_script_log_pass "generating rcon/admin password"
@ -143,7 +143,7 @@ fn_set_dst_config_vars() {
changes+=$(sed -i "s/SERVERNAME/${servername}/g w /dev/stdout" "${clustercfgfullpath}") changes+=$(sed -i "s/SERVERNAME/${servername}/g w /dev/stdout" "${clustercfgfullpath}")
if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181 if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181
fn_print_fail_eol fn_print_fail_eol
fn_script_log_fatal "changing cluster name" fn_script_log_fail "changing cluster name"
elif [ "${changes}" != "" ]; then elif [ "${changes}" != "" ]; then
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "changing cluster name" fn_script_log_pass "changing cluster name"
@ -158,7 +158,7 @@ fn_set_dst_config_vars() {
changes+=$(sed -i "s/CLUSTERKEY/${randomstring}/g w /dev/stdout" "${clustercfgfullpath}") changes+=$(sed -i "s/CLUSTERKEY/${randomstring}/g w /dev/stdout" "${clustercfgfullpath}")
if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181 if [ "$?" -ne 0 ]; then # shellcheck disable=SC2181
fn_print_fail_eol fn_print_fail_eol
fn_script_log_fatal "generating cluster key" fn_script_log_fail "generating cluster key"
elif [ "${changes}" != "" ]; then elif [ "${changes}" != "" ]; then
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "generating cluster key" fn_script_log_pass "generating cluster key"

2
lgsm/modules/install_server_files.sh
View File

@ -199,7 +199,7 @@ fn_install_server_files() {
md5="0188ae86dbc9376f11ae3032dba2d665" md5="0188ae86dbc9376f11ae3032dba2d665"
else else
fn_print_fail_nl "Installing ${gamename} Server failed, missing default configuration" fn_print_fail_nl "Installing ${gamename} Server failed, missing default configuration"
fn_script_log_fatal "Installing ${gamename} Server failed, missing default configuration" fn_script_log_fail "Installing ${gamename} Server failed, missing default configuration"
fi fi
fn_fetch_file "${remote_fileurl}" "" "" "" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" fn_fetch_file "${remote_fileurl}" "" "" "" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}"
fn_dl_extract "${local_filedir}" "${local_filename}" "${serverfiles}" fn_dl_extract "${local_filedir}" "${local_filename}" "${serverfiles}"

2
lgsm/modules/install_ts3db.sh
View File

@ -14,7 +14,7 @@ fn_install_ts3db_mariadb() {
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != "0" ]; then if [ "${exitcode}" != "0" ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "copying libmariadb.so.2" fn_script_log_fail "copying libmariadb.so.2"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl

42
lgsm/modules/mods_core.sh
View File

@ -22,7 +22,7 @@ fn_mod_install_files() {
# Check if variable is valid checking if file has been downloaded and exists. # Check if variable is valid checking if file has been downloaded and exists.
if [ ! -f "${modstmpdir}/${modfilename}" ]; then if [ ! -f "${modstmpdir}/${modfilename}" ]; then
fn_print_failure "An issue occurred downloading ${modprettyname}" fn_print_failure "An issue occurred downloading ${modprettyname}"
fn_script_log_fatal "An issue occurred downloading ${modprettyname}" fn_script_log_fail "An issue occurred downloading ${modprettyname}"
core_exit.sh core_exit.sh
fi fi
if [ ! -d "${extractdest}" ]; then if [ ! -d "${extractdest}" ]; then
@ -77,7 +77,7 @@ fn_mod_create_filelist() {
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Building ${modsdir}/${modcommand}-files.txt" fn_script_log_fail "Building ${modsdir}/${modcommand}-files.txt"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -97,7 +97,7 @@ fn_mod_copy_destination() {
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Copying ${modprettyname} to ${modinstalldir}" fn_script_log_fail "Copying ${modprettyname} to ${modinstalldir}"
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "Copying ${modprettyname} to ${modinstalldir}" fn_script_log_pass "Copying ${modprettyname} to ${modinstalldir}"
@ -135,7 +135,7 @@ fn_mod_tidy_files_list() {
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Error while tidying line: ${removefilevar} from: ${modsdir}/${modcommand}-files.txt" fn_script_log_fail "Error while tidying line: ${removefilevar} from: ${modsdir}/${modcommand}-files.txt"
core_exit.sh core_exit.sh
break break
fi fi
@ -228,7 +228,7 @@ fn_mod_get_info() {
# Define all variables for a mod at once when index is set to a separator. # Define all variables for a mod at once when index is set to a separator.
fn_mods_define() { fn_mods_define() {
if [ -z "$index" ]; then if [ -z "$index" ]; then
fn_script_log_fatal "index variable not set. Please report an issue." fn_script_log_fail "index variable not set. Please report an issue."
fn_print_error "index variable not set. Please report an issue." fn_print_error "index variable not set. Please report an issue."
echo -e "* https://github.com/GameServerManagers/LinuxGSM/issues" echo -e "* https://github.com/GameServerManagers/LinuxGSM/issues"
core_exit.sh core_exit.sh
@ -390,7 +390,7 @@ fn_create_mods_dir() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Creating mod download dir ${modsdir}" fn_script_log_fail "Creating mod download dir ${modsdir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -404,7 +404,7 @@ fn_create_mods_dir() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Creating mod install directory ${modinstalldir}" fn_script_log_fail "Creating mod install directory ${modinstalldir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -427,7 +427,7 @@ fn_mods_create_tmp_dir() {
echo -en "creating mod download directory ${modstmpdir}..." echo -en "creating mod download directory ${modstmpdir}..."
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Creating mod download directory ${modstmpdir}" fn_script_log_fail "Creating mod download directory ${modstmpdir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -444,7 +444,7 @@ fn_mods_clear_tmp_dir() {
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Clearing mod download directory ${modstmpdir}" fn_script_log_fail "Clearing mod download directory ${modstmpdir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
@ -491,12 +491,12 @@ fn_check_mod_files_list() {
if [ "${modsfilelistsize}" -eq 0 ]; then if [ "${modsfilelistsize}" -eq 0 ]; then
fn_print_failure "${modcommand}-files.txt is empty" fn_print_failure "${modcommand}-files.txt is empty"
echo -e "* Unable to remove ${modprettyname}" echo -e "* Unable to remove ${modprettyname}"
fn_script_log_fatal "${modcommand}-files.txt is empty: Unable to remove ${modprettyname}." fn_script_log_fail "${modcommand}-files.txt is empty: Unable to remove ${modprettyname}."
core_exit.sh core_exit.sh
fi fi
else else
fn_print_failure "${modsdir}/${modcommand}-files.txt does not exist" fn_print_failure "${modsdir}/${modcommand}-files.txt does not exist"
fn_script_log_fatal "${modsdir}/${modcommand}-files.txt does not exist: Unable to remove ${modprettyname}." fn_script_log_fail "${modsdir}/${modcommand}-files.txt does not exist: Unable to remove ${modprettyname}."
core_exit.sh core_exit.sh
fi fi
} }
@ -519,7 +519,7 @@ fn_mod_exist() {
fn_mod_required_fail_exist() { fn_mod_required_fail_exist() {
modreq=$1 modreq=$1
# requires one parameter, the mod # requires one parameter, the mod
fn_script_log_fatal "${modreq}-files.txt is empty: unable to find ${modreq} installed" fn_script_log_fail "${modreq}-files.txt is empty: unable to find ${modreq} installed"
echo -en "* Unable to find '${modreq}' which is required prior to installing this mod..." echo -en "* Unable to find '${modreq}' which is required prior to installing this mod..."
fn_print_fail_eol_nl fn_print_fail_eol_nl
core_exit.sh core_exit.sh
@ -581,7 +581,7 @@ fn_mod_install_liblist_gam_file() {
exitcode=$? exitcode=$?
# if replacement back didn't happen, error out. # if replacement back didn't happen, error out.
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass "${logentry}" fn_script_log_pass "${logentry}"
@ -597,7 +597,7 @@ fn_mod_install_liblist_gam_file() {
exitcode=$? exitcode=$?
# if replacement back didn't happen, error out # if replacement back didn't happen, error out
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass "${logentry}" fn_script_log_pass "${logentry}"
@ -615,7 +615,7 @@ fn_mod_install_liblist_gam_file() {
exitcode=$? exitcode=$?
# if replacement back didn't happen, error out. # if replacement back didn't happen, error out.
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass ${logentry} fn_script_log_pass ${logentry}
@ -639,7 +639,7 @@ fn_mod_remove_liblist_gam_file() {
exitcode=$? exitcode=$?
# if replacement back didn't happen, error out. # if replacement back didn't happen, error out.
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass ${logentry} fn_script_log_pass ${logentry}
@ -655,7 +655,7 @@ fn_mod_remove_liblist_gam_file() {
exitcode=$? exitcode=$?
# if replacement back didn't happen, error out # if replacement back didn't happen, error out
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass ${logentry} fn_script_log_pass ${logentry}
@ -673,7 +673,7 @@ fn_mod_remove_liblist_gam_file() {
# if replacement back didn't happen, error out. # if replacement back didn't happen, error out.
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass ${logentry} fn_script_log_pass ${logentry}
@ -696,7 +696,7 @@ fn_mod_install_amxmodx_file() {
echo "linux addons/amxmodx/dlls/amxmodx_mm_i386.so" >> "${modinstalldir}/addons/metamod/plugins.ini" echo "linux addons/amxmodx/dlls/amxmodx_mm_i386.so" >> "${modinstalldir}/addons/metamod/plugins.ini"
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass ${logentry} fn_script_log_pass ${logentry}
@ -708,7 +708,7 @@ fn_mod_install_amxmodx_file() {
echo "linux addons/amxmodx/dlls/amxmodx_mm_i386.so" > "${modinstalldir}/addons/metamod/plugins.ini" echo "linux addons/amxmodx/dlls/amxmodx_mm_i386.so" > "${modinstalldir}/addons/metamod/plugins.ini"
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
core_exit.sh core_exit.sh
else else
@ -733,7 +733,7 @@ fn_mod_remove_amxmodx_file() {
sed -i '/^$/d' "${modinstalldir}/addons/metamod/plugins.ini" sed -i '/^$/d' "${modinstalldir}/addons/metamod/plugins.ini"
exitcode=$? exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_script_log_fatal "${logentry}" fn_script_log_fail "${logentry}"
fn_print_fail_eol_nl fn_print_fail_eol_nl
else else
fn_script_log_pass ${logentry} fn_script_log_pass ${logentry}

4
lgsm/modules/update_fctr.sh
View File

@ -46,7 +46,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -56,7 +56,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

4
lgsm/modules/update_jk2.sh
View File

@ -43,7 +43,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -53,7 +53,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

4
lgsm/modules/update_mc.sh
View File

@ -58,7 +58,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -68,7 +68,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

6
lgsm/modules/update_mcb.sh
View File

@ -18,7 +18,7 @@ fn_update_dl() {
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != 0 ]; then if [ "${exitcode}" != 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "Extracting ${local_filename}" fn_script_log_fail "Extracting ${local_filename}"
if [ -f "${lgsmlog}" ]; then if [ -f "${lgsmlog}" ]; then
echo -e "${extractcmd}" >> "${lgsmlog}" echo -e "${extractcmd}" >> "${lgsmlog}"
fi fi
@ -64,7 +64,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -74,7 +74,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

4
lgsm/modules/update_mta.sh
View File

@ -45,7 +45,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -55,7 +55,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

4
lgsm/modules/update_pmc.sh
View File

@ -68,7 +68,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -78,7 +78,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

6
lgsm/modules/update_ts3.sh
View File

@ -50,7 +50,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -60,7 +60,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi
@ -164,7 +164,7 @@ elif [ "${arch}" == "i386" ] || [ "${arch}" == "i686" ]; then
ts3arch="x86" ts3arch="x86"
else else
fn_print_failure "Unknown or unsupported architecture: ${arch}" fn_print_failure "Unknown or unsupported architecture: ${arch}"
fn_script_log_fatal "Unknown or unsupported architecture: ${arch}" fn_script_log_fail "Unknown or unsupported architecture: ${arch}"
core_exit.sh core_exit.sh
fi fi

4
lgsm/modules/update_ut99.sh
View File

@ -44,7 +44,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -54,7 +54,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

4
lgsm/modules/update_vints.sh
View File

@ -51,7 +51,7 @@ fn_update_remotebuild() {
# Checks if remotebuildversion variable has been set. # Checks if remotebuildversion variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_fail "Checking remote build: ${remotelocation}" fn_print_fail "Checking remote build: ${remotelocation}"
fn_script_log_fatal "Checking remote build" fn_script_log_fail "Checking remote build"
core_exit.sh core_exit.sh
else else
fn_print_ok "Checking remote build: ${remotelocation}" fn_print_ok "Checking remote build: ${remotelocation}"
@ -61,7 +61,7 @@ fn_update_remotebuild() {
# Checks if remotebuild variable has been set. # Checks if remotebuild variable has been set.
if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then if [ -z "${remotebuildversion}" ] || [ "${remotebuildversion}" == "null" ]; then
fn_print_failure "Unable to get remote build" fn_print_failure "Unable to get remote build"
fn_script_log_fatal "Unable to get remote build" fn_script_log_fail "Unable to get remote build"
core_exit.sh core_exit.sh
fi fi
fi fi

4
linuxgsm.sh
View File

@ -124,8 +124,8 @@ fn_bootstrap_fetch_file() {
if [ ${counter} -ge 2 ]; then if [ ${counter} -ge 2 ]; then
echo -e "FAIL" echo -e "FAIL"
if [ -f "${lgsmlog}" ]; then if [ -f "${lgsmlog}" ]; then
fn_script_log_fatal "Downloading ${local_filename}" fn_script_log_fail "Downloading ${local_filename}"
fn_script_log_fatal "${fileurl}" fn_script_log_fail "${fileurl}"
fi fi
core_exit.sh core_exit.sh
else else

Write Preview
Loading…
Cancel
Save