From 43cc567479ee493e669d0bedc6fe58f9f7c5026a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 21 Jul 2020 11:52:33 +0100
Subject: [PATCH] remove reference to random seed and salt

---
 .../config-lgsm/rustserver/_default.cfg              | 12 +++---------
 lgsm/functions/command_wipe.sh                       |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
index c0ece1464..280b03033 100644
--- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
@@ -17,21 +17,15 @@ rconpassword="CHANGE_ME"
 rconweb="1" # Value is: 1 for the Facepunch web panel; 0 for RCON tools like Rusty or Rustadmin.
 servername="Rust"
 maxplayers="50"
-seed="random" # default: random, range: 1-2147483647, used to reproduce a procedural map.
-salt="random" # default: random, range: unknown, used to recover a known setting from an existing map.
+seed="" # range: 1-2147483647, used to reproduce a procedural map.
+salt="" # range: unknown, used to recover a known setting from an existing map.
 worldsize="3000" # default: 3000, range: 1000-6000, map size in meters.
 saveinterval="300" # Auto-save in seconds.
 tickrate="30" # default: 30, range: 15-100.
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-if [ "${seed}" ]||[ "${seed}" != "random" ]; then
-	conditionalseed="+server.seed ${seed}"
-fi
-if [ "${salt}" ]||[ "${salt}" != "random" ]; then
-	conditionalsalt="+server.salt ${salt}"
-fi
-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"
+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"
 }
 
 #### LinuxGSM Settings ####
diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh
index 4d1157f47..66b335446 100644
--- a/lgsm/functions/command_wipe.sh
+++ b/lgsm/functions/command_wipe.sh
@@ -188,7 +188,7 @@ fn_wipe_warning(){
 fn_print_dots ""
 check.sh
 
-# Check if wipe is needed.
+# Check if there is something to wipe.
 if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then
 	fn_wipe_warning
 	check_status.sh