Merge branch 'develop' into fix/steamcmd-updateonstart

lgsm/config-default/config-lgsm/inssserver/_default.cfg

@@ -19,12 +19,13 @@ defaultscenario="Scenario_Crossing_Push_Security"
 maxplayers="28"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+## Parameter Docs: https://sandstorm-support.newworldinteractive.com/hc/en-us/articles/360049211072-Server-Admin-Guide
 fn_parms(){
 	# Allows serverpassword to work with parameters
-	if [ "${serverpassword}" != "NOT SET" ]; then
+	if [ "${serverpassword}" != "" ]; then
-		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password="${serverpassword}" -hostname="${servername}" -log"
+		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?password='${serverpassword}' -Port=${port} -QueryPort=${queryport} -hostname="${servername}" -log"
 	else
-		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -hostname="${servername}" -log"
+		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers} -Port=${port} -QueryPort=${queryport} -hostname='${servername}' -log"
 	fi
 }
 
@@ -170,7 +171,6 @@ executable="./InsurgencyServer-Linux-Shipping"
 servercfgdir="${systemdir}/Saved/Config/LinuxServer"
 servercfg="Game.ini"
 servercfgdefault="Game.ini"
-servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
 backupdir="${lgsmdir}/backup"

lgsm/functions/check_deps.sh

@@ -464,6 +464,9 @@ fn_deps_build_debian(){
 	# Post Scriptum
 	elif [ "${shortname}" == "pstbs" ]; then
 		array_deps_required+=( libgconf-2-4 )
+	# Pavlov VR
+	elif [ "${shortname}" == "pvr" ]; then
+		array_deps_required+=( libc++1 )
 	fi
 	fn_deps_email
 	fn_check_loop
@@ -579,6 +582,9 @@ fn_deps_build_redhat(){
 	# Post Scriptum
 	elif [ "${shortname}" == "pstbs" ]; then
 		array_deps_required+=( GConf2 )
+	# Pavlov VR
+	elif [ "${shortname}" == "pvr" ]; then
+		array_deps_required+=( libcxx )
 	fi
 	fn_deps_email
 	fn_check_loop

lgsm/functions/command_dev_detect_deps.sh

@@ -155,6 +155,11 @@ while read -r lib; do
 		echo -e "libfreetype6" >> "${tmpdir}/.depdetect_ubuntu_list"
 		echo -e "libfreetype6" >> "${tmpdir}/.depdetect_debian_list"
 		libdetected=1
+	elif [ "${lib}" == "libc++.so.1" ]; then
+		echo -e "libcxx" >> "${tmpdir}/.depdetect_centos_list"
+		echo -e "libc++1" >> "${tmpdir}/.depdetect_ubuntu_list"
+		echo -e "libc++1" >> "${tmpdir}/.depdetect_debian_list"
+		libdetected=1
 	fi
 
 	if [ "${libdetected}" != "1" ]; then

lgsm/functions/command_wipe.sh

@@ -38,19 +38,6 @@ fn_wipe_server_files(){
 		fn_sleep_time
 		fn_script_log_pass "No procedural map file to remove"
 	fi
-	# Wipe procedural map save.
-	if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then
-		echo -en "removing map saves proceduralmap.*.sav file(s)..."
-		fn_sleep_time
-		fn_script_log_info "Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav"
-		find "${serveridentitydir:?}" -type f -name "proceduralmap.*.sav" -delete | tee -a "${lgsmlog}"
-		fn_wipe_exit_code
-		fn_sleep_time
-	else
-		echo -e "no procedural map save to remove"
-		fn_sleep_time
-		fn_script_log_pass "No procedural map save to remove"
-	fi
 	# Wipe Barren map.
 	if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then
 		echo -en "removing barren map barren*.map file(s)..."
@@ -64,19 +51,6 @@ fn_wipe_server_files(){
 		fn_sleep_time
 		fn_script_log_pass "No barren map file to remove"
 	fi
-	# Wipe barren map save.
-	if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then
-		echo -en "removing barren map saves barren*.sav file(s)..."
-		fn_sleep_time
-		fn_script_log_info "Removing barren map save(s): ${serveridentitydir}/barren*.sav"
-		find "${serveridentitydir:?}" -type f -name "barren*.sav" -delete | tee -a "${lgsmlog}"
-		fn_wipe_exit_code
-		fn_sleep_time
-	else
-		echo -e "no barren map save to remove"
-		fn_sleep_time
-		fn_script_log_pass "No barren map save to remove."
-	fi
 	# Wipe custom map.
 	if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ]; then
 		echo -en "removing custom map file(s)..."
@@ -91,11 +65,11 @@ fn_wipe_server_files(){
 		fn_script_log_pass "No map file to remove"
 	fi
 	# Wipe custom map save.
-	if [ -n "$(find "${serveridentitydir}" -type f -name "*.sav")" ]; then
+	if [ -n "$(find "${serveridentitydir}" -type f -name "*.sav*")" ]; then
-		echo -en "removing map save *.sav file(s)..."
+		echo -en "removing map save *.sav* file(s)..."
 		fn_sleep_time
-		fn_script_log_info "Removing map save(s): ${serveridentitydir}/*.sav"
+		fn_script_log_info "Removing map save(s): ${serveridentitydir}/*.sav*"
-		find "${serveridentitydir:?}" -type f -name "*.sav" -delete | tee -a "${lgsmlog}"
+		find "${serveridentitydir:?}" -type f -name "*.sav*" -delete | tee -a "${lgsmlog}"
 		fn_wipe_exit_code
 		fn_sleep_time
 	else
@@ -228,7 +202,7 @@ fn_print_dots ""
 check.sh
 
 # 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
+if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "*.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
 	if [ "${status}" != "0" ]; then

lgsm/functions/info_config.sh

@@ -405,30 +405,6 @@ fn_info_config_factorio(){
 	fi
 }
 
-fn_info_config_inss(){
-	if [ ! -f "${servercfgfullpath}" ]; then
-		rconenabled="${unavailable}"
-		rconpassword="${unavailable}"
-		rconport="${zero}"
-		maxplayers="${zero}"
-		port="${zero}"
-		queryport="${zero}"
-		queryenabled="${unavailable}"
-		rconport="${zero}"
-		gamemode="${unavailable}"
-		gameworld="${unavailable}"
-	else
-		rconenabled=$(grep "bEnabled" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-		rconpassword=$(grep "Password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-		rconport=$(grep "ListenPort" "${servercfgfullpath}" | tr -cd '[:digit:]')
-
-		# Not Set
-		rconenabled=${rconenabled:-"NOT SET"}
-		rconpassword=${rconpassword:-"NOT SET"}
-		rconport=${rconport:-"0"}
-	fi
-}
-
 fn_info_config_minecraft(){
 	if [ ! -f "${servercfgfullpath}" ]; then
 		servername="${unavailable}"
@@ -1623,8 +1599,6 @@ elif [ "${shortname}" == "eco" ]; then
 	fn_info_config_eco
 elif [ "${shortname}" == "fctr" ]; then
 	fn_info_config_factorio
-elif [ "${shortname}" == "inss" ]; then
-	fn_info_config_inss
 elif [ "${shortname}" == "jc2" ]; then
 	fn_info_config_justcause2
 elif [ "${shortname}" == "jc3" ]; then