Browse Source

refactor: refactor info message functions in alert.sh, command_details.sh, command_dev_query_raw.sh, and command_postdetails.sh

- Refactored the info message functions in multiple files to have consistent naming conventions.
- Renamed fn_info_message_* functions to fn_info_messages_* for clarity and consistency.
- Updated function calls accordingly.
pull/4356/head
Daniel Gibbs 2 years ago
parent
commit
31420256f5
No known key found for this signature in database GPG Key ID: 2076B128385E8C55
  1. 10
      lgsm/modules/alert.sh
  2. 22
      lgsm/modules/command_details.sh
  3. 2
      lgsm/modules/command_dev_query_raw.sh
  4. 22
      lgsm/modules/command_postdetails.sh

10
lgsm/modules/alert.sh

@ -18,11 +18,11 @@ fn_alert_log() {
fi fi
{ {
fn_info_message_head fn_info_messages_head
fn_info_message_distro fn_info_messages_distro
fn_info_message_server_resource fn_info_messages_server_resource
fn_info_message_gameserver_resource fn_info_messages_gameserver_resource
fn_info_message_gameserver fn_info_messages_gameserver
fn_info_logs fn_info_logs
} | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | tee -a "${alertlog}" > /dev/null 2>&1 } | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | tee -a "${alertlog}" > /dev/null 2>&1
} }

22
lgsm/modules/command_details.sh

@ -23,20 +23,20 @@ if [ "${querymode}" == "2" ] || [ "${querymode}" == "3" ]; then
fi fi
done done
fi fi
fn_info_message_distro fn_info_messages_distro
fn_info_message_server_resource fn_info_messages_server_resource
fn_info_message_gameserver_resource fn_info_messages_gameserver_resource
fn_info_message_gameserver fn_info_messages_gameserver
fn_info_message_script fn_info_messages_script
fn_info_message_backup fn_info_messages_backup
# Some game servers do not have parms. # Some game servers do not have parms.
if [ "${shortname}" != "jc2" ] && [ "${shortname}" != "dst" ] && [ "${shortname}" != "pz" ] && [ "${engine}" != "renderware" ]; then if [ "${shortname}" != "jc2" ] && [ "${shortname}" != "dst" ] && [ "${shortname}" != "pz" ] && [ "${engine}" != "renderware" ]; then
fn_info_message_commandlineparms fn_info_messages_commandlineparms
fi fi
fn_info_message_ports_edit fn_info_messages_ports_edit
fn_info_message_ports fn_info_messages_ports
fn_info_message_select_engine fn_info_messages_select_engine
fn_info_message_statusbottom fn_info_messages_statusbottom
exitcode=0 exitcode=0
core_exit.sh core_exit.sh

2
lgsm/modules/command_dev_query_raw.sh

@ -185,7 +185,7 @@ fn_messages_separator
echo -e "" echo -e ""
echo -e "${lightgreen}SS Output${default}" echo -e "${lightgreen}SS Output${default}"
fn_messages_separator fn_messages_separator
fn_info_message_ports fn_info_messages_ports
eval "${portcommand}" eval "${portcommand}"
echo -e "" echo -e ""
echo -e "${lightgreen}Query Port - Raw Output${default}" echo -e "${lightgreen}Query Port - Raw Output${default}"

22
lgsm/modules/command_postdetails.sh

@ -42,20 +42,20 @@ else
done done
touch "${postdetailslog}" || fn_bad_postdetailslog touch "${postdetailslog}" || fn_bad_postdetailslog
{ {
fn_info_message_distro fn_info_messages_distro
fn_info_message_server_resource fn_info_messages_server_resource
fn_info_message_gameserver_resource fn_info_messages_gameserver_resource
fn_info_message_gameserver fn_info_messages_gameserver
fn_info_message_script fn_info_messages_script
fn_info_message_backup fn_info_messages_backup
# Some game servers do not have parms. # Some game servers do not have parms.
if [ "${shortname}" != "jc2" ] && [ "${shortname}" != "jc3" ] && [ "${shortname}" != "dst" ] && [ "${shortname}" != "pz" ] && [ "${engine}" != "renderware" ]; then if [ "${shortname}" != "jc2" ] && [ "${shortname}" != "jc3" ] && [ "${shortname}" != "dst" ] && [ "${shortname}" != "pz" ] && [ "${engine}" != "renderware" ]; then
fn_info_message_commandlineparms fn_info_messages_commandlineparms
fi fi
fn_info_message_ports_edit fn_info_messages_ports_edit
fn_info_message_ports fn_info_messages_ports
fn_info_message_select_engine fn_info_messages_select_engine
fn_info_message_statusbottom fn_info_messages_statusbottom
} | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | tee -a "${postdetailslog}" > /dev/null 2>&1 } | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | tee -a "${postdetailslog}" > /dev/null 2>&1
fi fi

Loading…
Cancel
Save