Skip to content

Commit 242d91d

Browse files
dgibbs64dgibbs64
authored
Merge pull request #2973 from GameServerManagers/hotfix/v20.4.1
Release v20.4.1
2 parents 7e3df5d + bb01afa commit 242d91d

File tree

11 files changed

+52
-71
lines changed

11 files changed

+52
-71
lines changed

‎lgsm/config-default/config-lgsm/rustserver/_default.cfg‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,23 @@
99
#### Game Server Settings ####
1010

1111
## Server Start Settings | https://docs.linuxgsm.com/configuration/start-parameters
12-
# More settings available after install in serverfiles/server/rust-server/server.cfg
1312
ip="0.0.0.0"
1413
port="28015"
1514
rconport="28016"
1615
appport=28082
1716
rconpassword="CHANGE_ME"
18-
rconweb="1" # Value is: 1 for Facepunch's web panel; 0 for RCON tools like Rusty or Rustadmin
17+
rconweb="1" # Value is: 1 for the Facepunch web panel; 0 for RCON tools like Rusty or Rustadmin.
1918
servername="Rust"
2019
maxplayers="50"
21-
22-
# Advanced Start Settings
23-
seed="" # default random; range : 1 to 2147483647 ; used to change or reproduce a procedural map
24-
salt="" # default random; range : unknown range ; used to recover a known setting from an existing map
25-
worldsize="3000" # default 3000; range : 1000 to 6000 ; map size in meters
26-
saveinterval="300" # Auto-save in seconds
27-
tickrate="30" # default 30; range : 15 to 100
20+
seed="" # range: 1-2147483647, used to reproduce a procedural map.
21+
salt="" # range: unknown, used to recover a known setting from an existing map.
22+
worldsize="3000" # default: 3000, range: 1000-6000, map size in meters.
23+
saveinterval="300" # Auto-save in seconds.
24+
tickrate="30" # default: 30, range: 15-100.
2825

2926
## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
3027
fn_parms(){
31-
# Specific to Rust
32-
if [ "${seed}" ]; then
33-
# If set, then add to start parms
34-
conditionalseed="+server.seed ${seed}"
35-
else
36-
# Keep randomness of the number if not set
37-
conditionalseed=""
38-
fi
39-
if [ "${salt}" ]; then
40-
# If set, then add to start parms
41-
conditionalsalt="+server.salt ${salt}"
42-
else
43-
# Keep randomness of the number if not set
44-
conditionalsalt=""
45-
fi
46-
parms="-batchmode +app.listenip ${ip} +app.port ${appport} +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${selfname}\" ${conditionalseed} ${conditionalsalt} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile"
28+
parms="-batchmode +app.listenip ${ip} +app.port ${appport} +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${selfname}\" +server.seed ${seed} +server.salt ${salt} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile"
4729
}
4830

4931
#### LinuxGSM Settings ####

‎lgsm/functions/check_config.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ fi
2020
if [ "${shortname}" == "rust" ]; then
2121
if [ -z "${rconpassword}" ]; then
2222
fn_print_dots ""
23-
fn_print_fail_nl "RCON password is not set!"
24-
echo -e " * Not setting an RCON password causes issues with ${gamename}"
23+
fn_print_fail_nl "RCON password is not set"
2524
fn_script_log_fatal "RCON password is not set"
26-
fn_script_log_fatal "Not setting an RCON password causes issues with ${gamename}"
2725
core_exit.sh
2826
elif [ "${rconpassword}" == "CHANGE_ME" ]; then
2927
fn_print_dots ""
30-
fn_print_warn_nl "Default RCON Password detected!"
31-
echo -e " * Having ${rconpassword} as a password is not very safe."
28+
fn_print_warn_nl "Default RCON Password detected"
3229
fn_script_log_warn "Default RCON Password detected"
3330
fi
3431
fi

