Procházet zdrojové kódy

feat(mohaaserver): add Spearhead, Breakthrough, Reborn, vanilla and OpenMoHAA variants (#5235)

Adds Spearhead and Breakthrough to mohaaserver with a choice of server
build: alliedassault-reborn, alliedassault-vanilla,
alliedassault-openmohaa, spearhead-vanilla, spearhead-openmohaa and
breakthrough-openmohaa.

Existing installs with no variant set fall back to alliedassault-reborn.
New installs default to alliedassault-openmohaa through the new
variantinstalldefault. OpenMoHAA v0.82.1 is downloaded with a SHA256
check by install_openmohaa.sh. Variants can add start parameters and
change executabledir and fs_basepath.

The vanilla and Reborn engines move to master.gametir.com, as xNULL
shuts down on 2027-03-01. The hosted archive is rebuilt with the
current Reborn engines, and fix_mohaa.sh updates the master hostname
in the known GameSpy and xNULL engines on start.

Fixes #3519
Daniel Gibbs před 1 dnem
rodič
revize
cf6e8400c2

+ 4 - 0
lgsm/config-default/config-lgsm/mohaaserver/_default.cfg

@@ -14,6 +14,10 @@ port="12203"
 queryport="12300"
 defaultmap="dm/mohdm1"
 
+## Variant
+# (alliedassault-reborn|alliedassault-vanilla|alliedassault-openmohaa|spearhead-vanilla|spearhead-openmohaa|breakthrough-openmohaa)
+variant="alliedassault-reborn"
+
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set fs_outputpath ${gamelogdir} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set net_gamespy_port ${queryport} +exec ${servercfg} +map ${defaultmap}"
 

+ 75 - 9
lgsm/modules/check_variant.sh

@@ -7,13 +7,19 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-# Variants available for this game server. The first is the default.
+# Variants available for this game server. The first is used when no variant is set.
+# variantinstalldefault is offered and saved on new installs, when it differs from the first.
 fn_variant_list() {
 	variants=()
 	variantnames=()
+	variantinstalldefault=""
 	if [ "${shortname}" == "mc" ]; then
 		variants=("vanilla" "fabric" "paper" "purpur" "folia" "leaf")
 		variantnames=("Vanilla" "Fabric" "PaperMC" "Purpur" "Folia" "Leaf")
+	elif [ "${shortname}" == "mohaa" ]; then
+		variants=("alliedassault-reborn" "alliedassault-vanilla" "alliedassault-openmohaa" "spearhead-vanilla" "spearhead-openmohaa" "breakthrough-openmohaa")
+		variantnames=("Allied Assault (Reborn)" "Allied Assault (Vanilla)" "Allied Assault (OpenMoHAA)" "Spearhead (Vanilla)" "Spearhead (OpenMoHAA)" "Breakthrough (OpenMoHAA)")
+		variantinstalldefault="alliedassault-openmohaa"
 	fi
 }
 
@@ -33,10 +39,64 @@ fn_variant_settings() {
 		elif [ "${variant}" == "leaf" ]; then
 			variantexecutable="./leaf.jar"
 		fi
+	elif [ "${shortname}" == "mohaa" ]; then
+		if [ "${variant}" == "alliedassault-reborn" ]; then
+			variantexecutable="./mohaa_lnxded"
+		elif [ "${variant}" == "alliedassault-vanilla" ]; then
+			variantexecutable="./mohaa_lnxded"
+			variantexecutabledir="${serverfiles}/vanilla"
+			variantbasepath="${serverfiles}/vanilla"
+		elif [ "${variant}" == "spearhead-vanilla" ]; then
+			variantexecutable="./spearhead_lnxded"
+		elif [[ "${variant}" == *-openmohaa ]]; then
+			variantexecutable="./omohaaded"
+			variantexecutabledir="${serverfiles}/openmohaa"
+			if [ "${variant}" == "alliedassault-openmohaa" ]; then
+				variantstartparameters="+set com_target_game 0"
+			elif [ "${variant}" == "spearhead-openmohaa" ]; then
+				variantstartparameters="+set com_target_game 1"
+			elif [ "${variant}" == "breakthrough-openmohaa" ]; then
+				variantstartparameters="+set com_target_game 2"
+			fi
+		fi
 	fi
 	if [ "${variant}" != "${variants[0]}" ] && [ -n "${variantexecutable}" ]; then
 		executable="${variantexecutable}"
 	fi
+	if [ -n "${variantexecutabledir}" ]; then
+		executabledir="${variantexecutabledir}"
+	fi
+}
+
+# Installs files a variant needs that an existing install does not have.
+fn_variant_files() {
+	if [ "${shortname}" == "mohaa" ] && [ -d "${serverfiles}/main" ]; then
+		if [[ "${variant}" == *-openmohaa ]] && [ ! -f "${serverfiles}/openmohaa/omohaaded" ]; then
+			install_openmohaa.sh
+		elif [ "${variant}" == "alliedassault-vanilla" ] && { [ ! -f "${serverfiles}/vanilla/mohaa_lnxded" ] || [ ! -L "${serverfiles}/vanilla/main" ]; }; then
+			fn_print_dots "Setting up ${variantname}"
+			if mkdir -p "${serverfiles}/vanilla" && cp -f "${serverfiles}/dedicated_server_binaries_anticrash/mohaa/linux/mohaa_lnxded" "${serverfiles}/vanilla/mohaa_lnxded" && cp -f "${serverfiles}/fgamededmohaa.so" "${serverfiles}/vanilla/fgameded.so" && ln -sfn ../main "${serverfiles}/vanilla/main"; then
+				chmod +x "${serverfiles}/vanilla/mohaa_lnxded"
+				fn_print_ok_nl "Setting up ${variantname}"
+				fn_script_log_pass "Setting up ${variantname}"
+			else
+				fn_print_fail_nl "Setting up ${variantname}"
+				fn_script_log_fail "Setting up ${variantname}"
+				core_exit.sh
+			fi
+		fi
+	fi
+}
+
+# Checks whether any config file sets the variant.
+fn_variant_configured() {
+	local checkcfg
+	for checkcfg in "${configdirserver}/secrets-${selfname}.cfg" "${configdirserver}/${selfname}.cfg" "${configdirserver}/secrets-common.cfg" "${configdirserver}/common.cfg"; do
+		if [ -f "${checkcfg}" ] && grep -qE "^[[:blank:]]*variant=" "${checkcfg}"; then
+			return 0
+		fi
+	done
+	return 1
 }
 
 # The config setting that --version changes.
@@ -120,24 +180,24 @@ fn_variant_parse_args() {
 
 fn_variant_prompt() {
 	local answer
-	local checkcfg
+	local defaultanswer=1
 	local variantindex
 	if [ "${getopt}" != "i" ] && [ "${getopt}" != "install" ]; then
 		return
 	fi
-	if [ "${#variants[@]}" -lt 2 ] || [ -n "${argvariant+x}" ]; then
+	if [ "${#variants[@]}" -lt 2 ] || [ -n "${argvariant+x}" ] || fn_variant_configured; then
 		return
 	fi
-	for checkcfg in "${configdirserver}/secrets-${selfname}.cfg" "${configdirserver}/${selfname}.cfg" "${configdirserver}/secrets-common.cfg" "${configdirserver}/common.cfg"; do
-		if [ -f "${checkcfg}" ] && grep -qE "^[[:blank:]]*variant=" "${checkcfg}"; then
-			return
+	for variantindex in "${!variants[@]}"; do
+		if [ "${variants[variantindex]}" == "${variantinstalldefault}" ]; then
+			defaultanswer="$((variantindex + 1))"
 		fi
 	done
 	echo -e ""
 	echo -e "${bold}${lightyellow}Select ${gamename} Server Variant${default}"
 	fn_messages_separator
 	for variantindex in "${!variants[@]}"; do
-		if [ "${variantindex}" -eq 0 ]; then
+		if [ "$((variantindex + 1))" -eq "${defaultanswer}" ]; then
 			echo -e "$((variantindex + 1))) ${variantnames[variantindex]} (default)"
 		else
 			echo -e "$((variantindex + 1))) ${variantnames[variantindex]}"
@@ -145,10 +205,10 @@ fn_variant_prompt() {
 	done
 	while true; do
 		answer=""
-		if ! read -e -p "Variant [1]: " -r answer && [ -z "${answer}" ]; then
+		if ! read -e -p "Variant [${defaultanswer}]: " -r answer && [ -z "${answer}" ]; then
 			echo -e ""
 		fi
-		answer="${answer:-1}"
+		answer="${answer:-${defaultanswer}}"
 		if [[ "${answer}" =~ ^[0-9]+$ ]] && [ "${answer}" -ge 1 ] && [ "${answer}" -le "${#variants[@]}" ]; then
 			argvariant="${variants[answer - 1]}"
 			break
@@ -177,6 +237,11 @@ fn_variant_prompt() {
 }
 
 fn_variant_apply_args() {
+	if [ "${getopt}" == "ai" ] || [ "${getopt}" == "auto-install" ]; then
+		if [ -n "${variantinstalldefault}" ] && [ -z "${argvariant+x}" ] && ! fn_variant_configured; then
+			argvariant="${variantinstalldefault}"
+		fi
+	fi
 	if [ -n "${argvariant+x}" ]; then
 		if [ "${#variants[@]}" -eq 0 ]; then
 			fn_print_fail_nl "${gamename} has no variants"
@@ -259,6 +324,7 @@ if [ "${#variants[@]}" -gt 0 ]; then
 		core_exit.sh
 	fi
 	fn_variant_settings
+	fn_variant_files
 else
 	unset variant
 fi

+ 6 - 0
lgsm/modules/command_debug.sh

@@ -72,6 +72,12 @@ if [ "${serverpassword}" ]; then
 fi
 
 fn_reload_startparameters
+if [ -n "${variantstartparameters}" ]; then
+	startparameters="${variantstartparameters} ${startparameters}"
+fi
+if [ -n "${variantbasepath}" ]; then
+	startparameters="${startparameters} +set fs_basepath ${variantbasepath}"
+fi
 echo -e "${lightblue}Start parameters:${default}"
 if [ "${engine}" == "source" ] || [ "${engine}" == "goldsrc" ]; then
 	echo -e "${executable} ${startparameters} -debug"

+ 6 - 0
lgsm/modules/command_start.sh

@@ -116,6 +116,12 @@ fn_start_tmux() {
 	date '+%s' > "${lockdir:?}/${selfname}-starting.lock"
 
 	fn_reload_startparameters
+	if [ -n "${variantstartparameters}" ]; then
+		startparameters="${variantstartparameters} ${startparameters}"
+	fi
+	if [ -n "${variantbasepath}" ]; then
+		startparameters="${startparameters} +set fs_basepath ${variantbasepath}"
+	fi
 
 	# Hytale: with no saved server login file, have the server start its login (OAuth device code) on boot.
 	# A saved login that can't be used is handled after boot by fn_start_hyt_login.

+ 5 - 0
lgsm/modules/core_modules.sh

@@ -947,6 +947,11 @@ install_eula.sh() {
 	fn_fetch_module
 }
 
+install_openmohaa.sh() {
+	modulefile="${FUNCNAME[0]}"
+	fn_fetch_module
+}
+
 install_factorio_save.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module

+ 13 - 2
lgsm/modules/fix_mohaa.sh

@@ -3,14 +3,14 @@
 # Author: Daniel Gibbs
 # Contributors: https://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves issues with Medal of Honor: Allied Assault.
+# Description: Resolves issues with Medal of Honor: Allied Assault and its expansions.
 
 # shellcheck disable=SC2034 # Used by the module loader.
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}"
 
-if ldd "${executabledir}/mohaa_lnxded" 2>&1 | grep -q "libstdc++\.so\.5 => not found"; then
+if ldd "${executabledir}/${executable#./}" 2>&1 | grep -q "libstdc++\.so\.5 => not found"; then
 	# shellcheck disable=SC2034 # Used by fn_fix_msg_start_nl and fn_fix_msg_end.
 	fixname="libstdc++5 i386"
 	fn_fix_msg_start_nl
@@ -19,3 +19,14 @@ if ldd "${executabledir}/mohaa_lnxded" 2>&1 | grep -q "libstdc++\.so\.5 => not f
 	fn_clear_tmp
 	fn_fix_msg_end
 fi
+
+if [ -f "${executabledir}/${executable#./}" ]; then
+	executablemd5="$(md5sum "${executabledir}/${executable#./}" | awk '{print $1}')"
+	if [ "${executablemd5}" == "6d8c51fa1a3a7b3d392348dd6cb2e4c5" ] || [ "${executablemd5}" == "b1e012bc32ea60d93b99dea8e8a33b86" ] || [ "${executablemd5}" == "32ec01ef4e9986cf4a0de27b3157cabf" ]; then
+		# shellcheck disable=SC2034 # Used by fn_fix_msg_start and fn_fix_msg_end.
+		fixname="master server"
+		fn_fix_msg_start
+		LC_ALL=C sed -i -e 's/master\.gamespy\.com/master.gametir.com/g' -e 's/master\.x-null\.net\x00/master.gametir.com/g' "${executabledir}/${executable#./}"
+		fn_fix_msg_end
+	fi
+fi

+ 6 - 0
lgsm/modules/info_messages.sh

@@ -754,6 +754,12 @@ fn_info_messages_commandlineparms() {
 		unset serverpassword
 	fi
 	fn_reload_startparameters
+	if [ -n "${variantstartparameters}" ]; then
+		startparameters="${variantstartparameters} ${startparameters}"
+	fi
+	if [ -n "${variantbasepath}" ]; then
+		startparameters="${startparameters} +set fs_basepath ${variantbasepath}"
+	fi
 	echo -e "${preexecutable} ${executable} ${startparameters}"
 }
 

+ 17 - 0
lgsm/modules/install_openmohaa.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+# LinuxGSM install_openmohaa.sh module
+# Author: Daniel Gibbs
+# Contributors: https://linuxgsm.com/contrib
+# Website: https://linuxgsm.com
+# Description: Installs OpenMoHAA for the Medal of Honor: Allied Assault OpenMoHAA variants.
+
+moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+
+echo -e ""
+echo -e "${bold}${lightyellow}Installing OpenMoHAA${default}"
+fn_messages_separator
+fn_fetch_file "https://github.com/openmoh/openmohaa/releases/download/v0.82.1/openmohaa-v0.82.1-linux-amd64.zip" "" "" "" "${tmpdir}" "openmohaa-v0.82.1-linux-amd64.zip" "nochmodx" "norun" "noforce" "57692d057a684afb7f7e91a61fcd8c062b29ab1b639f27453830084a88cd653c"
+mkdir -p "${serverfiles}/openmohaa"
+fn_dl_extract "${tmpdir}" "openmohaa-v0.82.1-linux-amd64.zip" "${serverfiles}/openmohaa"
+chmod +x "${serverfiles}/openmohaa/omohaaded"
+fn_clear_tmp

+ 8 - 3
lgsm/modules/install_server_files.sh

@@ -90,13 +90,13 @@ fn_install_server_files() {
 		force="noforce"
 		md5="d4a57dc07648853138a700cacc84aef2"
 	elif [ "${shortname}" == "mohaa" ]; then
-		remote_fileurl="https://linuxgsm.download/MedalofHonorAlliedAssault/mohaa-1.12-rc3.5.1-linux-i386-linuxgsm-20261102.tar.xz"
+		remote_fileurl="https://linuxgsm.download/MedalofHonorAlliedAssault/mohaa-1.12-rc3.5.1-linux-i386-linuxgsm-20261114.tar.xz"
 		local_filedir="${tmpdir}"
-		local_filename="mohaa-1.12-rc3.5.1-linux-i386-linuxgsm-20261102.tar.xz"
+		local_filename="mohaa-1.12-rc3.5.1-linux-i386-linuxgsm-20261114.tar.xz"
 		chmodx="nochmodx"
 		run="norun"
 		force="noforce"
-		md5="bf66cbe1f4aefb221e17924e7bf9bdb4"
+		md5="7a80a7521ab7f10d6bcbacc1b8d5371a"
 	elif [ "${shortname}" == "ns" ]; then
 		remote_fileurl="https://linuxgsm.download/NaturalSelection/ns-3.2-linux-i386-linuxgsm-20261102.tar.xz"
 		local_filedir="${tmpdir}"
@@ -314,6 +314,11 @@ elif [ -z "${appid}" ] || [ "${shortname}" == "ahl" ] || [ "${shortname}" == "q4
 		install_eula.sh
 	fi
 	fn_install_server_files
+	if [ "${shortname}" == "mohaa" ]; then
+		cp -f "${serverfiles}/dedicated_server_binaries_anticrash/mohaa/linux/mohaa_lnxded" "${serverfiles}/dedicated_server_binaries_anticrash/mohaa/linux/fgameded.so" "${serverfiles}/"
+		chmod +x "${serverfiles}/mohaa_lnxded"
+		fn_variant_files
+	fi
 fi
 
 if [ -z "${autoinstall}" ]; then