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

refactor: improve readability and consistency in code 

- Refactored the log messages to use consistent capitalization and wording.
- Updated log messages in check_glibc.sh, check_permissions.sh, command_backup.sh, command_update_linuxgsm.sh, command_wipe.sh, fix_samp.sh, install_config.sh, and set_dst_config_vars() functions.

feat: add more descriptive log messages

- Added more descriptive log messages to provide clearer information about the actions being performed.
- Updated log messages in check_glibc.sh, check_permissions.sh, command_backup.sh, command_update_linuxgsm.sh, command_wipe.sh, fix_samp.sh, install_config.sh.

fix: correct spelling errors in log messages

- Corrected spelling errors in some of the log messages for better clarity.
- Updated log messages in check_glibc.sh and fix_samp.sh.
pull/4339/head
Daniel Gibbs 2 years ago
parent
efee3e3e70
commit
3d0409fdac
No known key found for this signature in database GPG Key ID: 2076B128385E8C55
7 changed files with 21 additions and 21 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/check_glibc.sh
  2. 6
      lgsm/modules/check_permissions.sh
  3. 2
      lgsm/modules/command_backup.sh
  4. 2
      lgsm/modules/command_update_linuxgsm.sh
  5. 6
      lgsm/modules/command_wipe.sh
  6. 4
      lgsm/modules/fix_samp.sh
  7. 20
      lgsm/modules/install_config.sh

2
lgsm/modules/check_glibc.sh
View File