‎lgsm/functions/command_wipe.sh‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn_wipe_server_files(){
2626
fn_print_start_nl "Wiping server"
2727
fn_script_log_info "Wiping server"
2828
# Wipe procedural map.
29-
if [ "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.map")" ]; then
29+
if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.map")" ]; then
3030
echo -en "removing procedural map proceduralmap.*.map file(s)..."
3131
fn_sleep_time
3232
fn_script_log_info "Removing procedural map file(s): ${serveridentitydir}/proceduralmap.*.map"
@@ -39,7 +39,7 @@ fn_wipe_server_files(){
3939
fn_script_log_pass "No procedural map file to remove"
4040
fi
4141
# Wipe procedural map save.
42-
if [ "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then
42+
if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then
4343
echo -en "removing map saves proceduralmap.*.sav file(s)..."
4444
fn_sleep_time
4545
fn_script_log_info "Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav"
@@ -52,7 +52,7 @@ fn_wipe_server_files(){
5252
fn_script_log_pass "No procedural map save to remove"
5353
fi
5454
# Wipe Barren map.
55-
if [ "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then
55+
if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then
5656
echo -en "removing barren map barren*.map file(s)..."
5757
fn_sleep_time
5858
fn_script_log_info "Removing map file(s): ${serveridentitydir}/barren*.map"
@@ -65,7 +65,7 @@ fn_wipe_server_files(){
6565
fn_script_log_pass "No barren map file to remove"
6666
fi
6767
# Wipe barren map save.
68-
if [ "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then
68+
if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then
6969
echo -en "removing barren map saves barren*.sav file(s)..."
7070
fn_sleep_time
7171
fn_script_log_info "Removing barren map save(s): ${serveridentitydir}/barren*.sav"
@@ -98,7 +98,7 @@ fn_wipe_server_files(){
9898
# We do not print additional information if there is nothing to remove since this might be obsolete.
9999
fi
100100
# Wipe sv.files.
101-
if [ "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then
101+
if [ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then
102102
echo -en "removing server misc srv.files*.db file(s)..."
103103
fn_sleep_time
104104
fn_script_log_info "Removing server misc files: ${serveridentitydir}/sv.files.*.db"
@@ -108,7 +108,7 @@ fn_wipe_server_files(){
108108
# No further information if not found because it should I could not get this file showing up.
109109
fi
110110
# Wipe player death files.
111-
if [ "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]; then
111+
if [ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]; then
112112
echo -en "removing player deaths player.deaths.*.db file(s)..."
113113
fn_sleep_time
114114
fn_script_log_info "Removing player death files: ${serveridentitydir}/player.deaths.*.db"
@@ -122,7 +122,7 @@ fn_wipe_server_files(){
122122
fi
123123
# Wipe blueprints only if full-wipe command was used.
124124
if [ "${fullwipe}" == "1" ]; then
125-
if [ "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then
125+
if [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then
126126
echo -en "removing blueprints player.blueprints.*.db file(s)..."
127127
fn_sleep_time
128128
fn_script_log_info "Removing blueprint file(s): ${serveridentitydir}/player.blueprints.*.db"
@@ -134,7 +134,7 @@ fn_wipe_server_files(){
134134
fn_sleep_time
135135
fn_script_log_pass "No blueprint file to remove"
136136
fi
137-
elif [ "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then
137+
elif [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then
138138
echo -e "keeping blueprints"
139139
fn_sleep_time
140140
fn_script_log_info "Keeping blueprints"
@@ -144,8 +144,8 @@ fn_wipe_server_files(){
144144
fn_script_log_pass "No blueprints found"
145145
fi
146146
# Wipe some logs that might be there.
147-
if [ "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then
148-
echo -en "removing Log files..."
147+
if [ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then
148+
echo -en "removing log files..."
149149
fn_sleep_time
150150
fn_script_log_info "Removing log files: ${serveridentitydir}/Log.*.txt"
151151
find "${serveridentitydir:?}" -type f -name "Log.*.txt" -delete
@@ -204,8 +204,10 @@ if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[
204204
else
205205
fn_wipe_server_files
206206
fi
207-
fn_print_ok_nl ""
208-
fn_script_log_pass "Wiping server"
207+
fn_print_complete_nl "Wiping ${selfname}"
208+
fn_script_log_pass "Wiping ${selfname}"
209+
else
210+
fn_print_ok_nl "Wipe not required"
211+
fn_script_log_pass "Wipe not required"
209212
fi
210-
211213
core_exit.sh

‎lgsm/functions/core_dl.sh‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
2121

2222
fn_dl_steamcmd(){
2323
fn_print_start_nl "${remotelocation}"
24-
fn_script_log_info "${commandaction} server: ${remotelocation}"
24+
fn_script_log_info "${commandaction} ${selfname}: ${remotelocation}"
2525
if [ -n "${branch}" ]; then
2626
echo -e "Branch: ${branch}"
2727
fn_script_log_info "Branch: ${branch}"
@@ -91,43 +91,43 @@ fn_dl_steamcmd(){
9191
if [ -n "$(grep "Error!" "${steamcmdlog}" | tail -1)" ]||[ -n "$(grep "ERROR!" "${steamcmdlog}" | tail -1)" ]; then
9292
# Not enough space.
9393
if [ -n "$(grep "0x202" "${steamcmdlog}" | tail -1)" ]; then
94-
fn_print_failure_nl "${commandaction} server: ${remotelocation}: Not enough space to download server files"
95-
fn_script_log_fatal "${commandaction} server: ${remotelocation}: Not enough space to download server files"
94+
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Not enough space to download server files"
95+
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Not enough space to download server files"
9696
core_exit.sh
9797
# Need tp purchase game.
9898
elif [ -n "$(grep "No subscription" "${steamcmdlog}" | tail -1)" ]; then
99-
fn_print_failure_nl "${commandaction} server: ${remotelocation}: Steam account does not have a license for the required game"
100-
fn_script_log_fatal "${commandaction} server: ${remotelocation}: Steam account does not have a license for the required game"
99+
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Steam account does not have a license for the required game"
100+
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Steam account does not have a license for the required game"
101101
core_exit.sh
102102
# Two-factor authentication failure
103103
elif [ -n "$(grep "Two-factor code mismatch" "${steamcmdlog}" | tail -1)" ]; then
104-
fn_print_failure_nl "${commandaction} server: ${remotelocation}: Two-factor authentication failure"
105-
fn_script_log_fatal "${commandaction} server: ${remotelocation}: Two-factor authentication failure"
104+
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Two-factor authentication failure"
105+
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Two-factor authentication failure"
106106
core_exit.sh
107107
# Incorrect Branch password
108108
elif [ -n "$(grep "Password check for AppId" "${steamcmdlog}" | tail -1)" ]; then
109-
fn_print_failure_nl "${commandaction} server: ${remotelocation}: betapassword is incorrect"
110-
fn_script_log_fatal "${commandaction} server: ${remotelocation}: betapassword is incorrect"
109+
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: betapassword is incorrect"
110+
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: betapassword is incorrect"
111111
core_exit.sh
112112
# Update did not finish.
113113
elif [ -n "$(grep "0x402" "${steamcmdlog}" | tail -1)" ]||[ -n "$(grep "0x602" "${steamcmdlog}" | tail -1)" ]; then
114-
fn_print_error2_nl "${commandaction} server: ${remotelocation}: Update required but not completed - check network"
115-
fn_script_log_error "${commandaction} server: ${remotelocation}: Update required but not completed - check network"
114+
fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Update required but not completed - check network"
115+
fn_script_log_error "${commandaction} ${selfname}: ${remotelocation}: Update required but not completed - check network"
116116
else
117-
fn_print_error2_nl "${commandaction} server: ${remotelocation}: Unknown error occured"
118-
fn_script_log_error "${commandaction} server: ${remotelocation}: Unknown error occured"
117+
fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Unknown error occured"
118+
fn_script_log_error "${commandaction} ${selfname}: ${remotelocation}: Unknown error occured"
119119
fi
120120
elif [ "${exitcode}" != "0" ]; then
121-
fn_print_error2_nl "${commandaction} server: ${remotelocation}: Exit code: ${exitcode}"
122-
fn_script_log_error "${commandaction} server: ${remotelocation}: Exit code: ${exitcode}"
121+
fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Exit code: ${exitcode}"
122+
fn_script_log_error "${commandaction} ${selfname}: ${remotelocation}: Exit code: ${exitcode}"
123123
else
124-
fn_print_complete_nl "${commandaction} server: ${remotelocation}"
125-
fn_script_log_pass "${commandaction} server: ${remotelocation}"
124+
fn_print_complete_nl "${commandaction} ${selfname}: ${remotelocation}"
125+
fn_script_log_pass "${commandaction} ${selfname}: ${remotelocation}"
126126
fi
127127

128128
if [ "${counter}" -gt "10" ]; then
129-
fn_print_failure_nl "${commandaction} server: ${remotelocation}: Did not complete the download, too many retrys"
130-
fn_script_log_fatal "${commandaction} server: ${remotelocation}: Did not complete the download, too many retrys"
129+
fn_print_failure_nl "${commandaction} ${selfname}: ${remotelocation}: Did not complete the download, too many retrys"
130+
fn_script_log_fatal "${commandaction} ${selfname}: ${remotelocation}: Did not complete the download, too many retrys"
131131
core_exit.sh
132132
fi
133133
done

‎lgsm/functions/core_functions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
99

10-
modulesversion="v20.4.0"
10+
modulesversion="v20.4.1"
1111

1212
# Core
1313

‎lgsm/functions/core_getopt.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ cmd_mods_update=( "mu;mods-update" "command_mods_update.sh" "Update installed mo
3636
# Server specific.
3737
cmd_change_password=( "pw;change-password" "command_ts3_server_pass.sh" "Change TS3 serveradmin password." )
3838
cmd_install_default_resources=( "ir;install-default-resources" "command_install_resources_mta.sh" "Install the MTA default resources." )
39-
cmd_wipe=( "wi;wipe" "command_wipe.sh" "Wipe your main game server data." )
40-
cmd_wipeall=( "wa;wipeall" "wipeall=1; command_wipe.sh" "Wipe your game server data and blueprints." )
39+
cmd_wipe=( "w;wipe;wi" "command_wipe.sh" "Map assets are wiped and blueprints are kept." )
40+
cmd_full_wipe=( "fw;full-wipe;wa;wipeall" "fullwipe=1; command_wipe.sh" "Map assets and blueprints are wiped." )
4141
cmd_map_compressor_u99=( "mc;map-compressor" "compress_ut99_maps.sh" "Compresses all ${gamename} server maps." )
4242
cmd_map_compressor_u2=( "mc;map-compressor" "compress_unreal2_maps.sh" "Compresses all ${gamename} server maps." )
4343
cmd_install_cdkey=( "cd;server-cd-key" "install_ut2k4_key.sh" "Add your server cd key." )
@@ -94,7 +94,7 @@ fi
9494

9595
# Unreal exclusive.
9696
if [ "${shortname}" == "rust" ]; then
97-
currentopt+=( "${cmd_wipe[@]}" "${cmd_wipeall[@]}" )
97+
currentopt+=( "${cmd_wipe[@]}" "${cmd_full_wipe[@]}" )
9898
fi
9999
if [ "${engine}" == "unreal2" ]; then
100100
if [ "${shortname}" == "ut2k4" ]; then

‎linuxgsm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v20.4.0"
23+
version="v20.4.1"
2424
shortname="core"
2525
gameservername="core"
2626
commandname="CORE"

‎tests/tests_fctrserver.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v20.4.0"
23+
version="v20.4.1"
2424
shortname="fctr"
2525
gameservername="fctrserver"
2626
commandname="CORE"

‎tests/tests_jc2server.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v20.4.0"
23+
version="v20.4.1"
2424
shortname="jc2"
2525
gameservername="jc2server"
2626
commandname="CORE"

‎tests/tests_mcserver.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v20.4.0"
23+
version="v20.4.1"
2424
shortname="mc"
2525
gameservername="mcserver"
2626
commandname="CORE"

0 commit comments

Comments
 (0)