Sfoglia il codice sorgente

Merge remote-tracking branch 'refs/remotes/origin/master' into development

Daniel Gibbs 10 anni fa
parent
commit
e9440c85d7

+ 2 - 2
BrainBread2/bb2server

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="030616"
 
 #### Variables ####
 
@@ -58,7 +58,7 @@ githubrepo="linuxgsm"
 githubbranch="master"
 
 # Steam
-appid="346330"
+appid="475370"
 
 # Server Details
 servicename="bb2-server"

+ 3 - 3
lgsm/functions/check_deps.sh

@@ -2,7 +2,7 @@
 # LGSM check_deps.sh function
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
-lgsm_version="270516"
+lgsm_version="090616"
 
 # Description: Checks that the requires dependencies are installed for LGSM.
 
@@ -126,7 +126,7 @@ if [ -n "$(command -v dpkg-query)" ]; then
 	array_deps_missing=()
 
 	# LGSM requirement for curl
-	array_deps_required=( curl ca-certificates file )
+	array_deps_required=( curl ca-certificates file bsdmainutils python )
 
 	# All servers except ts3 require tmux
 	if [ "${executable}" != "./ts3server_startscript.sh" ]; then
@@ -176,7 +176,7 @@ elif [ -n "$(command -v yum)" ]; then
 	array_deps_missing=()
 
 	# LGSM requirement for curl
-	array_deps_required=( curl )
+	array_deps_required=( curl util-linux python file )
 
 	# All servers except ts3 require tmux
 	if [ "${executable}" != "./ts3server_startscript.sh" ]; then

+ 48 - 48
lgsm/functions/command_fastdl.sh

@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributor: UltimateByte
 # Website: https://gameservermanagers.com
-lgsm_version="210216"
+lgsm_version="060616"
 
 # Description: Creates a FastDL folder
 
@@ -25,7 +25,7 @@ fn_check_bzip2(){
 	# Returns true if not installed
 	if [ -z "$(command -v bzip2)" ]; then
 		bzip2installed="0"
-		fn_printinfo "bzip2 is not installed !"
+		fn_print_info "bzip2 is not installed !"
 		fn_scriptlog "bzip2 is not installed"
 		echo -en "\n"
 		sleep 1
@@ -39,7 +39,7 @@ fn_check_bzip2(){
 
 fn_fastdl_init(){
 	# User confirmation
-	fn_printok "Welcome to LGSM's FastDL generator"
+	fn_print_ok "Welcome to LGSM's FastDL generator"
 	sleep 1
 	echo -en "\n"
 	fn_scriptlog "Started FastDL creation"
@@ -56,13 +56,13 @@ fn_fastdl_init(){
 	# Check and create folders
 	if [ ! -d "${webdir}" ]; then
 		echo ""
-		fn_printinfo "Creating FastDL directories"
+		fn_print_info "Creating FastDL directories"
 		echo -en "\n"
 		sleep 1
-		fn_printdots "Creating www directory"
+		fn_print_dots "Creating www directory"
 		sleep 0.5
 		mkdir "${webdir}"
-		fn_printok "Created www directory"
+		fn_print_ok "Created www directory"
 		fn_scriptlog "FastDL created www directory"
 		sleep 1
 		echo -en "\n"
@@ -70,10 +70,10 @@ fn_fastdl_init(){
 	if [ ! -d "${fastdldir}" ]; then
 		# No folder, won't ask for removing old ones
 		newfastdl=1
-		fn_printdots "Creating fastdl directory"
+		fn_print_dots "Creating fastdl directory"
 		sleep 0.5
 		mkdir "${fastdldir}"
-		fn_printok "Created fastdl directory"
+		fn_print_ok "Created fastdl directory"
 		fn_scriptlog "FastDL created fastdl directory"
 		sleep 1
 		echo -en "\n"
@@ -85,18 +85,18 @@ fn_fastdl_init(){
 
 fn_fastdl_config(){
 	# Global settings for FastDL creation
-	fn_printinfo "Entering configuration"
+	fn_print_info "Entering configuration"
 	fn_scriptlog "Configuration"
 	sleep 2
 	echo -en "\n"
 	# Prompt for clearing old files if folder was already here
 	if [ -n "${newfastdl}" ] && [ "${newfastdl}" == "0" ]; then
-		fn_printdots
+		fn_print_dots
 		while true; do
 			read -e -i "y" -p "Clear old FastDL files? [Y/n]" yn
 			case $yn in
-			[Yy]* ) clearoldfastdl="on"; fn_scriptlog "clearoldfastdl enabled"; fn_printok "Clearing Enabled"; break;;
-			[Nn]* ) clearoldfastdl="off"; fn_scriptlog "clearoldfastdl disabled"; fn_printok "Clearing Disabled"; break;;
+			[Yy]* ) clearoldfastdl="on"; fn_scriptlog "clearoldfastdl enabled"; fn_print_ok "Clearing Enabled"; break;;
+			[Nn]* ) clearoldfastdl="off"; fn_scriptlog "clearoldfastdl disabled"; fn_print_ok "Clearing Disabled"; break;;
 			* ) echo "Please answer yes or no.";;
 			esac
 		done
@@ -104,12 +104,12 @@ fn_fastdl_config(){
 	fi
 	# Prompt for using bzip2 if it's installed
 	if [ ${bzip2installed} == 1 ]; then
-		fn_printdots
+		fn_print_dots
 		while true; do
 			read -e -i "y" -p "Enable file compression using bzip2? [Y/n]" yn
 			case $yn in
-			[Yy]* ) bzip2enable="on"; fn_scriptlog "bzip2 enabled"; fn_printok "bzip2 Enabled"; break;;
-			[Nn]* ) bzip2enable="off"; fn_scriptlog "bzip2 disabled"; fn_printok "bzip2 Disabled"; break;;
+			[Yy]* ) bzip2enable="on"; fn_scriptlog "bzip2 enabled"; fn_print_ok "bzip2 Enabled"; break;;
+			[Nn]* ) bzip2enable="off"; fn_scriptlog "bzip2 disabled"; fn_print_ok "bzip2 Disabled"; break;;
 			* ) echo "Please answer yes or no.";;
 			esac
 		done
