Merge pull request #875 from dgibbs64/development

Ark server updates to enable the details command

ARKSurvivalEvolved/arkserver

@@ -20,7 +20,7 @@ version="210516"
 emailalert="off"
 email="[email protected]"
 
-# Pushbullet 
+# Pushbullet
 # https://www.pushbullet.com/#settings
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -30,11 +30,17 @@ steamuser="anonymous"
 steampass=""
 
 # Start Variables
+servername="ark-server"
+port="7778"
+queryport="27015"
+rconport="32330"
+rconpassword="" # Set to enable rcon
+maxplayers="50"
 ip="0.0.0.0"
 updateonstart="off"
 
 fn_parms(){
-parms="TheIsland?listen"
+    parms="TheIsland?listen?MultiHome=${ip}?SessionName=${servername}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port}?ServerAdminPassword=${rconpassword}"
 }
 
 #### Advanced Variables ####

lgsm/functions/command_details.sh

@@ -288,7 +288,7 @@ fn_details_ports(){
 		fi
 	done
 
-	local ports_edit_array=( "starbound" "spark" "source" "goldsource" "Rust" "Hurtworld" )
+	local ports_edit_array=( "starbound" "spark" "source" "goldsource" "Rust" "Hurtworld" "unreal4")
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then
@@ -608,4 +608,4 @@ else
 	fn_print_error_nl "Unable to detect server engine."
 fi
 
-fn_details_statusbottom
+fn_details_statusbottom

lgsm/functions/command_stop.sh

@@ -174,7 +174,7 @@ fn_stop_ark(){
         fi
 
         if [[ ${#queryport} -gt 0 ]] ; then
-                for (( pidcheck=0 ; pidcheck < ${MADPIDITER} ; pidcheck++ )) ; do
+                for (( pidcheck=0 ; pidcheck < ${MAXPIDITER} ; pidcheck++ )) ; do
                         pid=$(netstat -nap 2>/dev/null | grep ^udp[[:space:]] |\
                                 grep :${queryport}[[:space:]] | rev | awk '{print $1}' |\
                                 rev | cut -d\/ -f1)

lgsm/functions/command_validate.sh

@@ -22,8 +22,10 @@ fn_validation(){
 
 	cd "${rootdir}/steamcmd"
 
-	if [ $(command -v unbuffer) ]; then
+        if [ $(command -v unbuffer) ]; then
 		unbuffer=unbuffer
+        elif  [ $(command -v stdbuf) ]; then
+		unbuffer="stdbuf -i0 -o0 -e0"
 	fi
 
 	if [ "${engine}" == "goldsource" ]; then

lgsm/functions/install_server_files.sh

@@ -2,7 +2,7 @@
 # LGSM install_server_files.sh function
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
-lgsm_version="210516"
+lgsm_version="270516"
 
 local modulename="Install"
 
@@ -11,6 +11,8 @@ fn_install_server_files(){
 		fileurl="https://gameservermanagers.com/files/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut99-server-451-ultimate-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd"
 	elif [ "${gamename}" == "Unreal Tournament 2004" ]; then
 		fileurl="https://gameservermanagers.com/files/UnrealTournament2004/ut2004-server-3339-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut2004-server-3339-ultimate-linux.tar.bz2";  executecmd="noexecute" run="norun"; force="noforce"; md5="67c5e2cd9c2a4b04f163962ee41eff54"
+	elif [ "${gamename}" == "GoldenEye: Source" ]; then
+		fileurl="https://gameservermanagers.com/files/GoldenEyeSource/goldenEye_source_v4.2.4_server_2015_map_pack.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="goldenEye_source_v4.2.4_server_2015_map_pack.tar.bz2";  executecmd="noexecute" run="norun"; force="noforce"; md5="3148ac38acc3642b0d6d64f51f27de15"
 	fi
 	fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}"
 	fn_dl_extract "${filedir}" "${filename}" "${filesdir}"
@@ -45,6 +47,8 @@ fn_install_server_files_steamcmd(){
 			# Detects if unbuffer command is available.
 			if [ $(command -v unbuffer) ]; then
 				unbuffer=unbuffer
+                        elif  [ $(command -v stdbuf) ]; then
+		            unbuffer="stdbuf -i0 -o0 -e0"
 			fi
 
 			if [ "${counter}" -le "4" ]; then
@@ -107,4 +111,4 @@ if [ -z "${autoinstall}" ]; then
 			* ) echo "Please answer yes or no.";;
 		esac
 	done
-fi
+fi

lgsm/functions/update_dl.sh

@@ -16,6 +16,8 @@ fn_steamcmd_dl(){
 	# Detects if unbuffer command is available.
 	if [ $(command -v unbuffer) ]; then
 		unbuffer=unbuffer
+        elif  [ $(command -v stdbuf) ]; then
+		unbuffer="stdbuf -i0 -o0 -e0"
 	fi
 
 	if [ "${engine}" == "goldsource" ]; then