Merge remote-tracking branch 'origin/main'

# Conflicts:
#	scripts/package-native.sh
#	scripts/stage-build.sh
This commit is contained in:
Alexander Sellite 2026-08-12 11:23:46 -04:00
commit 0f1d931a7b
7 changed files with 96 additions and 10 deletions

View file

@ -116,8 +116,9 @@ manifest_value() {
manifest_version="$(manifest_value manifest_version)"
game_version="$(manifest_value game_version)"
game_commit="$(manifest_value game_commit)"
packaging_commit="$(manifest_value packaging_commit)"
platform="$(manifest_value platform)"
if [[ "${manifest_version}" != "1" ]]; then
if [[ "${manifest_version}" != "1" && "${manifest_version}" != "2" ]]; then
echo "Unsupported BUILD_INFO format." >&2
exit 1
fi
@ -129,6 +130,11 @@ if [[ ! "${game_commit}" =~ ^[0-9a-f]{40}$ ]]; then
echo "Invalid game commit in BUILD_INFO." >&2
exit 1
fi
if [[ "${manifest_version}" == "2" \
&& ! "${packaging_commit}" =~ ^[0-9a-f]{40}$ ]]; then
echo "Invalid packaging commit in BUILD_INFO." >&2
exit 1
fi
if [[ "${platform}" != "linux-x86_64" ]]; then
echo "This installer only accepts linux-x86_64 packages." >&2
exit 1
@ -227,6 +233,9 @@ if [[ -n "${old_current}" && "${old_current}" != "${release_dir}" ]]; then
fi
echo "Installed NETfishing dedicated server ${game_version} (${game_commit})."
if [[ -n "${packaging_commit}" ]]; then
echo "Dedicated packaging commit: ${packaging_commit}."
fi
if ${service_exists} && ! ${service_active}; then
echo "${service_name} was inactive and was not started."
fi