@ -26,6 +26,6 @@ elif [ "$(printf '%s\n'${glibc}'\n' "${glibcversion}" | sort -V | head -n 1)" !=
echo -e " * glibc installed: ${red}${glibcversion}${default}" echo -e " * glibc installed: ${red}${glibcversion}${default}"
echo -en "\n" echo -en "\n"
fn_print_information_nl "distro upgrade is required" fn_print_information_nl "distro upgrade is required"
fn_script_log_info "distro upgrade is required" fn_script_log_info "Distro upgrade is required"
fn_sleep_time_5 fn_sleep_time_5
fi fi

6
lgsm/modules/check_permissions.sh
View File

@ -182,8 +182,8 @@ fn_sys_perm_fix_manually_msg() {
# Attempt to fix /sys related permission errors if sudo is available, exits otherwise. # Attempt to fix /sys related permission errors if sudo is available, exits otherwise.
fn_sys_perm_errors_fix() { fn_sys_perm_errors_fix() {
if sudo -n true > /dev/null 2>&1; then if sudo -n true > /dev/null 2>&1; then
fn_print_dots "Automatically fixing /sys permissions" fn_print_dots "Fixing /sys permissions"
fn_script_log_info "Automatically fixing /sys permissions." fn_script_log_info "Fixing /sys permissions."
if [ "${sysdirpermerror}" == "1" ]; then if [ "${sysdirpermerror}" == "1" ]; then
sudo chmod a+rx "/sys" sudo chmod a+rx "/sys"
fi fi
@ -202,7 +202,7 @@ fn_sys_perm_errors_fix() {
# Show the user how to fix. # Show the user how to fix.
fn_sys_perm_fix_manually_msg fn_sys_perm_fix_manually_msg
else else
fn_print_ok_nl "Automatically fixing /sys permissions" fn_print_ok_nl "Fixing /sys permissions"
fn_script_log_pass "Permissions in /sys fixed" fn_script_log_pass "Permissions in /sys fixed"
fi fi
else else

2
lgsm/modules/command_backup.sh
View File

@ -142,7 +142,7 @@ fn_backup_compression() {
fn_print_info "A total of ${rootdirduexbackup} will be compressed." fn_print_info "A total of ${rootdirduexbackup} will be compressed."
fn_script_log_info "A total of ${rootdirduexbackup} will be compressed: ${backupdir}/${backupname}.tar.gz" fn_script_log_info "A total of ${rootdirduexbackup} will be compressed: ${backupdir}/${backupname}.tar.gz"
fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..." fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..."
fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress" fn_script_log_info "Backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress"
excludedir=$(fn_backup_relpath) excludedir=$(fn_backup_relpath)
# Check that excludedir is a valid path. # Check that excludedir is a valid path.

2
lgsm/modules/command_update_linuxgsm.sh
View File

@ -92,7 +92,7 @@ if [ "${script_diff}" != "" ]; then
fi fi
echo -en "copying ${selfname}...\c" echo -en "copying ${selfname}...\c"
fn_script_log_info "copying ${selfname}" fn_script_log_info "Copying ${selfname}"
cp "${tmpdir}/linuxgsm.sh" "${rootdir}/${selfname}" cp "${tmpdir}/linuxgsm.sh" "${rootdir}/${selfname}"
sed -i "s+shortname=\"core\"+shortname=\"${shortname}\"+g" "${rootdir}/${selfname}" sed -i "s+shortname=\"core\"+shortname=\"${shortname}\"+g" "${rootdir}/${selfname}"
sed -i "s+gameservername=\"core\"+gameservername=\"${gameservername}\"+g" "${rootdir}/${selfname}" sed -i "s+gameservername=\"core\"+gameservername=\"${gameservername}\"+g" "${rootdir}/${selfname}"

6
lgsm/modules/command_wipe.sh
View File

@ -30,7 +30,7 @@ fn_wipe_files() {
if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then
if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ]; then if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ]; then
echo -en "removing .map file(s)..." echo -en "removing .map file(s)..."
fn_script_log_info "removing *.map file(s)" fn_script_log_info "Removing *.map file(s)"
fn_sleep_time fn_sleep_time
find "${serveridentitydir:?}" -type f -name "*.map" -printf "%f\n" >> "${lgsmlog}" find "${serveridentitydir:?}" -type f -name "*.map" -printf "%f\n" >> "${lgsmlog}"
find "${serveridentitydir:?}" -type f -name "*.map" -delete | tee -a "${lgsmlog}" find "${serveridentitydir:?}" -type f -name "*.map" -delete | tee -a "${lgsmlog}"
@ -45,7 +45,7 @@ fn_wipe_files() {
if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then
if [ -n "$(find "${serveridentitydir}" -type f -name "*.sav*")" ]; then if [ -n "$(find "${serveridentitydir}" -type f -name "*.sav*")" ]; then
echo -en "removing .sav file(s)..." echo -en "removing .sav file(s)..."
fn_script_log_info "removing .sav file(s)" fn_script_log_info "Removing .sav file(s)"
fn_sleep_time fn_sleep_time
find "${serveridentitydir:?}" -type f -name "*.sav*" -printf "%f\n" >> "${lgsmlog}" find "${serveridentitydir:?}" -type f -name "*.sav*" -printf "%f\n" >> "${lgsmlog}"
find "${serveridentitydir:?}" -type f -name "*.sav*" -delete find "${serveridentitydir:?}" -type f -name "*.sav*" -delete
@ -61,7 +61,7 @@ fn_wipe_files() {
if [ -n "${serverwipe}" ]; then if [ -n "${serverwipe}" ]; then
if [ -n "$(find "${serveridentitydir}" -type f ! -name 'player.tokens.db' -name "*.db")" ]; then if [ -n "$(find "${serveridentitydir}" -type f ! -name 'player.tokens.db' -name "*.db")" ]; then
echo -en "removing .db file(s)..." echo -en "removing .db file(s)..."
fn_script_log_info "removing .db file(s)" fn_script_log_info "Removing .db file(s)"
fn_sleep_time fn_sleep_time
find "${serveridentitydir:?}" -type f ! -name 'player.tokens.db' -name "*.db" -printf "%f\n" >> "${lgsmlog}" find "${serveridentitydir:?}" -type f ! -name 'player.tokens.db' -name "*.db" -printf "%f\n" >> "${lgsmlog}"
find "${serveridentitydir:?}" -type f ! -name 'player.tokens.db' -name "*.db" -delete find "${serveridentitydir:?}" -type f ! -name 'player.tokens.db' -name "*.db" -delete

4
lgsm/modules/fix_samp.sh
View File

@ -15,7 +15,7 @@ if [ -f "${servercfgfullpath}" ]; then
if [ "${currentpass}" == "${defaultpass}" ]; then if [ "${currentpass}" == "${defaultpass}" ]; then
fixname="change default rcon password" fixname="change default rcon password"
fn_fix_msg_start fn_fix_msg_start
fn_script_log_info "changing rcon/admin password." fn_script_log_info "Changing rcon/admin password."
randomstring=$(tr -dc 'A-Za-z0-9_' < /dev/urandom 2> /dev/null | head -c 8 | xargs) randomstring=$(tr -dc 'A-Za-z0-9_' < /dev/urandom 2> /dev/null | head -c 8 | xargs)
rconpass="admin${randomstring}" rconpass="admin${randomstring}"
sed -i "s/rcon_password changeme/rcon_password ${rconpass}/g" "${servercfgfullpath}" sed -i "s/rcon_password changeme/rcon_password ${rconpass}/g" "${servercfgfullpath}"
@ -27,7 +27,7 @@ if [ -f "${servercfgfullpath}" ]; then
if [ "${currenthostname}" == "${defaulthostname}" ]; then if [ "${currenthostname}" == "${defaulthostname}" ]; then
fixname="change default hostname" fixname="change default hostname"
fn_fix_msg_start fn_fix_msg_start
fn_script_log_info "changing default hostname to LinuxGSM" fn_script_log_info "Changing default hostname to LinuxGSM"
sed -i "s/hostname ${defaulthostname}/hostname LinuxGSM/g" "${servercfgfullpath}" sed -i "s/hostname ${defaulthostname}/hostname LinuxGSM/g" "${servercfgfullpath}"
fn_fix_msg_end fn_fix_msg_end
fi fi

20
lgsm/modules/install_config.sh
View File

@ -11,7 +11,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_check_cfgdir() { fn_check_cfgdir() {
if [ ! -d "${servercfgdir}" ]; then if [ ! -d "${servercfgdir}" ]; then
echo -e "creating ${servercfgdir} config directory." echo -e "creating ${servercfgdir} config directory."
fn_script_log_info "creating ${servercfgdir} config directory." fn_script_log_info "Creating ${servercfgdir} config directory."
mkdir -pv "${servercfgdir}" mkdir -pv "${servercfgdir}"
fi fi
} }
@ -38,7 +38,7 @@ fn_default_config_remote() {
for config in "${array_configs[@]}"; do for config in "${array_configs[@]}"; do
# every config is copied # every config is copied
echo -e "copying ${config} config file." echo -e "copying ${config} config file."
fn_script_log_info "copying ${servercfg} config file." fn_script_log_info "Copying ${servercfg} config file."
if [ "${config}" == "${servercfgdefault}" ]; then if [ "${config}" == "${servercfgdefault}" ]; then
mkdir -p "${servercfgdir}" mkdir -p "${servercfgdir}"
cp -nv "${lgsmdir}/config-default/config-game/${config}" "${servercfgfullpath}" cp -nv "${lgsmdir}/config-default/config-game/${config}" "${servercfgfullpath}"
@ -82,7 +82,7 @@ fn_set_config_vars() {
servername="LinuxGSM" servername="LinuxGSM"
rconpass="admin${randomstring}" rconpass="admin${randomstring}"
echo -e "changing hostname." echo -e "changing hostname."
fn_script_log_info "changing hostname." fn_script_log_info "Changing hostname."
fn_sleep_time fn_sleep_time
# prevents var from being overwritten with the servername. # prevents var from being overwritten with the servername.
if grep -q "SERVERNAME=SERVERNAME" "${lgsmdir}/config-default/config-game/${config}" 2> /dev/null; then if grep -q "SERVERNAME=SERVERNAME" "${lgsmdir}/config-default/config-game/${config}" 2> /dev/null; then
@ -93,7 +93,7 @@ fn_set_config_vars() {
sed -i "s/SERVERNAME/${servername}/g" "${servercfgfullpath}" sed -i "s/SERVERNAME/${servername}/g" "${servercfgfullpath}"
fi fi
echo -e "changing rcon/admin password." echo -e "changing rcon/admin password."
fn_script_log_info "changing rcon/admin password." fn_script_log_info "Changing rcon/admin password."
if [ "${shortname}" == "squad" ]; then if [ "${shortname}" == "squad" ]; then
sed -i "s/ADMINPASSWORD/${rconpass}/g" "${servercfgdir}/Rcon.cfg" sed -i "s/ADMINPASSWORD/${rconpass}/g" "${servercfgdir}/Rcon.cfg"
else else
@ -112,15 +112,15 @@ fn_set_dst_config_vars() {
## cluster.ini ## cluster.ini
if grep -Fq "SERVERNAME" "${clustercfgfullpath}"; then if grep -Fq "SERVERNAME" "${clustercfgfullpath}"; then
echo -e "changing server name." echo -e "changing server name."
fn_script_log_info "changing server name." fn_script_log_info "Changing server name."
sed -i "s/SERVERNAME/LinuxGSM/g" "${clustercfgfullpath}" sed -i "s/SERVERNAME/LinuxGSM/g" "${clustercfgfullpath}"
fn_sleep_time fn_sleep_time
echo -e "changing shard mode." echo -e "changing shard mode."
fn_script_log_info "changing shard mode." fn_script_log_info "Changing shard mode."
sed -i "s/USESHARDING/${sharding}/g" "${clustercfgfullpath}" sed -i "s/USESHARDING/${sharding}/g" "${clustercfgfullpath}"
fn_sleep_time fn_sleep_time
echo -e "randomizing cluster key." echo -e "randomizing cluster key."
fn_script_log_info "randomizing cluster key." fn_script_log_info "Randomizing cluster key."
randomstring=$(tr -dc 'A-Za-z0-9_' < /dev/urandom 2> /dev/null | head -c 8 | xargs) randomstring=$(tr -dc 'A-Za-z0-9_' < /dev/urandom 2> /dev/null | head -c 8 | xargs)
sed -i "s/CLUSTERKEY/${randomstring}/g" "${clustercfgfullpath}" sed -i "s/CLUSTERKEY/${randomstring}/g" "${clustercfgfullpath}"
fn_sleep_time fn_sleep_time
@ -139,18 +139,18 @@ fn_set_dst_config_vars() {
fi fi
echo -e "changing shard name." echo -e "changing shard name."
fn_script_log_info "changing shard name." fn_script_log_info "Changing shard name."
sed -i "s/SHARDNAME/${shard}/g" "${servercfgfullpath}" sed -i "s/SHARDNAME/${shard}/g" "${servercfgfullpath}"
fn_sleep_time fn_sleep_time
echo -e "changing master setting." echo -e "changing master setting."
fn_script_log_info "changing master setting." fn_script_log_info "Changing master setting."
sed -i "s/ISMASTER/${master}/g" "${servercfgfullpath}" sed -i "s/ISMASTER/${master}/g" "${servercfgfullpath}"
fn_sleep_time fn_sleep_time
## worldgenoverride.lua ## worldgenoverride.lua
if [ "${cave}" == "true" ]; then if [ "${cave}" == "true" ]; then
echo -e "defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua." echo -e "defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua."
fn_script_log_info "defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua." fn_script_log_info "Defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua."
echo 'return { override_enabled = true, preset = "DST_CAVE", }' > "${servercfgdir}/worldgenoverride.lua" echo 'return { override_enabled = true, preset = "DST_CAVE", }' > "${servercfgdir}/worldgenoverride.lua"
fi fi
fn_sleep_time fn_sleep_time

Write Preview
Loading…
Cancel
Save