Skip to content

Commit

Permalink
ui changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dgibbs64 committed Nov 24, 2024
1 parent d002994 commit 7d9df68
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
5 changes: 5 additions & 0 deletions lgsm/modules/command_dev_ui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,9 @@ fn_print_update_eol_nl
fn_print "Print skip message with eol"
fn_print_skip_eol_nl

fn_print_nl ""
fn_print_nl "${lightgreen}Restart warning${default}"
fn_messages_separator
fn_print_restart_warning

core_exit.sh
25 changes: 12 additions & 13 deletions lgsm/modules/command_wipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,29 @@ fn_wipe_files() {
# Remove Map files
if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then
if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ]; then
echo -en "removing .map file(s)..."
fn_print "removing .map file(s)..."
fn_script_log_info "Removing *.map file(s)"
fn_sleep_time
find "${serveridentitydir:?}" -type f -name "*.map" -printf "%f\n" >> "${lgsmlog}"
find "${serveridentitydir:?}" -type f -name "*.map" -delete | tee -a "${lgsmlog}"
fn_wipe_exit_code
else
echo -e "no .map file(s) to remove"
fn_print_nl "no .map file(s) to remove"
fn_sleep_time
fn_script_log_pass "no .map file(s) to remove"
fi
fi
# Remove Save files.
if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then
if [ -n "$(find "${serveridentitydir}" -type f -name "*.sav*")" ]; then
echo -en "removing .sav file(s)..."
fn_print "removing .sav file(s)..."
fn_script_log_info "Removing .sav file(s)"
fn_sleep_time
find "${serveridentitydir:?}" -type f -name "*.sav*" -printf "%f\n" >> "${lgsmlog}"
find "${serveridentitydir:?}" -type f -name "*.sav*" -delete
fn_wipe_exit_code
else
echo -e "no .sav file(s) to remove"
fn_print_nl "no .sav file(s) to remove"
fn_script_log_pass "no .sav file(s) to remove"
fn_sleep_time
fi
Expand All @@ -60,14 +60,14 @@ fn_wipe_files() {
# Excluding player.tokens.db for Rust+.
if [ -n "${serverwipe}" ]; then
if [ -n "$(find "${serveridentitydir}" -type f ! -name 'player.tokens.db' -name "*.db")" ]; then
echo -en "removing .db file(s)..."
fn_print "removing .db file(s)..."
fn_script_log_info "Removing .db file(s)"
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" -delete
fn_wipe_exit_code
else
echo -e "no .db file(s) to remove"
fn_print_nl "no .db file(s) to remove"
fn_sleep_time
fn_script_log_pass "no .db file(s) to remove"
fi
Expand Down Expand Up @@ -104,13 +104,13 @@ fn_full_wipe_warning() {
fn_print_warn_nl "Server wipe will reset the map data and remove blueprint data"
}

# Will change the seed if the seed is not defined by the user.
# If the seed is not defined by the user, generate a seed file.
fn_wipe_random_seed() {
if [ -f "${datadir}/${selfname}-seed.txt" ] && [ -n "${randomseed}" ]; then
shuf -i 1-2147483647 -n 1 > "${datadir}/${selfname}-seed.txt"
seed=$(cat "${datadir}/${selfname}-seed.txt")
randomseed=1
echo -en "generating new random seed (${cyan}${seed}${default})..."
fn_print "generating new random seed (${cyan}${seed}${default})..."
fn_script_log_pass "Generating new random seed (${cyan}${seed}${default})"
fn_sleep_time
fn_print_ok_eol_nl
Expand All @@ -120,32 +120,31 @@ fn_wipe_random_seed() {
# A summary of what wipe is going to do.
fn_wipe_details() {
fn_print_information_nl "Wipe does not remove Rust+ data."
echo -en "* Wipe map data: "
fn_print "* Wipe map data "
if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then
fn_print_yes_eol_nl
else
fn_print_no_eol_nl
fi

echo -en "* Wipe blueprint data: "
fn_print "* Wipe blueprint data "
if [ -n "${serverwipe}" ]; then
fn_print_yes_eol_nl
else
fn_print_no_eol_nl
fi

echo -en "* Change Procedural Map seed: "
fn_print "* Change Procedural Map seed "
if [ -n "${randomseed}" ]; then
fn_print_yes_eol_nl
else
fn_print_no_eol_nl
fi
}

fn_print_dots ""
check.sh
fix_rust.sh

fn_print_dots ""
# Check if there is something to wipe.
if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ] || [ -n "$(find "${serveridentitydir}" -type f -name "*.sav*")" ] && [ -n "$(find "${serveridentitydir}" -type f ! -name 'player.tokens.db' -name "*.db")" ]; then
if [ -n "${serverwipe}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion lgsm/modules/fix_rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}:${serverfiles}/RustDedicated_Data/Plugins/x86_64"

# Part of random seed feature.
# If seed is not defined by user generate a seed file.
# If the seed is not defined by the user, generate a seed file.
if [ -z "${seed}" ] || [ "${seed}" == "0" ]; then
if [ ! -f "${datadir}/${selfname}-seed.txt" ]; then
shuf -i 1-2147483647 -n 1 > "${datadir}/${selfname}-seed.txt"
Expand Down

0 comments on commit 7d9df68

Please sign in to comment.