Merge pull request #1077 from cedarlug/master

ARMA3: Fixing tmux/debug module discrepancies

7DaysToDie/sdtdserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -51,6 +51,11 @@ githubbranch="master"
 # Steam
 appid="294420"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta latest_experimental"
+branch=""
+
 # Server Details
 servicename="sdtd-server"
 gamename="7 Days To Die"

ARKSurvivalEvolved/arkserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="376030"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ark-server"
 gamename="ARK: Survivial Evolved"

Arma3/arma3server

@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -42,10 +42,10 @@ parms="-netlog -ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${serv
 
 # ARMA 3 Modules
 # add mods with relative paths:
-# mods/\@CBA_A3\;
-# or several mods as:
-# mods/\@CBA_A3\;mods/\@task_force_radio
-# and chmod modules directories to 775
+# mods/@cba_a3
+# to load the "Community Base Addons v3" module found in the
+# directory serverfiles/mods/@cba_a3.  Load several mods as:
+# mods="mods/@ace\;mods/@acex\;mods/@cba_a3"
 mods=""
 
 # Server-side Mods
@@ -65,10 +65,12 @@ githubrepo="LinuxGSM"
 githubbranch="master"
 
 # Steam
-# Stable
 appid="233780"
-# Development
-# appid="233780 -beta development"
+
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta development"
+branch=""
 
 # Server Details
 servicename="arma3-server"

BlackMesa/bmdmserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -61,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="346680"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta public-beta"
+branch=""
+
 # Server Details
 servicename="bmdm-server"
 gamename="Black Mesa: Deathmatch"

BladeSymphony/bsserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="228780"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta nightly -betapassword winteriscoming"
+branch=""
+
 # Server Details
 servicename="bs-server"
 gamename="Blade Symphony"

BrainBread2/bb2server

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="030616"
+version="160916"
 
 #### Variables ####
 
@@ -61,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="475370"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta_branch"
+branch=""
+
 # Server Details
 servicename="bb2-server"
 gamename="BrainBread 2"

CodenameCURE/ccserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="383410"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="cc-server"
 gamename="Codename CURE"

CounterStrikeSource/cssserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -61,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="232330"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta prerelease"
+branch=""
+
 # Server Details
 servicename="css-server"
 gamename="Counter-Strike: Source"

DayOfDefeatSource/dodsserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="232290"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta prerelease"
+branch=""
+
 # Server Details
 servicename="dods-server"
 gamename="Day of Defeat: Source"

DayOfInfamy/doiserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -58,6 +58,11 @@ githubbranch="master"
 # Steam
 appid="462310"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="doi-server"
 gamename="Day of Infamy"

DontStarveTogether/dstserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="130516"
+version="160916"
 
 #### Variables ####
 
@@ -54,6 +54,11 @@ githubbranch="master"
 # Steam
 appid="343050"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta anewreignbeta"
+branch=""
+
 # Server Details
 servicename="dst-server"
 gamename="Don't Starve Together"

DoubleActionBoogaloo/dabserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="317800"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="dab-server"
 gamename="Double Action: Boogaloo"

EmpiresMod/emserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -61,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="460040"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="em-server"
 gamename="Empires Mod"

FistfulOfFrags/fofserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="295230"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="fof-server"
 gamename="Fistful of Frags"

GarrysMod/gmodserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -77,6 +77,11 @@ githubbranch="master"
 # Steam
 appid="4020"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta dev"
+branch=""
+
 # Server Details
 servicename="gmod-server"
 gamename="Garry's Mod"

Hurtworld/hwserver

@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -70,6 +70,11 @@ githubbranch="master"
 # Steam
 appid="405100"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta devtest"
+branch=""
+
 # Server Details
 servicename="hurtworld-server"
 gamename="Hurtworld"

Insurgency/insserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -58,6 +58,11 @@ githubbranch="master"
 # Steam
 appid="237410"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ins-server"
 gamename="Insurgency"

JustCause2/jc2server

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -50,6 +50,11 @@ githubbranch="master"
 # Steam
 appid="261140"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta publicbeta"
+branch=""
+
 # Server Details
 servicename="jc2-server"
 gamename="Just Cause 2"

KillingFloor/kfserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -55,6 +55,11 @@ githubbranch="master"
 # Steam
 appid="215360"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="kf-server"
 gamename="Killing Floor"

Left4Dead/l4dserver

@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="222840"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="l4d-server"
 gamename="Left 4 Dead"

Left4Dead2/l4d2server

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -55,6 +55,11 @@ githubbranch="master"
 # Steam
 appid="222860"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="l4d2-server"
 gamename="Left 4 Dead 2"

NS2Combat/ns2cserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="220416"
+version="160916"
 
 #### Variables ####
 
@@ -63,6 +63,11 @@ githubbranch="master"
 # Steam
 appid="313900"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ns2c-server"
 gamename="NS2: Combat"

NoMoreRoomInHell/nmrihserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="130716"
+version="160916"
 
 #### Variables ####
 
@@ -61,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="317670"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="nmrih-server"
 gamename="No More Room in Hell"

PiratesVikingandKnightsII/pvkiiserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -56,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="17575"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="pvkii-server"
 gamename="Pirates, Vikings, and Knights II"

ProjectZomboid/pzserver

@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="290716"
+version="160916"
 
 #### Variables ####
 
@@ -51,8 +51,10 @@ githubbranch="master"
 
 # Steam
 appid="380870"
-# Allows for opting into the various Steam branches that PZ has to offer
-# Example: -beta iwillbackupmysave -betapassword iaccepttheconsequences
+
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta iwillbackupmysave -betapassword iaccepttheconsequences"
 branch=""
 
 # Server Details