@@ -119,12 +119,12 @@ fn_fastdl_config(){
 
 fn_fastdl_gmod_config(){
 	# Prompt for download enforcer, that is using a .lua addfile resource generator
-	fn_printdots
+	fn_print_dots
 	while true; do
 		read -e -i "y" -p "Use client download enforcer? [Y/n]" yn
 		case $yn in
-		[Yy]* ) luaressource="on"; fn_scriptlog "DL enforcer Enabled"; fn_printok "Enforcer Enabled"; break;;
-		[Nn]* ) luaressource="off"; fn_scriptlog "DL enforcer Disabled"; fn_printok "Enforcer Disabled"; break;;
+		[Yy]* ) luaressource="on"; fn_scriptlog "DL enforcer Enabled"; fn_print_ok "Enforcer Enabled"; break;;
+		[Nn]* ) luaressource="off"; fn_scriptlog "DL enforcer Disabled"; fn_print_ok "Enforcer Disabled"; break;;
 		* ) echo "Please answer yes or no.";;
 		esac
 	done
@@ -134,11 +134,11 @@ fn_fastdl_gmod_config(){
 fn_clear_old_fastdl(){
 	# Clearing old FastDL if user answered yes
 	if [ "${clearoldfastdl}" == "on" ]; then
-		fn_printinfo "Clearing existing FastDL folder"
+		fn_print_info "Clearing existing FastDL folder"
 		fn_scriptlog "Clearing existing FastDL folder"
 		sleep 0.5
 		rm -R "${fastdldir:?}"/*
-		fn_printok "Old FastDL folder cleared"
+		fn_print_ok "Old FastDL folder cleared"
 		fn_scriptlog "Old FastDL folder cleared"
 		sleep 1
 		echo -en "\n"
@@ -148,7 +148,7 @@ fn_clear_old_fastdl(){
 fn_gmod_fastdl(){
 	# Copy all needed files for FastDL
 	echo ""
-	fn_printdots "Starting gathering all needed files"
+	fn_print_dots "Starting gathering all needed files"
 	fn_scriptlog "Starting gathering all needed files"
 	sleep 1
 	echo -en "\n"
@@ -157,64 +157,64 @@ fn_gmod_fastdl(){
 	cd "${systemdir}"
 
 	# Map Files
-	fn_printdots "Copying map files..."
+	fn_print_dots "Copying map files..."
 	fn_scriptlog "Copying map files"
 	sleep 0.5
 	find . -name '*.bsp' | cpio --quiet -updm "${fastdldir}"
-	fn_printok "Map files copied"
+	fn_print_ok "Map files copied"
 	sleep 0.5
 	echo -en "\n"
 
 	# Materials
-	fn_printdots "Copying materials..."
+	fn_print_dots "Copying materials..."
 	fn_scriptlog "Copying materials"
 	sleep 0.5
 	find . -name '*.vtf' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.vmt' | cpio --quiet -updm "${fastdldir}"
-	fn_printok "Materials copied"
+	fn_print_ok "Materials copied"
 	sleep 0.5
 	echo -en "\n"
 
 	# Models
-	fn_printdots "Copying models..."
+	fn_print_dots "Copying models..."
 	fn_scriptlog "Copying models"
 	sleep 1
 	find . -name '*.vtx' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.vvd' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.mdl' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.phy' | cpio --quiet -updm "${fastdldir}"
-	fn_printok "Models copied"
+	fn_print_ok "Models copied"
 	sleep 0.5
 	echo -en "\n"
 
 	# Particles
-	fn_printdots "Copying particles..."
+	fn_print_dots "Copying particles..."
 	fn_scriptlog "Copying particles"
 	sleep 0.5
 	find . -name '*.pcf' | cpio --quiet -updm "${fastdldir}"
-	fn_printok "Particles copied"
+	fn_print_ok "Particles copied"
 	sleep 0.5
 	echo -en "\n"
 
 	# Sounds
-	fn_printdots "Copying sounds..."
+	fn_print_dots "Copying sounds..."
 	fn_scriptlog "Copying sounds"
 	sleep 0.5
 	find . -name '*.wav' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.mp3' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.ogg' | cpio --quiet -updm "${fastdldir}"
-	fn_printok "Sounds copied"
+	fn_print_ok "Sounds copied"
 	sleep 0.5
 	echo -en "\n"
 
 	# Resources (mostly fonts)
-	fn_printdots "Copying fonts and png..."
+	fn_print_dots "Copying fonts and png..."
 	fn_scriptlog "Copying fonts and png"
 	sleep 1
 	find . -name '*.otf' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.ttf' | cpio --quiet -updm "${fastdldir}"
 	find . -name '*.png' | cpio --quiet -updm "${fastdldir}"
-	fn_printok "Fonts and png copied"
+	fn_print_ok "Fonts and png copied"
 	sleep 0.5
 	echo -en "\n"
 
@@ -223,22 +223,22 @@ fn_gmod_fastdl(){
 
 	# Correct addons folder structure for FastDL
 	if [ -d "${fastdldir}/addons" ]; then
-		fn_printinfo "Adjusting addons' file structure"
+		fn_print_info "Adjusting addons' file structure"
 		fn_scriptlog "Adjusting addon's file structure"
 		sleep 1
 		cp -Rf "${fastdldir}"/addons/*/* "${fastdldir}"
 	#Don't remove yet	rm -R "${fastdldir:?}/addons"
-		fn_printok "Adjusted addon's file structure"
+		fn_print_ok "Adjusted addon's file structure"
 		sleep 1
 		echo -en "\n"
 	fi
 
 	# Correct content that may be into a lua folder by mistake like some darkrpmodification addons
 	if [ -d "${fastdldir}/lua" ]; then
-		fn_printdots "Typical DarkRP shit detected, fixing"
+		fn_print_dots "Typical DarkRP shit detected, fixing"
 		sleep 2
 		cp -Rf "${fastdldir}/lua/"* "${fastdldir}"
-		fn_printok "Stupid DarkRP file structure fixed"
+		fn_print_ok "Stupid DarkRP file structure fixed"
 		sleep 2
 		echo -en "\n"
 	fi
@@ -250,10 +250,10 @@ fn_lua_fastdl(){
 	echo ""
 	if [ "${luaressource}" == "off" ]; then
 		if [ -f "${luafastdlfullpath}" ]; then
-			fn_printdots "Removing download enforcer"
+			fn_print_dots "Removing download enforcer"
 			sleep 1
 			rm -R "${luafastdlfullpath:?}"
-			fn_printok "Removed download enforcer"
+			fn_print_ok "Removed download enforcer"
 			fn_scriptlog "Removed old download inforcer"
 			echo -en "\n"
 			sleep 2
@@ -262,22 +262,22 @@ fn_lua_fastdl(){
 	# Remove old lua file and generate a new one if user said yes
 	if [ "${luaressource}" == "on" ]; then
 		if [ -f "${luafastdlfullpath}" ]; then
-			fn_printdots "Removing old download enforcer"
+			fn_print_dots "Removing old download enforcer"
 			sleep 1
 			rm "${luafastdlfullpath}"
-			fn_printok "Removed old download enforcer"
+			fn_print_ok "Removed old download enforcer"
 			fn_scriptlog "Removed old download enforcer"
 			echo -en "\n"
 			sleep 1
 		fi
-		fn_printdots "Generating new download enforcer"
+		fn_print_dots "Generating new download enforcer"
 		fn_scriptlog "Generating new download enforcer"
 		sleep 1
 		# Read all filenames and put them into a lua file at the right path
 		find "${fastdldir}" \( -type f ! -name "*.bz2" \) -printf '%P\n' | while read line; do
 			echo "resource.AddFile( "\""${line}"\"" )" >> ${luafastdlfullpath}
 		done
-		fn_printok "Download enforcer generated"
+		fn_print_ok "Download enforcer generated"
 		fn_scriptlog "Download enforcer generated"
 		echo -en "\n"
 		echo ""
@@ -289,14 +289,14 @@ fn_fastdl_bzip2(){
 	# Compressing using bzip2 if user said yes
 	echo ""
 	if [ ${bzip2enable} == "on" ]; then
-		fn_printinfo "Have a break, this step could take a while..."
+		fn_print_info "Have a break, this step could take a while..."
 		echo -en "\n"
 		echo ""
-		fn_printdots "Compressing files using bzip2..."
+		fn_print_dots "Compressing files using bzip2..."
 		fn_scriptlog "Compressing files using bzip2..."
 		# bzip2 all files that are not already compressed (keeping original files)
 		find "${fastdldir}" \( -type f ! -name "*.bz2" \) -exec bzip2 -qk \{\} \;
-		fn_printok "bzip2 compression done"
+		fn_print_ok "bzip2 compression done"
 		fn_scriptlog "bzip2 compression done"
 		sleep 1
 		echo -en "\n"
@@ -306,12 +306,12 @@ fn_fastdl_bzip2(){
 fn_fastdl_completed(){
 	# Finished message
 	echo ""
-	fn_printok "Congratulations, it's done !"
+	fn_print_ok "Congratulations, it's done !"
 	fn_scriptlog "FastDL job done"
 	sleep 2
 	echo -en "\n"
 	echo ""
-	fn_printinfo "Need more doc ? See https://github.com/dgibbs64/linuxgsm/wiki/FastDL"
+	fn_print_info "Need more doc ? See https://github.com/dgibbs64/linuxgsm/wiki/FastDL"
 	echo -en "\n"
 	if [ "$bzip2installed" == "0" ]; then
 	echo "By the way, you'd better install bzip2 an re-run this command !"

+ 2 - 2
lgsm/functions/command_stop.sh

@@ -2,7 +2,7 @@
 # LGSM command_stop.sh function
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
-lgsm_version="210516"
+lgsm_version="050616"
 
 # Description: Stops the server.
 
@@ -32,9 +32,9 @@ fn_stop_graceful_source(){
 		fn_print_fail "Graceful: rcon quit: "
 		fn_print_fail_eol_nl
 		fn_scriptlog "Graceful: rcon quit: FAIL"
-		fn_stop_tmux
 	fi
 	sleep 1
+	fn_stop_tmux
 }
 
 # Attempts Graceful of goldsource using rcon 'quit' command.

+ 1 - 1
lgsm/functions/fix_ins.sh

@@ -8,7 +8,7 @@ lgsm_version="210516"
 
 # Resolves ./srcds_linux: error while loading shared libraries: libtier0.so: cannot open shared object file: No such file or directory
 
-export LD_LIBRARY_PATH=:${filesdir}:${filesdir}/bin:{$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=${filesdir}:${filesdir}/bin:${LD_LIBRARY_PATH}
 
 # fix for issue #529 - gamemode not passed to debug or start
 

+ 1 - 1
lgsm/functions/update_check.sh

@@ -169,7 +169,7 @@ fn_steamcmdcheck(){
 		fn_scriptlog "${currentbuild} > ${availablebuild}"
 
 		unset updateonstart
-		info_status.sh
+		check_status.sh
 		if [ "${status}" != "0" ]; then
 			command_stop.sh
 			update_dl.sh