QuakeLive/qlserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="060516"
+version="160916"
 
 #### Variables ####
 
@@ -44,7 +44,7 @@ updateonstart="off"
 # Install/Config Guide : https://steamcommunity.com/sharedfiles/filedetails/?id=542966946
 # Console Commands : http://www.regurge.at/ql/
 fn_parms(){
-	parms="+set net_strict 1 +set net_ip ${ip} +set net_port ${port} +set fs_homepath ${filesdir}/${port} +set zmq_rcon_enable 1 +set zmq_rcon_port ${rconport} +set zmq_rcon_password ${rconpassword} +set zmq_stats_enable 1 +set zmq_stats_password ${statspassword} +set zmq_stats_port ${statsport} +set sv_mapPoolFile ${mappool} +exec ${servercfg}"
+parms="+set net_strict 1 +set net_ip ${ip} +set net_port ${port} +set fs_homepath ${filesdir}/${port} +set zmq_rcon_enable 1 +set zmq_rcon_port ${rconport} +set zmq_rcon_password ${rconpassword} +set zmq_stats_enable 1 +set zmq_stats_password ${statspassword} +set zmq_stats_port ${statsport} +set sv_mapPoolFile ${mappool} +exec ${servercfg}"
 }
 
 #### Advanced Variables ####
@@ -59,6 +59,11 @@ githubbranch="master"
 # Steam
 appid="349090"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ql-server"
 gamename="Quake Live"

Rust/rustserver

@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -73,6 +73,11 @@ githubbranch="master"
 # Steam
 appid="258550"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta prerelease"
+branch=""
+
 # Server Details
 servicename="rust-server"
 gamename="Rust"

SeriousSam3BFE/ss3sserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -51,6 +51,11 @@ githubbranch="master"
 # Steam
 appid="41080"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta publicbeta"
+branch=""
+
 # Server Details
 servicename="ss3-server"
 gamename="Serious Sam 3: BFE"

Starbound/sbserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="230716"
+version="160916"
 
 #### Variables ####
 
@@ -50,6 +50,11 @@ githubbranch="master"
 # Steam
 appid="211820"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="sb-server"
 gamename="Starbound"

SvenCoop/svencoopserver

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -55,6 +55,11 @@ githubbranch="master"
 # Steam
 appid="276060"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta release_candidate_public"
+branch=""
+
 # Server Details
 servicename="svencoop-server"
 gamename="Sven Co-op"

TeamFortress2/tf2server

@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -61,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="232250"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="tf2-server"
 gamename="Team Fortress 2"

lgsm/functions/check.sh

@@ -25,7 +25,7 @@ do
 	fi
 done
 
-local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh update_check.sh command_validate.sh command_update_functions.sh command_email_test.sh )
+local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh command_update.sh command_validate.sh command_update_functions.sh command_email_test.sh )
 for allowed_command in "${allowed_commands_array[@]}"
 do
 	if [ "${allowed_command}" == "${function_selfname}" ]; then

lgsm/functions/command_debug.sh

@@ -94,10 +94,15 @@ trap fn_lockfile_trap INT
 cd "${executabledir}"
 if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]; then
 	${executable} ${parms} -debug
+elif [ "${engine}" == "realvirtuality" ]; then
+	# Arma3 requires semicolons in the module list, which need to
+	# be escaped for regular (tmux) loading, but need to be
+	# stripped when loading straight from the console.
+	${executable} ${parms//\\;/;}
 else
 	${executable} ${parms}
 fi
 
 # remove trap.
 trap - INT
-core_exit.sh
+core_exit.sh

lgsm/functions/core_getopt.sh

@@ -125,7 +125,7 @@ case "${getopt}" in
 		echo -e "${blue}start\t${default}st |Start the server."
 		echo -e "${blue}stop\t${default}sp |Stop the server."
 		echo -e "${blue}restart\t${default}r  |Restart the server."
-		echo -e "${blue}update\t${default}u  |Checks and applies updates from SteamCMD."
+		echo -e "${blue}update\t${default}u  |Checks and applies updates from teamspeak.com."
 		echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded."
 		echo -e "${blue}monitor\t${default}m  |Checks that the server is running."
 		echo -e "${blue}test-alert\t${default}ta |Sends test alert."
@@ -246,7 +246,7 @@ case "${getopt}" in
 		echo -e "${blue}start\t${default}st |Start the server."
 		echo -e "${blue}stop\t${default}sp |Stop the server."
 		echo -e "${blue}restart\t${default}r  |Restart the server."
-		echo -e "${blue}update\t${default}u  |Checks and applies updates from SteamCMD."
+		echo -e "${blue}update\t${default}u  |Checks and applies updates from GitHub."
 		echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded."
 		echo -e "${blue}monitor\t${default}m  |Checks that the server is running."
 		echo -e "${blue}test-alert\t${default}ta |Sends test alert."
@@ -269,7 +269,7 @@ case "${getopt}" in
 		command_update.sh;;
 	fu|force-update|update-restart)
 		forceupdate=1;
-		update_check.sh;;
+		command_update.sh;;
 	uf|update-functions)
 		command_update_functions.sh;;
 	v|validate)
@@ -408,7 +408,7 @@ case "${getopt}" in
 		command_update.sh;;
 	fu|force-update|update-restart)
 		forceupdate=1;
-		update_check.sh;;
+		command_update.sh;;
 	uf|update-functions)
 		command_update_functions.sh;;
 	v|validate)